diff options
Diffstat (limited to 'pkgs')
276 files changed, 7586 insertions, 4404 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 0264ce397762..1a21efc32322 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: +{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: rec { @@ -59,6 +59,5 @@ rec { zcash = callPackage ./zcash { withGui = false; openssl = openssl_1_1_0; - boost = boost163; }; } diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index da76d7f16db1..1932ec3d93bc 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-16.9"; + name = "snd-17.8"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1rw9wrj1f0g413ya32s9mwhvv3c6iasjza22irzf6xlv49b9s5dp"; + sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 0270fb24d9e3..37ccbb1425ff 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -2,14 +2,16 @@ , taglib }: stdenv.mkDerivation rec { - version = "0.09.0"; + version = "0.09.1"; name = "vimpc-${version}"; src = fetchFromGitHub { owner = "boysetsfrog"; repo = "vimpc"; - rev = "v${version}"; - sha256 = "1z9yx2pz84lyng1ig9y4z6pdalwxb80ig7nnzhqfy3pl36hq6shi"; + # Using commit-hash as there is not tag available + # https://github.com/boysetsfrog/vimpc/issues/70 + rev = "63556da6b94ab27d7e3f542399f5e0975a5812ba"; + sha256 = "1495a702df4nja8mlxq98mkbic2zv88sjiinimf9qddrfb38jxk6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 4d3a9a385d64..c330aeb0092c 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "deja-dup-${version}"; - version = "36.1"; + version = "36.3"; src = fetchurl { url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz"; - sha256 = "1s48k2sxrpwkzp37s4x7934lyg5194c47nv9ks15rksd5s0alnld"; + sha256 = "08pwybzp7ynfcf0vqxfc3p8ir4gnzcv4v4cq5bwidbff9crklhrc"; }; patches = [ @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ''; homepage = https://launchpad.net/deja-dup; license = with licenses; gpl3; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar joncojonathan ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 3ce8d075410b..86a963bdac48 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,11 +1,11 @@ -{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: let - version = "0.15.0"; + version = "0.16.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -14,11 +14,10 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "1wissgl7wd7fblq8ghz8n2fr6wqip7h88p9fiarfpvi1918fgng8"; + sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb"; }; - patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ ./sddm-ignore-config-mtime.patch ]; postPatch = # Module Qt5::Test must be included in `find_package` before it is used. diff --git a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch index 836df2de292d..aac09dfe876b 100644 --- a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch +++ b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch @@ -1,28 +1,43 @@ -From e9d82bfbc49993a5be2c93f6b72a969630587f26 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 23 Nov 2015 06:56:28 -0600 -Subject: [PATCH 1/2] ignore config mtime - ---- - src/common/ConfigReader.cpp | 5 ----- - 1 file changed, 5 deletions(-) - diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp -index cfc9940..5bf5a6a 100644 +index 4b5983c..911c511 100644 --- a/src/common/ConfigReader.cpp +++ b/src/common/ConfigReader.cpp -@@ -138,11 +138,6 @@ namespace SDDM { - QString currentSection = QStringLiteral(IMPLICIT_SECTION); +@@ -147,16 +147,13 @@ namespace SDDM { + // * m_path (classic fallback /etc/sddm.conf) - QFile in(m_path); -- QDateTime modificationTime = QFileInfo(in).lastModified(); -- if (modificationTime <= m_fileModificationTime) { + QStringList files; +- QDateTime latestModificationTime = QFileInfo(m_path).lastModified(); + + if (!m_sysConfigDir.isEmpty()) { + //include the configDir in modification time so we also reload on any files added/removed + QDir dir(m_sysConfigDir); + if (dir.exists()) { +- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_sysConfigDir).lastModified()); + foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) { + files << (file.absoluteFilePath()); +- latestModificationTime = std::max(latestModificationTime, file.lastModified()); + } + } + } +@@ -164,21 +161,14 @@ namespace SDDM { + //include the configDir in modification time so we also reload on any files added/removed + QDir dir(m_configDir); + if (dir.exists()) { +- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_configDir).lastModified()); + foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) { + files << (file.absoluteFilePath()); +- latestModificationTime = std::max(latestModificationTime, file.lastModified()); + } + } + } + + files << m_path; + +- if (latestModificationTime <= m_fileModificationTime) { - return; - } -- m_fileModificationTime = modificationTime; - - in.open(QIODevice::ReadOnly); - while (!in.atEnd()) { --- -2.6.3 - +- m_fileModificationTime = latestModificationTime; +- + foreach (const QString &filepath, files) { + loadInternal(filepath); + } diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series deleted file mode 100644 index cb6ea65fedb1..000000000000 --- a/pkgs/applications/display-managers/sddm/series +++ /dev/null @@ -1 +0,0 @@ -sddm-ignore-config-mtime.patch \ No newline at end of file diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 061d75d4016f..4e834afa9d06 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.16"; # "Android Studio 3.0 RC 1" - build = "171.4392136"; - sha256Hash = "13zaqbbl7bqhiwh0ybbxkfv0h90qsfpa7sim778n2j32jjvdcby5"; + version = "3.0.0.17"; # "Android Studio 3.0 RC 2" + build = "171.4402976"; + sha256Hash = "18f5cq1dcmyjxaq520kqjac332bpp35pis02yplh6gzp65i4bvvf"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index b039bd168d87..5ef29081cf01 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -8,6 +8,9 @@ assert stdenv ? glibc; +# http://download.eclipse.org/eclipse/downloads/ is the main place to +# find the downloads needed for new versions + rec { buildEclipse = import ./build-eclipse.nix { @@ -111,16 +114,16 @@ rec { }; eclipse-platform-47 = buildEclipse { - name = "eclipse-platform-4.7"; + name = "eclipse-platform-4.7.1a"; description = "Eclipse Platform Oxygen"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz; - sha256 = "0hrgijydxvd2zz1npv5qw8d79f48a6lsdw3qy1wqf7k59aqyg2fq"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz; + sha256 = "13gyrnhyhdpsrbi5nl0fhpwrqz3gdyqq3r0m1f2z3y6yr75sgw33"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk.tar.gz; - sha256 = "00m89j26m8nj190q144wx8d88mldx1z6i797p8isg3rhbz3x5dbc"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk.tar.gz; + sha256 = "013dfk23wa4jy177ywrkkr16wdjf6jxzjcz6mkl4ygki47yj9c5s"; }; }; }; @@ -165,16 +168,16 @@ rec { }; eclipse-sdk-47 = buildEclipse { - name = "eclipse-sdk-4.7"; + name = "eclipse-sdk-4.7.1a"; description = "Eclipse Oxygen Classic"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk-x86_64.tar.gz; - sha256 = "1nz0hl0gg4a8iffnaggbhdw0ra8a7wljlimvijbbybh0nhvfd9n3"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz; + sha256 = "05xpdbig170rw7k5dx33dlyz187wv62mma8s5wxrqi7f4117sx4y"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk.tar.gz; - sha256 = "0dar69v7d7bkl18si45bccvil809a85ghb7k88m1q2cq1kd2r8z5"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk.tar.gz; + sha256 = "09c9m88k1cm9bhd900p5yf2q9pijrymgjcbhmagz0fcwhldrv0ys"; }; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index b9b0ee61c0b0..f3459e57d9b2 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -364,12 +364,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.7"; + version = "4.7.1a"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/org.eclipse.jdt-4.7.zip"; - sha256 = "0y17shnlh90gg9226lraknvdnp2i71ck91dnxbbzvxl8b64v8v1p"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/org.eclipse.jdt-4.7.1a.zip; + sha256 = "1hpvpj8ghfk8aqbzfrpcxw3wxrczq6zd3bpx4sxjrsi926jsjaf4"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index cf49b8d2ea7e..a2fc324a6188 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.5.0.tar"; - sha256 = "0xxzmqawd7cwafzb9z6c7hjlh6adc5sj7hfcqxf30b7b7ragqn19"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.6.0.tar"; + sha256 = "1b0x7g753gn7mym8286b937zmxv50jgdish2h6wc05w1g1lygwsz"; }; packageRequires = [ emacs ]; meta = { @@ -201,10 +201,10 @@ }) {}; auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auto-correct"; - version = "1.1"; + version = "1.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-correct-1.1.el"; - sha256 = "19i84dqqnxc5v36lsmj9zj8wbmg267c50jvq2i9bb66i9pzd0s53"; + url = "https://elpa.gnu.org/packages/auto-correct-1.1.3.el"; + sha256 = "09r58p8na1ai2v9zllb92lvsjlq2jfzwvj0ipck1py0i4xfsm7aq"; }; packageRequires = []; meta = { @@ -241,10 +241,10 @@ }) {}; beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "beacon"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/beacon-1.3.2.el"; - sha256 = "0ldja8xrrninm588f27bhxvp0b12cngazyz688lkxvwx28cpqb7n"; + url = "https://elpa.gnu.org/packages/beacon-1.3.3.el"; + sha256 = "10r4fpf8pcf1qn5ncpm5g7skzba749mrc1ggykq92jlha3q98s02"; }; packageRequires = [ seq ]; meta = { @@ -281,10 +281,10 @@ }) {}; captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "captain"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/captain-1.0.2.el"; - sha256 = "0rslksfwzf5bngmbfgv2mwmls5dpwmz7rs9av9p60y7k848haqf1"; + url = "https://elpa.gnu.org/packages/captain-1.0.3.el"; + sha256 = "02b4s4pfnwfwc3xgh4g96wrqll37m35dc2x09pjwkdjxglki7045"; }; packageRequires = []; meta = { @@ -945,10 +945,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.2.4"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.2.4.tar"; - sha256 = "013sdzpix9mc7d99mmpqv0r80zr50l1c7jld09p6767f86j6vahi"; + url = "https://elpa.gnu.org/packages/gnorb-1.3.0.tar"; + sha256 = "0c256473llp7ahl1wbm6m236cj2lhp9ms1clmxpsfv51ds27ljqv"; }; packageRequires = [ cl-lib ]; meta = { @@ -1464,10 +1464,10 @@ }) {}; nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "nlinum"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nlinum-1.7.el"; - sha256 = "0ql1dbad29sdv3wmv65985g8ibl2176m2hqhjfrppgg34h3w51lz"; + url = "https://elpa.gnu.org/packages/nlinum-1.8.el"; + sha256 = "0bb1c8a68fzv59q2ri7ppbx8cm7sa8n4hxxvxv73db2dcgwrgwga"; }; packageRequires = []; meta = { @@ -1556,10 +1556,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20171009"; + version = "20171016"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20171009.tar"; - sha256 = "03j7vcj5rihhdh1mmy667s1jy39wfs0kf4gc0gmqxldml062gcpm"; + url = "https://elpa.gnu.org/packages/org-20171016.tar"; + sha256 = "1196kv83p953nd9c5gxkn8ndw2kmm2kfw34dldap6m89khqflz5a"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index d28cf3a3edf1..8c17823105e9 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -127,12 +127,12 @@ abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abc-mode"; - version = "20171001.403"; + version = "20171020.319"; src = fetchFromGitHub { owner = "mkjunker"; repo = "abc-mode"; - rev = "161de34bc9e13bb094da0e99233b496a16f890fd"; - sha256 = "0dqn2y6afn36jry2lb96v8w6hwlzcln3d314j5n4sl4lh5ba2s5f"; + rev = "238deedeb6c90df168045552eb463cfae9e1f88f"; + sha256 = "1wkjdvsav2x9zsl25h87iyfl6r0md86i2gmxqhvf63acxqgrgb2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode"; @@ -740,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; - sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; + rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; + sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -757,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20170925.821"; + version = "20171017.422"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; - sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; + rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; + sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -803,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1344,12 +1344,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "20170627.1223"; + version = "20171012.1107"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3"; - sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w"; + rev = "1d7185d27020c3e91a7da21800716079297938ac"; + sha256 = "0397kfy0lmgdic4jc8fqhsgpv8r4lrqcfanqbfbchfxwfswbqb8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1405,12 +1405,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20170926.1903"; + version = "20171009.1931"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "85a1af27541f6a73a63120fac2cfbb7ba39531c9"; - sha256 = "0z1kh8xj16lp7ydzw1fxypw37vlrcxcb8bpx96w6aj6zcd7pzwmn"; + rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c"; + sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1594,12 +1594,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170914.129"; + version = "20171011.324"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "8f269ae0ddec217db4ec643f8e167eb431091b72"; - sha256 = "1wprrwv099w61blam6x8wfxym1dfx802ra7cddbkmh07vfi1w6bx"; + rev = "b93707e3a3a7a4968b3e212b890edfe265dcd57d"; + sha256 = "09hyg0fs3qgyc6dbn23pw8p7w2m9xvkf5cz8v0f18a7fkvq2j2f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -2463,12 +2463,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20170908.1740"; + version = "20171019.916"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "db7a2abbbb74719dfd0867612a9a3bde4c574cc7"; - sha256 = "133mgzks4ig2z67bk63gligg45zj82mra99m9qdz7d3qpx7c9027"; + rev = "5d25972192cd34553997ba193c09eab093a2b870"; + sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2547,12 +2547,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20170829.754"; + version = "20171010.1420"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "68145a891348cb74db5209548c74dbc8a80e6902"; - sha256 = "1r46810dn99cnbv3railbw79k42sz1pmhx2fbx60c4g80w2kcjy6"; + rev = "b4d5a2fedec176d3562943668609766fab0b23ff"; + sha256 = "0y31zx6npv03ygjywy23pvrpvjwi1fh1qhs1qzxsi25pbbk1hkq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2565,6 +2565,26 @@ license = lib.licenses.free; }; }) {}; + apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "apt-sources-list"; + version = "20171004.1143"; + src = fetchgit { + url = "https://git.korewanetadesu.com/apt-sources-list.git"; + rev = "842c3896f660295e4c16938aa1fd195e5d377460"; + sha256 = "1d1v2h91vabqdrjcrdnzqj4xzmm7gbad4mxcphrj5yfnc4rrfc12"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list"; + sha256 = "1gnl6zqv6imk2qpv4lj7qyjgf1ldxib3k14gsmwqm0c1zwjsid3j"; + name = "apt-sources-list"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/apt-sources-list"; + license = lib.licenses.free; + }; + }) {}; arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "arch-packer"; @@ -2610,12 +2630,12 @@ archive-rpm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "archive-rpm"; - version = "20171005.1548"; + version = "20171016.112"; src = fetchFromGitHub { owner = "legoscia"; repo = "archive-rpm"; - rev = "830158cfb3b43c85cfcb4bd5b92d4457d015c80a"; - sha256 = "18vmwffvxxg9clddmrkyv9lkjxiczaig69yyxzghigmzmg8wk557"; + rev = "e2fac6c018c19001f1f28e7c80721724684f8941"; + sha256 = "1qq0z5mmbhd0ma8v8bxy53n6ynqz5qf9n3h7566dylmdncyyv7hw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5f5653e62afdc022eac30bda3d21bd2d2625d2e/recipes/archive-rpm"; @@ -2820,12 +2840,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20170916.2256"; + version = "20171015.2239"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "87853ae35f19646f83f653b798e9f6d646de7113"; - sha256 = "17q1x9nddjy14nbm3h343s8kv9y8p6kj7yvixa7vbf71396dwsxm"; + rev = "424ecd8a28cd59fe7d2de3cb4b37a4224e34c123"; + sha256 = "0zmbg3r6sykmchy8hhbw8glzl8xvki030rzg9r55v4g61k8qy13r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -3891,12 +3911,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170819.1039"; + version = "20171014.20"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "245b5d62feb6f276971be53e63311de4a243bfbc"; - sha256 = "0r2p01hnflaa7dc0xfrrd5hgwgx530m4cxzpw3p1nmdajlk4mbyy"; + rev = "36f768d9e320d300b81799e0fcc097cb89aad780"; + sha256 = "05jx71v5shdynia21wkrc1012r0wajdn0km1rclpyvf3ck34rh8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3954,12 +3974,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20171004.925"; + version = "20171018.937"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "dfb7d8eb4cb1e037e5a460b514b907306f8b845b"; - sha256 = "157jbkzh0g7mmx94mj36lx137gzhzb9sqxjnjaissqn571p9ykay"; + rev = "b583c34750044ad0da511341c44332ed94995520"; + sha256 = "138q2gj32sxx69vmxbc4wcihph38g9ychak7q7sy2zziqwip1nlb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4017,11 +4037,11 @@ axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; - version = "20161120.1200"; + version = "20171021.822"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "110e20a7a86c"; - sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm"; + rev = "f99f1eb2af8a"; + sha256 = "1n4rrvq95bhhirak72wccwsd6822p38mvyyrrkgjz8ah1xfvfm1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; @@ -4275,12 +4295,12 @@ basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "basic-mode"; - version = "20171004.1218"; + version = "20171011.1126"; src = fetchFromGitHub { owner = "dykstrom"; repo = "basic-mode"; - rev = "d5f480fce6b25de4857e0f04c419cab5268185e3"; - sha256 = "1kkqqi5ipbf5pyqdx1kzwxkn6gzgsmayg0dbyjzkdgc8zqihw4w3"; + rev = "7683d9812b1f4c6ac33b386abf81461175075c30"; + sha256 = "01pmxcff8v64sc49ahzkks636p778l4fy8s5x6p9rngnwm72gmnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode"; @@ -4358,11 +4378,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20170725.300"; + version = "20171017.817"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "c951e15cd01d84193937ae5e347143321c3a2da9"; - sha256 = "1m19f74zkyh0zyigv807rlznvf2l72kdg6gfizf8pan85qvk949l"; + rev = "339aa15f20e1f542db97a3f3d2d65a61ce5c0e93"; + sha256 = "00782y1vas8rd9g30jqhnc24bsqsy5c31qn85ipi1vc8lrbyfcg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; @@ -4525,12 +4545,12 @@ beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "beacon"; - version = "20170404.906"; + version = "20171017.1540"; src = fetchFromGitHub { owner = "Malabarba"; repo = "beacon"; - rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b"; - sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn"; + rev = "729338b02a0e331a4faf475da9f54771a3470106"; + sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; @@ -4606,6 +4626,27 @@ license = lib.licenses.free; }; }) {}; + benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "benchstat"; + version = "20171013.2012"; + src = fetchFromGitHub { + owner = "Quasilyte"; + repo = "benchstat.el"; + rev = "a5b67cf7972ca2bbc9f5bc6a0f521ab02b76d4f0"; + sha256 = "02v5l9qvzcr58qr973phgj1c846pqp3cj16khn4h9v3f3gb180n1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat"; + sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9"; + name = "benchstat"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/benchstat"; + license = lib.licenses.free; + }; + }) {}; bert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bert"; @@ -4886,8 +4927,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "16abb66246170fe06325ff32a4889e4b51bfd979"; - sha256 = "1fav32ax7qykclvrimlf00pyp534yfngizm697mbr9346va1zqm6"; + rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a"; + sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5575,12 +5616,12 @@ browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "browse-kill-ring"; - version = "20160125.9"; + version = "20171016.1312"; src = fetchFromGitHub { owner = "browse-kill-ring"; repo = "browse-kill-ring"; - rev = "c7df6c8f5fe1e82d17b23da6d43a038784721d10"; - sha256 = "0sndzhza9k4vcf70fzxsyzrfryaz92lm1y7bbb0dx10m65qljpbi"; + rev = "b746d01c888262e81d76f8949869cf9e02759b6a"; + sha256 = "177vbziv65jb3xla713iblng04m0f7hdq5d4hf0jaxn7pzm61n0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring"; @@ -6099,12 +6140,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170929.512"; + version = "20171020.527"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "c1187b34c11cdf4030c57427261f3af4d6374b15"; - sha256 = "0sk9s29521kh4qhi4px917vql6ba07ijvp7vrc0dzr1gdpm0b3w2"; + rev = "62c416a534a1b0c2acf1cababc49c435d4e33ea7"; + sha256 = "140cwm0jirmq3b9xwcqf3hfy38xsbq0z8jnzbgblwf31zpzgj6qp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6540,12 +6581,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "20170930.722"; + version = "20171020.1013"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "8eef73ea8d0a4994cb1c7210b83ba58e00d80144"; - sha256 = "03c5cc0xh1azqqj7119g5yiy7w1jr3qddinqc30m7db1jrjsg3nq"; + rev = "09e545e159c5166ae374ab505f4c1b66fb3ec6fd"; + sha256 = "00m9zd2dnv9bsg6y3imk6nj992zjsy1zf3ylg67iw6x88v01pvji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -6921,8 +6962,8 @@ src = fetchFromGitHub { owner = "anler"; repo = "centered-window-mode"; - rev = "c46af782ada0d4062d7de5cbbdc7c7471fdd0d15"; - sha256 = "1xbfmanimq0ql61lzxx74jf4kj1g9imzgwiy1498mhbdbw295fg0"; + rev = "6f9e873f5a98f356cee41367f2eaf1f5f5cd96fc"; + sha256 = "0ih41g9haypr2ifi26kihwx2zfnzjh8n2898w2ljn7xzbd0nkx8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode"; @@ -7005,8 +7046,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "4097e6453093b7aa8cb96e47d23847cc65b3fbe0"; - sha256 = "01irq5g2n55s5arj7b3clnq50ym38qwghg20mdwhij1zljp42zb1"; + rev = "51b4a9aed3d18eb7b27e1580807ffacf5abd3bc2"; + sha256 = "1g9wg331fr578sgdz9c7qk27aphi2ryddib0sqdk9wsc5h41cfmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7505,12 +7546,12 @@ chinese-yasdcv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }: melpaBuild { pname = "chinese-yasdcv"; - version = "20170827.1650"; + version = "20171014.1844"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-yasdcv"; - rev = "fe14df025491530680529c98df3e3239ff44f57f"; - sha256 = "0vcm381i2zvpjcq8jcxldk7dn2c7pbszmb8j3qwrw038hx0lbi3i"; + rev = "5ab830daf1273d5a5cddcb94b56a9737f12d996f"; + sha256 = "1mv1n6m73aamxj18i851ww53q7p4ydiqgaapxyvjbm6sx8ddz9ak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv"; @@ -7593,8 +7634,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "c60d1ae5802ec1dba90f5e4b51579488bbda55c6"; - sha256 = "15r4lbb2wraadi27300gw9yarfpgwnclhjfvgr8vgiy1pqg1y5bi"; + rev = "946a9d44e0d3806f1e06ab68fd832f24dd152086"; + sha256 = "0fifp2cjspfqvwmy9l9sxm8na7jj3wxbiz0mpq0pj3jm4aa7v6cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7904,12 +7945,12 @@ clean-aindent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clean-aindent-mode"; - version = "20150816.2029"; + version = "20171017.1343"; src = fetchFromGitHub { owner = "pmarinov"; repo = "clean-aindent-mode"; - rev = "78d917761b7f47f41dd1452e5a6fd783115913c9"; - sha256 = "01jh561gpicw3wf8nvmw0ggc08gjg8zfzvqhjidpjn6sk4za9fhb"; + rev = "a97bcae8f43a9ff64e95473e4ef0d8bafe829211"; + sha256 = "07dgx09j6nn5dl9vpqfcs5yqm79kza3h3r1lb7r09wpkmrg0c2cr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee9dac7c10e652f026643620418dfea9237a0d23/recipes/clean-aindent-mode"; @@ -8277,8 +8318,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "35f5d71b196b1a4b147a56a82b723d0383cb7282"; - sha256 = "11im686bjh97vm67325zkm7q8mzd575s0rl7r8kd0kz837gywbh6"; + rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818"; + sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8298,8 +8339,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "35f5d71b196b1a4b147a56a82b723d0383cb7282"; - sha256 = "11im686bjh97vm67325zkm7q8mzd575s0rl7r8kd0kz837gywbh6"; + rev = "05b6f053eeb56cb8301361bb84f9fe1371a53818"; + sha256 = "1vpa5k2f0ixgy2wzly420ywhrri07nvmimns6xkydilkqpp5mk1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8504,12 +8545,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170922.231"; + version = "20171017.608"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "37950c45f6a61383c70286bbecea305e6f1daf51"; - sha256 = "1si544nsjzwbikv3m17x2k4l0cnjrshpld28fzfhjv336p9jw25q"; + rev = "cfdf8522159882a3e07bfa1f648b07d807afb650"; + sha256 = "0wiv1bqgf3szg9dkdhccbxk28xgz07jdmfpfp24wic6dpny2vzjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8529,8 +8570,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "cb8f26f199e18be231f40f523bfe64375e749e35"; - sha256 = "13zywybi3r9pzwlqvailgafqc68v62adkrkca1lm7mjrr33jdsfn"; + rev = "3e0441d87735241eb496b22bb8856bb29575b941"; + sha256 = "07q91k9fim3w646mfhwvj3ai56xkycs22izqlvz34ldlwysnx68q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8798,12 +8839,12 @@ colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colemak-evil"; - version = "20170401.1626"; + version = "20171015.1607"; src = fetchFromGitHub { owner = "patbl"; repo = "colemak-evil"; - rev = "b01296a50ee225d0e21e81f99c3c01432f89a7c7"; - sha256 = "09ipxdwvi1bsicl67fbpd5aq5g9ws9frim9q24y7h6srynj4awa7"; + rev = "192c779281ae1fbf2405dcdb55b3c5b2a1d0b3d1"; + sha256 = "1clnvr7n6mx5b8pq1c6zchq7n1g8ip8hwgzc61ywrmiyv0v8rnc6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil"; @@ -8987,12 +9028,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20171003.235"; + version = "20171014.1430"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "c5855d0906c672150dc2b00486dda633823d9477"; - sha256 = "1p2qjgwxj969hffawc8h1zikl5zgqj91qii7fv31n2h4sqxxybks"; + rev = "acd7887256a77c07006fb45ebab67f1cd68df2f6"; + sha256 = "0rjidxjwaxmkrc8dcz37v3h76rzm4kf2gjx2s2mj3dym8l6bg5cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9281,12 +9322,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20171006.1442"; + version = "20171017.1638"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "d033112748440e772f0173b28356e956ce57d8a0"; - sha256 = "0qabdz95wa4gqag212gcfys4kpnvdcv0kmq2kiwc6znyp6xicnd1"; + rev = "66e43a3a3388c3af3dd851ba0a1f48dcb6efb1ae"; + sha256 = "0wm1qrwmhzs3vphk6hbi288rvc66gznis5kfj25d86ilq4fvawsf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9713,6 +9754,27 @@ license = lib.licenses.free; }; }) {}; + company-glsl = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, glsl-mode, lib, melpaBuild }: + melpaBuild { + pname = "company-glsl"; + version = "20171015.1049"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "company-glsl"; + rev = "a262c12c3bcd0807718c4edcaf2b054e30ef0e26"; + sha256 = "0338bym8ifvkgpbc4vyzf3nmlp6rc8lihyxcbym5m08612ln78mk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/abab3b5a9762639812e2aabf9d288ed367dcdc22/recipes/company-glsl"; + sha256 = "0lzy3xln5780yjwhhcz6vnc2j0k0rc7jfvqc8bv0xfabikgadmkn"; + name = "company-glsl"; + }; + packageRequires = [ company emacs glsl-mode ]; + meta = { + homepage = "https://melpa.org/#/company-glsl"; + license = lib.licenses.free; + }; + }) {}; company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "company-go"; @@ -9720,8 +9782,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "1a78dd6c36d7f37cbb60073523c2e9ca3f6519fa"; - sha256 = "1bcd62rggq3sk96n3dlpidrv4pbx6x385x17knfnp35avgrhsv4b"; + rev = "e990796e68a2ebfc099afed20b99e26d6b64061a"; + sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9825,8 +9887,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; - sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + rev = "2f73061c886bae07bc51e4d9eb545ed8027c0442"; + sha256 = "17bqx7bkfzv4w7cf0l139xwg1shns680rq74hrqgicammb453kz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean"; @@ -9839,6 +9901,27 @@ license = lib.licenses.free; }; }) {}; + company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: + melpaBuild { + pname = "company-lsp"; + version = "20171019.2235"; + src = fetchFromGitHub { + owner = "tigersoldier"; + repo = "company-lsp"; + rev = "2e32d6141370e0736644928a8dbd7812b89c717e"; + sha256 = "0fyl2bkn289f3b6150kyg6civair659c2pg13ng6x5vn3pih5agk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; + sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; + name = "company-lsp"; + }; + packageRequires = [ company emacs lsp-mode s ]; + meta = { + homepage = "https://melpa.org/#/company-lsp"; + license = lib.licenses.free; + }; + }) {}; company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }: melpaBuild { pname = "company-lua"; @@ -9846,8 +9929,8 @@ src = fetchFromGitHub { owner = "ptrv"; repo = "company-lua"; - rev = "0be8122f3adf57ad27953bf4b03545d6298d3da4"; - sha256 = "1d9i165apgmwns7b2fd5wcpjpkah3dyj20v5sb8ynvz6qhhr5r9c"; + rev = "6a542ba16d7fa47865879b5a99dedd121a84a880"; + sha256 = "10wy9s29sbzaz61p62vda6cqwjk6rpa6ia8zm4n3d6xvpv2wqa70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8191ab2aaa72041be46091e363d216cf1b73fde/recipes/company-lua"; @@ -9863,12 +9946,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "20170804.1202"; + version = "20171016.814"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4"; - sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"; + rev = "3481f03ebb6a613ff85b71ca8edd2d5842c49012"; + sha256 = "0nbnqgl2jly1n5nx20hr2i84r2shxjb3axv2p597b5kw2bdbsva5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -9951,8 +10034,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; - sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; + rev = "1a7a9a6a81e4f18fb6403691454cbacd560e330b"; + sha256 = "0b13xqn46bc04bv262wrr8dw0n8d29gr0yywlbdw4av1x41v1iv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9968,12 +10051,12 @@ company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-plsense"; - version = "20171001.1200"; + version = "20171016.1013"; src = fetchFromGitHub { owner = "CeleritasCelery"; repo = "company-plsense"; - rev = "8a72677fcd7f8abef4fb1f046b6b424d5482aadd"; - sha256 = "02b7pfrz5k31bfq23m71hq8pzxsl2w43wjxaqx154g2bb8wkfdkr"; + rev = "68dd1ca0a0837990a2e6c2e36f6b10fdf4a9bb6d"; + sha256 = "07bqm1bg91r3vchy2q2pk3npngqfb73fh0b7mp1g9fj11h25mjfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense"; @@ -10104,8 +10187,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10289,12 +10372,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20170926.2252"; + version = "20171010.2258"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "393724d0d36a8269e57a0e4c2b3723071caf0a3c"; - sha256 = "02pm3x9frscgz5szddvbir0i7amnkzfj7pl4lgiah57bhcg1lhd0"; + rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; + sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10373,12 +10456,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20170608.756"; + version = "20171009.1921"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "468a9090f3a41e4c14d23a3b7987defd27ccd799"; - sha256 = "0bcjvqs3m5vwmixm745mp19sy0fkdpv080issqf97jqxh3arqh1k"; + rev = "32f87d1f940058404858e5e6472877a069df219e"; + sha256 = "0zr86fr0dswxchm28jvkc4fdqg3wp7hw5ch8jai2pm3cn45cqk7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10604,12 +10687,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "20170817.2319"; + version = "20171019.347"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487"; - sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9"; + rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84"; + sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -10730,12 +10813,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20171007.231"; + version = "20171017.1029"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "6827edffb70890f2e94c3d146ed129bde581992d"; - sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; + rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; + sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10751,12 +10834,12 @@ counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-bbdb"; - version = "20161105.350"; + version = "20171016.1545"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-bbdb"; - rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555"; - sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7"; + rev = "298b48cb9e1186347fbcaf1ba354efa5fe2d7556"; + sha256 = "137iv77j9a7mxsfrjxk4fpbaxw964pk4yj15609wijfcwgdjprwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; @@ -10790,6 +10873,27 @@ license = lib.licenses.free; }; }) {}; + counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-etags"; + version = "20171020.2305"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "counsel-etags"; + rev = "5d7b51ce7806bbe7e1f75077b4dde2ac17a53c5d"; + sha256 = "0v3b3gs4jy8cqkvchnakwpws3a0igiklchb9q3754lnmk8784dn8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; + sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0"; + name = "counsel-etags"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-etags"; + license = lib.licenses.free; + }; + }) {}; counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-gtags"; @@ -11483,6 +11587,27 @@ license = lib.licenses.free; }; }) {}; + cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cubicle-mode"; + version = "20171009.1257"; + src = fetchFromGitHub { + owner = "cubicle-model-checker"; + repo = "cubicle"; + rev = "9d108b900e0123236b4991c2d06b5061f34feee8"; + sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; + sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv"; + name = "cubicle-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/cubicle-mode"; + license = lib.licenses.free; + }; + }) {}; cucumber-goto-step = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }: melpaBuild { pname = "cucumber-goto-step"; @@ -11679,8 +11804,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "14b085980903fa5a172a118929aecbae2d1975c4"; - sha256 = "0rpilj79a1kpd7z5pmq04pqc7gxaxlfj7br6gfsx2bs07mc0j6b8"; + rev = "d31160f49f8d8dfe0287181830303f42ab2a12d5"; + sha256 = "05aggv2fzdnhpygkyabp8j2wg8m6zbn0bn8wqrgcybjr2dyp57mx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11822,12 +11947,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170928.1211"; + version = "20171018.624"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "b516cf4556bb2a1a898701d953374b96079678b3"; - sha256 = "0ilzd6qwjjj5lfimv3b5him54yh7lpxhlm0hnsmk6zcrr6884vsl"; + rev = "d6e225cf5548ab67340697c2ba3a2a0f4149936a"; + sha256 = "0ll3h6ckmcagvsa0d02jymac95c3x79kgs4pi8dlly28rr7qa6b4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11843,12 +11968,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20171004.1231"; + version = "20171021.1009"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "17961ec04dbe924a4c43ff0fe94bd72d044d9703"; - sha256 = "14r1jhrrq4d5l0fsjacf619f4nhc86aq4jab8qzfkszi348r5g7j"; + rev = "cdea9409920ed8e4739af39b9a6f4e6dd8e8c50f"; + sha256 = "1ncbrq38ivybqlwm57aqcqjhz8bs99i9aa28012v1s6l5qbnxgks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11885,12 +12010,12 @@ darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; - version = "20170905.941"; + version = "20171016.149"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-darcula-theme"; - rev = "da9852867ac115a54ee350a750d4dae182706117"; - sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s"; + rev = "25f179b9fb72c1b95a3907aa4b4a44f8d261e45a"; + sha256 = "0x1amh0ycjvk218d6cyqizkak47b6r1wczakbfkvnbr0khgkgmr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -12032,12 +12157,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170715.1624"; + version = "20171010.2057"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "257b0674a5c4ec510b51febba0c7a18e0f10a1bf"; - sha256 = "1ww12h19scda90r4rkgiynk3zvhkhk44gwfqj2m49pr89y7j8lap"; + rev = "e7c13abeeb18f50658482c7df32701ae4ec375a0"; + sha256 = "09smbgql9ibgn9l729ylas747xj48ipm6as61l6a5pbch376qriw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12050,22 +12175,22 @@ license = lib.licenses.free; }; }) {}; - dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "20170525.1236"; + version = "20171018.1115"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "9b11e8fb63549ee3700fb53e92e4ce2cb302c971"; - sha256 = "1cp0qmnhnp57vihn343jz14kxm1rwn5b004q9yjlbv1am389rr12"; + rev = "570e58c28b7f70923dfb507496468b227d5905c2"; + sha256 = "18zsqgdafphwj98jqiaaih0p0qy43z5i7d9ybsmy6b3d2qykbrwv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla"; name = "dart-mode"; }; - packageRequires = [ cl-lib dash flycheck ]; + packageRequires = [ cl-lib dash emacs flycheck s ]; meta = { homepage = "https://melpa.org/#/dart-mode"; license = lib.licenses.free; @@ -12074,12 +12199,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20171009.105"; + version = "20171010.131"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "8ef32875da21ea278002da823c05b7206cc1a81e"; - sha256 = "1zci5bbc5s9m6dvgiypsxwkqiqd67la5wxrqny1qnsii5c4id1kc"; + rev = "a57c2c335d0527909f472ca51a2201ad44d38aab"; + sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12120,8 +12245,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "8ef32875da21ea278002da823c05b7206cc1a81e"; - sha256 = "1zci5bbc5s9m6dvgiypsxwkqiqd67la5wxrqny1qnsii5c4id1kc"; + rev = "a57c2c335d0527909f472ca51a2201ad44d38aab"; + sha256 = "0dg032h4ypib2baw83x5hgz7kkclgr6fkc0fiqd6rcikjg10y2rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -13064,8 +13189,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13081,12 +13206,12 @@ dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-collapse"; - version = "20170910.1522"; + version = "20171010.1222"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13207,12 +13332,12 @@ dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-filter"; - version = "20171006.711"; + version = "20171010.204"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13232,8 +13357,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13358,8 +13483,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13379,8 +13504,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13421,8 +13546,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13442,8 +13567,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13505,8 +13630,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; - sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; + rev = "f4f2f3ade3b592502b8336bc9d10288ae00679ad"; + sha256 = "17xsv9w7k0m1cdid11yjrrzqqw06kdvav42v38szsx1pp72fihkw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13564,12 +13689,12 @@ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredfl"; - version = "20171005.39"; + version = "20171014.1402"; src = fetchFromGitHub { owner = "purcell"; repo = "diredfl"; - rev = "2393653a1518b118180ff90ef2b66cfb7d0b555c"; - sha256 = "04yykal90pc4nsdlk08z6svsnddjzaz1drwvs3bqfjw01fr50xcs"; + rev = "085eabf2e70590ec8e31c1e66931d652d8eab432"; + sha256 = "19gjs90ai6fv4q7rhssrgc45d9g4frg680p1jgmbxzrd9jdy013w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; @@ -13732,12 +13857,12 @@ disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disaster"; - version = "20170507.1626"; + version = "20171016.1452"; src = fetchFromGitHub { owner = "jart"; repo = "disaster"; - rev = "3bab3c0db29c6d5484ab8aacbf29490e3aa2d713"; - sha256 = "15brdrcq2i3rckdh2ml5m1fvf7asgqij9swc1p9fgp1fk2i05sfn"; + rev = "10a785facc60d89d78e0d5177985ab1af1741bb4"; + sha256 = "0iz43jdkh5qdllqdchliys84gn9bpj6688rpc4jnycp64141m6cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster"; @@ -14474,12 +14599,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170927.1705"; + version = "20171017.1649"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "99a4c8691436b80ffb242512f026a8cc32b9539a"; - sha256 = "0ww95dr3djxdwba0kark0d1j1q4vkjhnpiv5s5gc5zhgbc0421rb"; + rev = "d91f72b83ec22f1620372574582e163f921e6796"; + sha256 = "1ykl835k0s5nkb6343yk4gyk7hdx4l96jnfa84vdq74x2asidfs1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -14957,12 +15082,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170918.2024"; + version = "20171013.2105"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "0d39c148abd5c76e5b39847a794ab3a240a7e018"; - sha256 = "0ksddljicrjx4cbx8ws31bskcirjvbsxz60f4xh8j8ywi3s7wj4b"; + rev = "e1140c3c27c0e434ecaaf748aa77f63e2289df41"; + sha256 = "19r77cya0bi1isv46l26k3n6vnqxf0jclx6w75jbbiirivpy9nr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15041,11 +15166,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20170926.500"; + version = "20171012.1339"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "023d2edde61d"; - sha256 = "1izhlafsbxfav4jvl7bqg188d71895r1sqacxsblvcld8c0brsqp"; + rev = "9e446540a794"; + sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15355,12 +15480,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20171008.9"; + version = "20171020.503"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "8f16fb1f510a147e7ab846030057d4c74127ffb2"; - sha256 = "15axmg6z1nlaz7xsf70arxazkkskkga2fa71iswpnhwqsrr90w8l"; + rev = "0b55c207c6552223857de03bf8aec8be3344ed26"; + sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16222,12 +16347,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20171003.817"; + version = "20171020.1157"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "e0e3fac0c41e8cf4efa2fea6dbb49d3ad80d6153"; - sha256 = "11zw1gqzxzim6y6yrbbbsmmyadpagqk5f79vmx8ly0x1ivk87ldn"; + rev = "4909b176dcab9c762048dd654032722002e0f4ff"; + sha256 = "0dr2xarq5irzq095hag6scwimqsp21866iaxjy27rygzgwp5g794"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16295,12 +16420,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170810.221"; + version = "20171019.1304"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "72adcdfb5d12d49429a1c655f0b02fe657445c4f"; - sha256 = "1y10xzvmxqj61r0sq3hcd6zq6x2ird1z54draaa0wpafgq8610g9"; + rev = "bd5e3f334044c8b33e2a0a2e0d8767aa6f0e03b8"; + sha256 = "1pyvpsi4krbmdx2739nnw5g71x3y209xwjl5a7xqbczy9qqxs18n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -17066,12 +17191,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20171001.26"; + version = "20171011.101"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "a0339b196760823a0f3bb0bcaf26daa62c356535"; - sha256 = "0vsyibph08xcxinjri4lzy44ji3albwpcpb469q0h43jjd2jw2v4"; + rev = "9c182dbbd7170c6626afb031bbc6a399399d2cd9"; + sha256 = "1vz8gc8az8cw2v7gg11l6ncg3cw09ynspxmp29rbcxl63qbis6fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17276,12 +17401,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20170722.422"; + version = "20171012.15"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "5c793f6df944b7f1a68893438696c12240f0b930"; - sha256 = "0p5q44p6jl306qns4xf7f03pq091zczvjnh9bjax6z6sx54yadsd"; + rev = "f4a84f71368dc343d09093312d1b2c2e9a5a3987"; + sha256 = "07j3bsv3vinpkxxbw4fyfgb5jb1kcd068821l59pk9yrw145kb96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -17297,12 +17422,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20171005.1105"; + version = "20171015.548"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "2d6dc9f31de8805f2b7630c874942fb7e8fb5bd3"; - sha256 = "1mrda1kvwv0mzgxi8z28a9qynlkfzpw0wgvwc86pkq94fzr6l2pj"; + rev = "36d40a66832a3ec37702813463e4acfbb7b6b5ac"; + sha256 = "1030ihnb35dyad1v7a63kyn94jk0rdkdgil7wnj8pkpzxjvyrwqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17892,11 +18017,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20170929.1427"; + version = "20171020.1349"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "b1ea89a08da3f5953d55072fffed8f781b461315"; - sha256 = "0kih2hvwrzjsw8k271hciwx4p2bxn4hgm4bsk9zdrsw9lxy0qqnm"; + rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d"; + sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18164,12 +18289,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20170709.207"; + version = "20171018.744"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "5bdf3ccc728ca2db734a686f9d4893c57ed59d90"; - sha256 = "0nxf35b8mblzl3yqq9h2lpr3q6r89pqljyglxm38aid2f5mjnlvx"; + rev = "001c3adcc521223f6b53a2243635528b2cb7f7e8"; + sha256 = "0hsrlzx8bslzhpipryxxqrdaiw66cgak14p8v47l0ylvwmxxqn13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -19027,8 +19152,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "e38c688d3961bedcd85f842fd052836cb345a902"; - sha256 = "1izh0zblnyklhya72cz8rf8pwq8q5smm4yp520vrkplspcspwbva"; + rev = "4b8255e9217c293f84a1e96b3ae8034d089e815b"; + sha256 = "1nyya11mpvw0k6gvz90iqsxj65w3c5y72k9rf60171gy1rplsbib"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19442,12 +19567,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20170914.1955"; + version = "20171020.2207"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "7581c109673c40aceff278cd524273f50ffe170d"; - sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h"; + rev = "9b1a49853909c4fae95d32bb9a68cace471c161e"; + sha256 = "03sr68mfi52ajqb6d9k3lpcrapjkqx9yynpfwin9y2328pmriaib"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -19631,12 +19756,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20171007.516"; + version = "20171015.130"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "d559b3d0e7db97a74823c20fda4095d1a14d9209"; - sha256 = "1cxq8k9m2m36zz3x04dranzg40k61qprhy4w91chl3384jf1rb39"; + rev = "78d86bf3a842af4dc77f02b01ed7589d8f9eedd2"; + sha256 = "064d3n05kkg8rkp6dnqsjpm9jy2qiiry01m6k7ifk25z6ab02kgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19967,12 +20092,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20171006.2359"; + version = "20171016.3"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "b6ed94c9a531ba905b729e0c3dc89fc32d888f46"; - sha256 = "0idp7wl22vzpy440jcrxspb47snk098h7gi7vn5fq5awc9pknwpi"; + rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5"; + sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20324,12 +20449,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20171002.2303"; + version = "20171016.740"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "92d614e731d1f2b8cafa4bf211e560294e378c14"; - sha256 = "006ny911qmxl7p1azdcf4d6daswglc06jh295glhn963sqkc2mgf"; + rev = "4777cd784953f5e38d76edf458e050605de45bcc"; + sha256 = "1mmkgpmb69c908yx9k7rgs4zvm1cf554bkqiqppkc92ml9gipfk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -20513,12 +20638,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20170613.510"; + version = "20171018.722"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "91c96e6ffdc6e7d5e49fd9b0ffb7df8794f0f2db"; - sha256 = "1nwibif8syk5dfygzcafsbh41gaxaps187zxdv75z2hbdbvqx1l3"; + rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a"; + sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -21021,8 +21146,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "b6ed94c9a531ba905b729e0c3dc89fc32d888f46"; - sha256 = "0idp7wl22vzpy440jcrxspb47snk098h7gi7vn5fq5awc9pknwpi"; + rev = "6ca96e8df9fb957c423ae4738e6229106861d6b5"; + sha256 = "1ij64cg6qq93vwxsj4w60xq7377rlzmrlddnqaxm95m2fkbwr7fp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21185,12 +21310,12 @@ evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visual-replace"; - version = "20170201.1920"; + version = "20171015.2313"; src = fetchFromGitHub { owner = "troyp"; repo = "evil-visual-replace"; - rev = "99559e1a6e813056a132f4be32b20f259470e9ed"; - sha256 = "053fqsl8cd2s0cyinvmihaglq4cv1l1ymxy7rcx9spknipcil1xp"; + rev = "163fc827a1ffc106475da470c37fb26f4cc9b008"; + sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace"; @@ -21331,12 +21456,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20171009.445"; + version = "20171021.457"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "086d1539e681e38829e3861cffdf62e49213ed58"; - sha256 = "17prr6b5za43mahdfz355k1p1b2jkwd1csb6wlph5g4nmplh5c61"; + rev = "d20ba97e36dfb8d6965e9f43768a5fdea752da96"; + sha256 = "0am1l6b26sjdf06gnfd78qvgy5jif6r2lqrfvypb6spv4j62xy5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -21805,8 +21930,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "fancy-narrow"; - rev = "4737d706d1f3e90885e6642ba782f1fa605414c6"; - sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid"; + rev = "c0f70b4333d4764323b7154e37a378adb1610ab7"; + sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow"; @@ -22875,12 +23000,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20171007.33"; + version = "20171019.835"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "b339f0efd72db0fea00964c224c20c6ee8ef92c8"; - sha256 = "0vyp9l8190xgy27jil0pfvc9j0hjwfiq0w0ia69flid0jxgirslz"; + rev = "ed41c2f1f7f97d866d379ee3f5d6f3d9f7847357"; + sha256 = "1cjg14f44m2j3inxzzvbv3gyrpgaf93sl3wivagq5cjngh68w23a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23106,12 +23231,12 @@ flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-color-mode-line"; - version = "20170929.1513"; + version = "20171020.2128"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-color-mode-line"; - rev = "19947b81ddce6df4f10d3facb7c047538036a9df"; - sha256 = "197knp91qx5y3kqbmnm4mcx61w73yr9xkvidvp96mfjzlldbjaz3"; + rev = "157b1edd79b44c26ef18862160e0ab50db27352e"; + sha256 = "0lrk2b6xa12zcv18z4j1lpl7b36sl7saz14warxc1fw3p7dr4hm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line"; @@ -23442,12 +23567,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20170604.811"; + version = "20171018.327"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "a249e60803b1e423c67e40462229646cc77fcb68"; - sha256 = "04xghj1l4fnfhl139k3s6q7fhln946gx8ak7l6ys7rz23iizbx4q"; + rev = "2e21ec3c4eacdc100b1a45e97884350f53b832d3"; + sha256 = "0ijazydkz9lwxbnsvanpv3202k35a4knipp08inlw3pm3k16p3mj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -23778,12 +23903,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20170417.1807"; + version = "20171014.651"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "b16b77f95e4e53a8951ebee6209a5de311748447"; - sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh"; + rev = "29a9eb320d62400564360986f7ad400b74070d8e"; + sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -23883,12 +24008,12 @@ flycheck-plantuml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, plantuml-mode }: melpaBuild { pname = "flycheck-plantuml"; - version = "20161122.219"; + version = "20171017.1811"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-plantuml"; - rev = "f1628d589991c3d51965db0f14866b1202374eea"; - sha256 = "1j66y4qps1wjdagr36kgqgz1w8zcmwnpwcvgwn4gkif34n96s78l"; + rev = "183be89e1dbba0b38237dd198dff600e0790309d"; + sha256 = "1fbdbpwrlkvbgv693ndr3zamkf3gp28v94jg911fsav8bk08f6pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/65f050860a0efda8cf472c2945b79a0a57651556/recipes/flycheck-plantuml"; @@ -23988,12 +24113,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "20170928.1808"; + version = "20171011.2136"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "fedb4094976349da1449f821fd79cacd7537e80b"; - sha256 = "0cxpcmx810zkrnqbzj064kgbsyj4qkr7dpps16xdk4ckbiih55rj"; + rev = "0cc2d60ae31f7e2b4e5898091f0a9ba7bafdc854"; + sha256 = "09a5x83qw5znxdrvrq71r0sgi77qjz901dhhwgzcfgf986si4rhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -24055,8 +24180,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24177,12 +24302,12 @@ flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; - version = "20170729.1411"; + version = "20171020.348"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "flycheck-tip"; - rev = "cbdff9a574fab1222ed50d7c1359ffb820f30934"; - sha256 = "0ic9cdsi30mx5ldrbzc2i9y4q69fpa9s19zrdk10i3wxs6mmgl8l"; + rev = "9b0072d92e6b4a52834bf5a34120a0f5e1c8c2fd"; + sha256 = "1adcxz2chy0qcv5z79hhj05gdzk4l0jijy5iy9nd3sg8sclxf6nq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip"; @@ -24286,8 +24411,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "393724d0d36a8269e57a0e4c2b3723071caf0a3c"; - sha256 = "02pm3x9frscgz5szddvbir0i7amnkzfj7pl4lgiah57bhcg1lhd0"; + rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; + sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -25794,12 +25919,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20170918.842"; + version = "20171021.431"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "71435fdd100712d6894d8d72a5667b250a0d8eb7"; - sha256 = "1c718gfms4zhzj06zmzdw71q6vhbf7mh3cgvq9vf8bnlv910p832"; + rev = "5504550605354146842c8f5c34482ece778b7b31"; + sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -25823,12 +25948,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20171004.806"; + version = "20171018.847"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "0e438c206059d268d085bb94d64782d4e2ae46b7"; - sha256 = "02wpp9q4aijv81vspvzgw9pjdmagflfnrd7w1m21xgw56hrg0mj5"; + rev = "98647eb56be24e27cf6abd210dac8c6299cd977f"; + sha256 = "1dhk9h7gf0hc8w9sdcgk89cbcjlxf4w7hn235rxd6iz7m4n28jzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -25856,8 +25981,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "b8a0feea5cc28136d053888b45c50a6e0d3d07fd"; - sha256 = "1rmfvvxgjdng1wybri8a2lqcimf4ywpl1wx9q04zzl8zmm5f2diq"; + rev = "021e595c589f45e8444e2d049d1300ce7811baa2"; + sha256 = "1k7fkwfgnai33mrdh3wkqmm00cyydkb13j04zmxiwg3w6q4sx3a9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -25978,12 +26103,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20170714.1430"; + version = "20171018.1049"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "a0ab1dc5d3f8e84e505d97041b3ce28a4cac94ce"; - sha256 = "0fka2dpv2gib19czg2p4x69h1d7s3hdg8j102qgc3da8d9vvhng8"; + rev = "18a1d0228b28d8abb4c0fcb4af6d9815de19be07"; + sha256 = "186915xday81bqxdpwp5h5cylmlyflk9s1w3x3ajr2wzp2q3arfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26270,12 +26395,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170928.2221"; + version = "20171010.1610"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "839dc555861dbb77ea2632b8dd4d58904f33a396"; - sha256 = "1hykxw6a14d6xivin44bfbgr8dy4l5pr50cg0fk4n18a7dym7pjj"; + rev = "c266950549a7a0841bf21e092fba632a1e061187"; + sha256 = "14axzczgnsvmwl32qvpw9p53iknwrya8jbqzhc4d2s4p9vrghk1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26463,8 +26588,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "0d13786a4cc413cf12de0ace9ba6f43ddd7a032b"; - sha256 = "1i6xjnkhkx406lia4f8qgyn27x20ridxkd4199wmdlf2w44fvpac"; + rev = "06515c44830788254602af90118de07ae2effb12"; + sha256 = "1ymjq9nsqzf8vhrzniwqzszwbdlq5y2nmr8pgbwhmh3bvfbpj7ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -26585,12 +26710,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20171007.1056"; + version = "20171019.944"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "ac973a806e79ec883a3d041e91d06745084a622e"; - sha256 = "1063wh3h5vv17mmppwbpsi8l8qnph0203h1lr6lz5001xv9rih91"; + rev = "e04050f81106029c342deb7adbfc67b2a888ec58"; + sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -26778,8 +26903,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; - sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; + rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; + sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26799,8 +26924,8 @@ src = fetchFromGitLab { owner = "emacs-stuff"; repo = "git-commit-insert-issue"; - rev = "5f08c17bf93b17915415d435ee41923d924fe20b"; - sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas"; + rev = "8d2448959073646d652687355efec6ba7b1e1af8"; + sha256 = "1ix2hbs3dfvjlpldpnb06j9al13zss6gmgl6l09dq2ic4warbag7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue"; @@ -27635,12 +27760,12 @@ gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnuplot-mode"; - version = "20170727.1339"; + version = "20171013.916"; src = fetchFromGitHub { owner = "mkmcc"; repo = "gnuplot-mode"; - rev = "eafa9395771a5ceace503cf5922efac1df0f5ec5"; - sha256 = "03799c7gwblpwpinbahbp5l510lg6yi85cmpsahsncfvkwirp2rm"; + rev = "601f6392986f0cba332c87678d31ae0d0a496ce7"; + sha256 = "14f0yh1rjqc3337j4sbqzfb7pjim2c8a7wk1a73xkrdkmjn82vgb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode"; @@ -27807,8 +27932,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "1a78dd6c36d7f37cbb60073523c2e9ca3f6519fa"; - sha256 = "1bcd62rggq3sk96n3dlpidrv4pbx6x385x17knfnp35avgrhsv4b"; + rev = "e990796e68a2ebfc099afed20b99e26d6b64061a"; + sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28353,8 +28478,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "911d9f4a7e3020578f4609860d7e5ede422a8f28"; - sha256 = "0x2wx34gvz4dab7gyzs1992pf1f8zl5s5n1q1b4ps1d4ralglq1d"; + rev = "ec88ff999b47a5adcd1b09cc8b49c793af337964"; + sha256 = "0bmbia1h85d8nsl2gk6wfi0fxij0d8ha56f2h9kk2swv3w5yg1d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -28538,12 +28663,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20171007.0"; + version = "20171013.1216"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "393da2aa55054b3ad06d24bf6f09a90554b6d37c"; - sha256 = "134cw4g0hj6msyxyni71hkhf8wa2v2fxr41zyamg8xf76j75jr5b"; + rev = "5e97554d1f9639698faedb0660e63694be33bd84"; + sha256 = "18x0b2qmyzf9sddsv9ps1059pi4ndzq44rm4yl87slq03y75nxi9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -28626,8 +28751,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "456200c5d4982d6938b7ed14fc9bb72cc12b1576"; - sha256 = "0i10i311fr7lc2mf7na1jwxfj2lmi3l4f1bx22f01q4yy32kv3ap"; + rev = "b729d2e8e0270dea62f10a63be34c021d123e41b"; + sha256 = "187fkjpsvq1gyxsgnbvxi4z62hv773ii1lxna3vfz4rqjzcjgxh4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28752,8 +28877,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "167311c6c270f1bbcf51d2181e4af578a34c1ce7"; - sha256 = "17bvizl9m1wdv3k6b289la5q56iy6b0bd96axlhb0ff10n48y29h"; + rev = "923c77a37a89811d583042eaec56a9d4f20cdac2"; + sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29135,12 +29260,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170928.728"; + version = "20171015.430"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "167311c6c270f1bbcf51d2181e4af578a34c1ce7"; - sha256 = "17bvizl9m1wdv3k6b289la5q56iy6b0bd96axlhb0ff10n48y29h"; + rev = "923c77a37a89811d583042eaec56a9d4f20cdac2"; + sha256 = "1vp80iw0fgrpgph512ia36bx2akcyanp0ydkf6q02wg4iidaw6fz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29849,12 +29974,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170907.903"; + version = "20171020.2109"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "9ced44c934e9d02dc41ab2f47686cc041f7ae5f5"; - sha256 = "1j10irax6h67wz76zlbhkylmmn4qnb9padwld9fk43n98cismbix"; + rev = "19fe60b9d07b6a29a529bb58addf91fec5392416"; + sha256 = "1x0vi50ibch57099ifzslyl6icw603bv2lasbrspz2w87qqg59mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30120,12 +30245,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20171009.221"; + version = "20171019.2338"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8529bbd8a850bc0c212c38120621f2b2cc8a7656"; - sha256 = "1rav46bbw807cbv93ash7ah3azsxbrnnpcsfm14mmc9x3mmjygrk"; + rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2"; + sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30351,12 +30476,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20171003.131"; + version = "20171012.332"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "299090ecb376ba269f2ffe547a672d210ddaceb3"; - sha256 = "07jym5zh07zksrn1f7x2j8m3agjzq06f9xchmiv7cic6x7b3shcj"; + rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e"; + sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30750,12 +30875,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170929.2213"; + version = "20171020.1124"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8529bbd8a850bc0c212c38120621f2b2cc8a7656"; - sha256 = "1rav46bbw807cbv93ash7ah3azsxbrnnpcsfm14mmc9x3mmjygrk"; + rev = "e98a4279135d5d7f4a2fec06c7e7c8b1a1fcacf2"; + sha256 = "075dvbfv5f36r1br7w17i6nhj1vxdnv3c0x2p28rgk5mv10bdpl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30813,12 +30938,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20170913.345"; + version = "20171017.342"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "3d215210191c61b775f7f63f3f5306ddfefc7e33"; - sha256 = "1vnkvlyg6br0a5a002il4fr0r819kl7nsff6l1zbiay75sgnj93d"; + rev = "2551469fb7faa1b7fdcbbcc3b143fdc8cab1ae66"; + sha256 = "1jmn6hyvi5y6zxbyddak6b3wxhck4w6mvi2fn7gnh04qvac2mb45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; @@ -31867,8 +31992,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; - sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + rev = "2f73061c886bae07bc51e4d9eb545ed8027c0442"; + sha256 = "17bqx7bkfzv4w7cf0l139xwg1shns680rq74hrqgicammb453kz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean"; @@ -32052,12 +32177,12 @@ helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-mu"; - version = "20161010.102"; + version = "20171009.1022"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-mu"; - rev = "1f9a6b0f8217c0c6359f53b724d9da4c3c3f896c"; - sha256 = "0ch0zip9ldsza3vq66hs8kyczlhdywr2i9sqkza4inm8b938y1dv"; + rev = "c3d7fb6fd55c760895e0bd6491bafe70aa11409c"; + sha256 = "15jfn7djc8bdvb7xhw2j1d69bn2zn63xdss4cvcckd8dgxpkqrbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu"; @@ -32665,8 +32790,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33144,12 +33269,12 @@ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "20171008.1448"; + version = "20171016.1437"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "aec98ee3c44c911936a309b56510384b8e835ff2"; - sha256 = "1x2f34bpzlckiyn2ndknm5gmra8xginsnavjqs4dn6n0knbcrq32"; + rev = "3e08b24e9eabbb17535d39b087895c04cbcd5c1f"; + sha256 = "17i4q307rdpgpw76m6brf6vis1znfwfqzhfcb181zgf2gam620hb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -33396,12 +33521,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "20170706.552"; + version = "20171017.1103"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "98ba6d3d7744d536aee714e1284ffecfe8f590cc"; - sha256 = "1y8jj0xgj6hqqshcfr406216bpni5sj0bh9q52ds9mn5plmh4asa"; + rev = "cd65d149b8910edfa5536eeda26988aabcfd511a"; + sha256 = "0746wn62vwgnn4hg8ag0hq80hv7lwv929pjk5cccqqz4s0kp0c80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -33819,8 +33944,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "4556ff94e6ed35eabdd28a061a07aadf436f0daf"; - sha256 = "1w5hwy1lszwcgqz43hw2mq95v6qm6ghxrzgrrw9p3cj2c4cz0kis"; + rev = "e18ec3f55e288883f8042065190572e91651733d"; + sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34046,12 +34171,12 @@ hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-sentence"; - version = "20171007.755"; + version = "20171018.819"; src = fetchFromGitHub { owner = "milkypostman"; repo = "hl-sentence"; - rev = "10cead52cb4da5dccfe30ba6756c11973d8ea094"; - sha256 = "1kl38jzgws5mw67yzg4055988sza36sdd8bq1dw68p9wi6kqpdqw"; + rev = "86ae38d3103bd20da5485cbdd59dfbd396c45ee4"; + sha256 = "1rzc74ckj06qs8kq2bd1cgqvgjd2qc3zxmk7bvgg6dy2m9nj52cm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence"; @@ -34341,13 +34466,13 @@ pname = "howm"; version = "20160928.439"; src = fetchgit { - url = "git://git.osdn.jp/gitroot/howm/howm.git"; + url = "https://scm.osdn.net/gitroot/howm/howm.git"; rev = "e0237b07f60011a1926b36848c73340ae46cdb3e"; sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f66d7b6835d06b8e7451aec9e32bb9288a6020/recipes/howm"; - sha256 = "007r8mjn7m7m1mvsb1gaiqbizlwykh23k72g48nwan8bw556gfcr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm"; + sha256 = "07wx3wmc51vm42s81km5sdbm600ax2pv83xg0116xsyn05za3bfn"; name = "howm"; }; packageRequires = [ cl-lib ]; @@ -34359,12 +34484,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20161015.1945"; + version = "20171020.1146"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "8b9281611c49335e97f2b644e34aa07a47dc4b2a"; - sha256 = "1pnsrirbh901qzqals6p2bbf28g2xn2zminwzj2x02cj49vfyqsz"; + rev = "9d659f04b44f416676e6a002728d9a16afc9bd96"; + sha256 = "190vzs0pqcm120nv7959ri3v5qha5hnx4lgfby08wyl4973xncf4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -34485,12 +34610,12 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "20161211.1019"; + version = "20171017.141"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "1f7bd7290e4698ac0b26b911fde7727fcb609bc7"; - sha256 = "1cy1100qzdpkk7kcr54262jgc4zl9jqn66v51g72kmhc90ayj8bh"; + rev = "a0b55cba65a225df8d9e17a3ac448ce9e8ec962d"; + sha256 = "0k23xz34ksd6n9xa8anbpvx07fymflyxdggy2is2kp0vqg66pv5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -34674,12 +34799,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171008.1642"; + version = "20171021.30"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "6d45ce89f26efe7ed0652415d2e999e5afcc5802"; - sha256 = "0ycn3gn442ap6gc1z9snbmmlrwd97rsf10cr3agf1z3xhzz2jycn"; + rev = "903dfb4b1f46495d7a8a83fd62142c9e0dda3a03"; + sha256 = "0v5a4xbzj3gbncwy05azahznh4fgj92f0vdz23l626w446cndz0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35912,8 +36037,8 @@ src = fetchFromGitHub { owner = "netguy204"; repo = "imp.el"; - rev = "11600a8441a1c0339252b0c19f151ccac3ee96c7"; - sha256 = "1k251pidqgjn380xbs2h3j02r76lq1gcqkslwfpvq2g3l3ksqkkd"; + rev = "48e6c4842b1fc2657a3c6c23029f89e35fafc859"; + sha256 = "0srjgzcmdgvdi9fm127wlj7zsbq00wsmb3fkzzpy05nvmm2dgng5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode"; @@ -36052,22 +36177,22 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, sourcemap, websocket }: + indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171009.444"; + version = "20171018.432"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "261f3a8f4ce7edb8fb04457896fe747013a926b5"; - sha256 = "1yikx5b6yy138aplzpdxda5pssnchbkpp1xr9lsl869vi4q25igi"; + rev = "db3b727c9deedcf9afa13e07cd25734cbf7305a2"; + sha256 = "1cm6zm8d7rywvlhzf1vpblqb1kgn6c7bwk9q2mjz7f5gdcsx1jp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; name = "indium"; }; - packageRequires = [ company emacs js2-mode seq sourcemap websocket ]; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/indium"; license = lib.licenses.free; @@ -36495,12 +36620,12 @@ intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "intellij-theme"; - version = "20170905.941"; + version = "20171017.715"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-intellij-theme"; - rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54"; - sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl"; + rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606"; + sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; @@ -36558,12 +36683,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170926.911"; + version = "20171020.1447"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "2d3c04ce523674e79f9339189a79e6841e1fa587"; - sha256 = "1dgdbfxhhcda7hn9njvsjygn59rdx9wv9cgpj3aysll52zri8lh3"; + rev = "55b17bc6b9cf1e8621a210fd07de6177e55d1334"; + sha256 = "0zx6p1i3sy771hp4n3dkfgypwrrr35qpa71hlhs5zrcn17xka9jg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -36852,12 +36977,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20171002.1130"; + version = "20171018.1550"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "a571167eca2533343f523f0c9ee3886de2d7b917"; - sha256 = "1jh2w800dgadmc1xgxrhmbs8i7bz4xh0h5bdrambnwl173ca23pf"; + rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605"; + sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -37125,12 +37250,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20171007.224"; + version = "20171021.207"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "6827edffb70890f2e94c3d146ed129bde581992d"; - sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; + rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; + sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37146,12 +37271,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20171003.131"; + version = "20171012.332"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "299090ecb376ba269f2ffe547a672d210ddaceb3"; - sha256 = "07jym5zh07zksrn1f7x2j8m3agjzq06f9xchmiv7cic6x7b3shcj"; + rev = "1e1eecfdb62e80a9166cf6e7a3ddb8ff0e80846e"; + sha256 = "0j8xfd11ragnmz51fgfnliwqcxsphghcs8l0cn7m44kfl1kpn9pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -37255,8 +37380,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "6827edffb70890f2e94c3d146ed129bde581992d"; - sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; + rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; + sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37381,8 +37506,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -37503,12 +37628,12 @@ j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "j-mode"; - version = "20170911.823"; + version = "20171017.1813"; src = fetchFromGitHub { owner = "zellio"; repo = "j-mode"; - rev = "cf27446120c779f90aeb0b14aae24d55d2a4fe36"; - sha256 = "1f61finp605k7bii7g0gm92vpjrl5q3w28nykc0w95lm36hmg7qv"; + rev = "96154937120028f24ee4933904ce4240c87f387e"; + sha256 = "0mni4wk9kn1iq9vyl7v7akjsb566sgm2vwwsc4sk2mf4x7g9m2rs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode"; @@ -37879,12 +38004,12 @@ jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jbeans-theme"; - version = "20170816.754"; + version = "20171011.927"; src = fetchFromGitHub { owner = "synic"; repo = "jbeans-emacs"; - rev = "19a09bebc20fc981e77950e8495162de49c824ae"; - sha256 = "06my9qmj936f80gc9nn1akjr6fjal23125zkllz8csm1j83vqcvk"; + rev = "d3cd21b794ba94680f0f3aa574b5029a749430e6"; + sha256 = "1c3qb3f4dapvfwwrnbgx5sim515pr2i5lvmnid780wphymwjslsc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme"; @@ -38296,6 +38421,27 @@ license = lib.licenses.free; }; }) {}; + js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "js-auto-format-mode"; + version = "20171019.2142"; + src = fetchFromGitHub { + owner = "ybiquitous"; + repo = "js-auto-format-mode"; + rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09"; + sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; + sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs"; + name = "js-auto-format-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/js-auto-format-mode"; + license = lib.licenses.free; + }; + }) {}; js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; @@ -38425,12 +38571,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170930.820"; + version = "20171014.1229"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "5cb52a7de8218bb2d50f67ba422fa7b2d51d1dc6"; - sha256 = "1b4kq8qix2lqhcqabbyhl3rzm99dzjspqqs6srgsgwvb9726q25f"; + rev = "dd295e838d3878188b1797b82a86867e3e56d22c"; + sha256 = "04axxxhy1jbn21bzsxwlirsv9mnzbrwcxbql28vzvw6572vkrb9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -38446,12 +38592,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20170703.314"; + version = "20171013.258"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "924936b42777f2513ec6893c68a41756bcfeba83"; - sha256 = "00p4yvlc0bcwrcr203my4i737fbsv42iz92pfgxwq6p47c42nq2a"; + rev = "b9829059745fbedfeb8c48646056fb27ce23a33a"; + sha256 = "1jwkly6srxx21ff6xnkvr7qqrlpsvis8i89v0z7vfz5f05yryscj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -38759,12 +38905,12 @@ julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-repl"; - version = "20171005.123"; + version = "20171018.443"; src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "2c5d681ddd3bc6018c394f797cb01add805ed573"; - sha256 = "0l8asipch5pfk90jzifw0jxwhsfq9kam8msxlxscvhfj7wphc038"; + rev = "fbee2f5995a7781576b7a3b9f0707ea1e7ead2c5"; + sha256 = "18vqw0sz1ifhd6hpa5am9z2qykqz1dxwav65v8vgl6hrrbnkfzbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -38885,12 +39031,12 @@ jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jump-tree"; - version = "20170819.2137"; + version = "20171014.851"; src = fetchFromGitHub { owner = "yangwen0228"; repo = "jump-tree"; - rev = "70db2bed56e6e3433ae1f57df4aaa128e644faa7"; - sha256 = "1w0a33mrg4dqkq7rfs182d57lg9r15ab48m7hzb9zm0i6c79aqzy"; + rev = "282267dc6305889e31d46b405b7ad4dfe5923b66"; + sha256 = "0r6cwpks4aylndvq5lcny3799fag05zm36gd11043wca7sgr90fz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree"; @@ -39114,12 +39260,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20171008.451"; + version = "20171015.2347"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "kaolin-theme"; - rev = "bd105da4115d3685f14b511dbc975b22a1c94483"; - sha256 = "1iz288qygwcsz2gmnbcp9l92hbqvn27vkk07ik4bxgziksxyf2l4"; + rev = "b0808035ab7bb9b5b03a0f80dfb01141beeac75d"; + sha256 = "15bklknvd3x3n75shwis4j9gjfpwms37vaxvwd2bym3m1kx8kh2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; @@ -39622,8 +39768,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "fed61946603baf381404ae74009f742ab277d848"; - sha256 = "1gxav0a4934z53sdkfa4wllzcfc5cnz66xcjayrzb17g1dxr3yzj"; + rev = "1f4fdb290b9ff6f3a0694cc0cdad56e78a9490bb"; + sha256 = "0cmhsnc20x3n2njs16w6ng3s1csc8pp3k00p6ibigbbs06hd0v7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -39807,12 +39953,12 @@ kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kotlin-mode"; - version = "20170522.1524"; + version = "20171009.1301"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "1ed0c5589ef2d53242f767f6071dbea90c64e813"; - sha256 = "0nywyf0znaffkchca5hal1w6h7fis9pybiivz7vzrr85ppl0gzas"; + rev = "ebcf6f3730f455894ebb7ed8e42950f66e8e1c1d"; + sha256 = "1345ahc8i69sl2d9v03gdgrdcj7qkbzrl0pl957hjn3vbvmhrz00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -40356,8 +40502,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a"; - sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr"; + rev = "2f73061c886bae07bc51e4d9eb545ed8027c0442"; + sha256 = "17bqx7bkfzv4w7cf0l139xwg1shns680rq74hrqgicammb453kz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode"; @@ -40948,12 +41094,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20171007.209"; + version = "20171017.1052"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "7de90475f922ea1ec757c16bc96d704b2d876198"; - sha256 = "13rx0ywbcplnh6swkmzq5ypd8a9ymd4w198pkl97cw5s6vzskh62"; + rev = "d70db0d6cfae3c030167389828219b9c9ac88248"; + sha256 = "1jrcrlnn0k814wqw2dyzjhcc7q4k95pp7apcmfzv7zk5jwf5p0xk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -41267,8 +41413,8 @@ src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "619a1b35b9a8151703421e2716ea0409162a4b84"; - sha256 = "0dakcsdn6pax0q6wdvg23fg327nk35z3lzk2vlvc76780d0fi85h"; + rev = "145d21d65b5469e682ef464ae8f4e0e3d8c0f04b"; + sha256 = "1h188cprka13bd1prfj1w86m5z8c1nfaz4dw18g88jf6b0gyazhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -41371,8 +41517,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "f7ceddc7e61d486863a6bf9ddcf74bb87fd1b977"; - sha256 = "1v0wwdg57l613s5zd47wri75pgbwh6n401q64mnyj8frfb2670j0"; + rev = "7f2ed036912341ef20004385cf71d053a3cb156f"; + sha256 = "1kzzh5sybp9y47xzc4mirk4b6lcf736sxvi91rvf8fm5gp075sq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -41782,22 +41928,22 @@ license = lib.licenses.free; }; }) {}; - lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }: + lsp-go = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-go"; - version = "20170709.1021"; + version = "20171021.336"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-go"; - rev = "d3ff1fdf5c5e735d5beebff3b0bbbdd3432fbfdf"; - sha256 = "08kasnkg7v0haqrhd2r6dn094vcdhygc1v9nx3lhlfd1sq84m7qh"; + rev = "d270b7c0bd893fdc73a97763e07706830756cad2"; + sha256 = "0i9l56dmkxcycn9a2ddj1zwa9cmzb5lpj6qn5x1k9q9yfk9hsc6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go"; sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c"; name = "lsp-go"; }; - packageRequires = [ go-mode lsp-mode ]; + packageRequires = [ lsp-mode ]; meta = { homepage = "https://melpa.org/#/lsp-go"; license = lib.licenses.free; @@ -41806,12 +41952,12 @@ lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-haskell"; - version = "20170919.626"; + version = "20171021.330"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "a749bd017c293a7231639f75f024ee922f44818a"; - sha256 = "1yynwf0m0mkm0xxbj3sgy0zhkxzfw1qhwyvfq5fcgpqw59xfps6w"; + rev = "16ca9fa975e64e840e062485ed30e4b297d72424"; + sha256 = "03zrk3h76hpacrqw7lchjbslh0lg081jqkgf9n5nhxj2jg60v3vd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -41827,12 +41973,12 @@ lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-java"; - version = "20170522.633"; + version = "20171021.330"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "350c48ff4bde3c19b02b14ee519cd6ac7514d94c"; - sha256 = "07392bkq5b1jymplxm76yskyf2d55s4hd46zf890jxrjzybk0ffp"; + rev = "c3aefd421535e63929bef25cd341e893572abb18"; + sha256 = "1mr3pd1744dmx0mk0advnf3d8l8axjmxkik7lqzwvv1rl7x734wx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; @@ -41845,36 +41991,57 @@ license = lib.licenses.free; }; }) {}; - lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "lsp-javacomp"; - version = "20171005.659"; + version = "20171011.422"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "e45ac9ac18375d63fc068cbb466ed580ccd9476a"; - sha256 = "0hpidswz1rfy8fmjw3m6jxhl4p9134521nj7fana5x3dl3v5c9kh"; + rev = "bd3c3714158fe52d19025e9a13efd5e490b1d202"; + sha256 = "1gv0dl0vp2nkf7j74hin8kdmjppqz9cgfn2lhg06yj32yzvg6xbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; sha256 = "1gp8dlcpik2lmpicccq2kya498pmw9m8vz9m1fbd725p7wk58fhi"; name = "lsp-javacomp"; }; - packageRequires = [ emacs lsp-mode ]; + packageRequires = [ emacs lsp-mode s ]; meta = { homepage = "https://melpa.org/#/lsp-javacomp"; license = lib.licenses.free; }; }) {}; + lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-javascript-typescript"; + version = "20171021.253"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-javascript"; + rev = "c349da788f77b60f7e8ec8917054e97b8f41bc70"; + sha256 = "1b6lskd57p3c1dfz0c4pn80ksdq7vysjlbk3ja0az1nyxczmn44q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; + sha256 = "0pml7f7874c5xx94qpq7w5sz5hcail8s5nm5sy5vgax1j742r5y1"; + name = "lsp-javascript-typescript"; + }; + packageRequires = [ lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-javascript-typescript"; + license = lib.licenses.free; + }; + }) {}; lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20171005.946"; + version = "20171021.234"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "252396b8631c5f6d5fc4725e9430feebe408568b"; - sha256 = "0hbhv6ch23z2wyigsq3270x07kqr7j2kxz254ps6ym67dr3kka4x"; + rev = "e67ecf89b3878f8d5d079af3ce2b57933aeb1765"; + sha256 = "12ms4zl8j3s9nbqqasmglhnagxrpf8cjplagv2dakdlq7zllr8ri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -41890,12 +42057,12 @@ lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-python"; - version = "20170430.443"; + version = "20171021.254"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-python"; - rev = "7057d3797ecfafab21f3365fd55ba14d44b278ec"; - sha256 = "1gw8zfxd9chln8z8sdxy9xjzs74q5zbhsgl9zc3sl8d0ml027qar"; + rev = "5acea5f921dc396ea092ee253ec01b45dee3cbfd"; + sha256 = "0nz0n7k0i0h77fn8w0d49b4pkljw7l15hzvjym16jh4gr1n098ar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; @@ -41908,22 +42075,22 @@ license = lib.licenses.free; }; }) {}; - lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }: + lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-rust"; - version = "20170829.142"; + version = "20171021.241"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "613a379e8cf62597181c72b3e4a69893852c60a6"; - sha256 = "19p8cw38kmj0kjw0kknicd8zva9f7vai9rjk3xbli5cwpmwvizy8"; + rev = "da4877ea682e46d6d6bb0077be5d00269f4c14e8"; + sha256 = "1miql5v987k6hgxxq0fqzj20al9y3qg79a5pi9d3y4yvzznidhpa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28"; name = "lsp-rust"; }; - packageRequires = [ lsp-mode rust-mode ]; + packageRequires = [ lsp-mode ]; meta = { homepage = "https://melpa.org/#/lsp-rust"; license = lib.licenses.free; @@ -42247,12 +42414,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20171009.314"; + version = "20171021.1158"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; - sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; + rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; + sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42464,12 +42631,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171009.258"; + version = "20171020.1153"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; - sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; + rev = "3bb31c5705da67a8a66c2e72997b555a4f02d483"; + sha256 = "0crb7invjf2q62m3nc1cyb09m0jj5ksar813spavp1bgzj73y7hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -42590,12 +42757,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20171008.917"; + version = "20171021.1302"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "50bb82d310d5720db82ad5b437ca47c0ff0d83a3"; - sha256 = "10ri2kqzcq48xvdyz9pm9d5j5vlh6f7nx4095s4wwxf22swkpnr6"; + rev = "e5f33e46032deb381ec67832451a6c69cfdcb1e2"; + sha256 = "05s6cfsgxpqb6gvx6n4qdz5fznd87x7k26lz7ad0v7ky461any7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -42758,12 +42925,12 @@ makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "makefile-executor"; - version = "20170913.56"; + version = "20171017.438"; src = fetchFromGitHub { owner = "thiderman"; repo = "makefile-executor.el"; - rev = "90872c2e2ab05da7e8a9dd195fc696b4388c0f35"; - sha256 = "03505bzrlz8jxp5fda5zqn58860xbhhz5xy33wvnh1w9632ljdg9"; + rev = "a950438c93dc2fdcb867ac25174c773deda95aff"; + sha256 = "1vpa24k8gm9zr8mpam76k1wbzc1zama5s5ch1f8c1h539l8i8cl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor"; @@ -43123,12 +43290,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20171001.730"; + version = "20171021.1428"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "bc79248c605a5ebd01d96b26e5d5dba39bddcdc7"; - sha256 = "1d0c5l4g3miwzn51a3fsjqnv9shm8kw4inn2hwg2ff40jfrgfy1n"; + rev = "df31e2e82bf88655ed895c4a372e28e3a3569353"; + sha256 = "179wa75kzr0k8kjgk4z5iq5v2c8zbg7c6ii21fq35kyikkp5n8n3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -43319,12 +43486,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "20160807.1954"; + version = "20171018.932"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "d5b6fdd97159b22d5a9dbc3b0db18a04089b3f2f"; - sha256 = "1pix1cz8zv3kgf103ml1y42a0l2hvakbykfpbyx81z4nw7n958lf"; + rev = "406ea2f60c7e4aeafd384b8d6696d726b3d8f611"; + sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -44011,12 +44178,12 @@ mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; - version = "20160704.633"; + version = "20171016.335"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "d5f7c5abe90831248581c26ef3abfec70b2c2b9c"; - sha256 = "0f5ilbl6dc5hf9s4lfp027qjdlwd0kzb7sni7lda6v5597vhsnb4"; + rev = "03a50a7dd5f90fb981b72e4b9e9385e4d1fe3be3"; + sha256 = "17p6gkf6xmx6sflzd3pyc3p3x7ma8p497hmj1yc7w863kqm8jclk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -44597,12 +44764,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20170813.1957"; + version = "20171016.903"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "ce9e42adf9333c68967597c17272b3a3c7564cea"; - sha256 = "1cl4ncmynhrvmllbkkwnw3064vw93xalk4zzy4bpb2zf74vwl1gy"; + rev = "0f74ecf500f833f7f959187a375dacdd33d4d569"; + sha256 = "03ixygw28hzn00136747mv2r3vii3n0gif1wqgg3k7ajh7c45f5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -44912,12 +45079,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20170731.504"; + version = "20171013.236"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "8dacce10f3c2d362c4fb39485a3f33c3b911b8b3"; - sha256 = "1j6zz9lkr4n5k758qqmk3n0w69fi9grgcv8zqvhxx7yvpk9c8nvs"; + rev = "019e07947426f0192fc3458f3f72c19031b607de"; + sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -46049,8 +46216,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "Nameless"; - rev = "ab1a5c589378334eafca105af1a17f73b9065423"; - sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d"; + rev = "108f16e743aecd35401c0e914c896572cf1d5082"; + sha256 = "110bxdn2sqxlxqffaxp0yc6g2hglbv91az00mmgc01n6hjxcrc3h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; @@ -46066,12 +46233,12 @@ names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "names"; - version = "20151201.404"; + version = "20171012.1214"; src = fetchFromGitHub { owner = "Malabarba"; repo = "names"; - rev = "65b577b1215c4cfaee1ed5e98b0545e9ef7b9964"; - sha256 = "13r1qmibjikx6hz36m6xf79wap6fci2x7jz7rac5s52hq2hdj2wk"; + rev = "1d45ec50568eb2f5b55973f7ed0b48c68f9f13aa"; + sha256 = "1z0zdi9r6x6pqy2qfj9krkmbmlw9rlrgdvgn4dppfzrmrig8libr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names"; @@ -46695,12 +46862,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20170830.2113"; + version = "20171021.1054"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "bc3af5a44f4272a8afa6e6c09f95f1cdd205c70e"; - sha256 = "1spyz9n1p6n4npm6j4ngr89n7y2f33kp2xj6jwvd4y4340g62m49"; + rev = "fd1af9030443a49d333956afc36491936aa930fe"; + sha256 = "010jr43xbwr2rfgcvjgb522ms92d0945svlngfdhkjq66bnl41a5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -46741,8 +46908,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "b26168be150bd1cbdd6daca59f53755a56fe7939"; - sha256 = "1g10scd55asi5mfkbj0mdi098nkhy0phvnllwbv52vy6p0amppq9"; + rev = "e234a7bdb6c42f4539c0ab09b624f191287c2c10"; + sha256 = "01hsabhvp1yilzdss3mkvrskkvxw41xxch6lkwlcrr6h5f70szi2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -46926,12 +47093,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170906.558"; + version = "20171015.2358"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; - sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; + rev = "79c18c7efffd80446d81201b4c7dd92dde6cac3a"; + sha256 = "1xganpzb7sy5dlazjzrx9cif1r1n8lf3za0jwlq806w7601g5nym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -47136,8 +47303,8 @@ version = "20170927.415"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "54aef071590cb23f61da943daa29080cf7446696"; - sha256 = "0hh7276br857a5s5wms2wxf24jz3vvdpqm2d3zrzdfgz54ix6cp7"; + rev = "d6929040a4828cf17fb1a4f4d49b95816a5e7b7c"; + sha256 = "1scgmw52ny6wwwdl7hcr3cw84ag2hrrvik6ppp16pfyzv58ywyw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47297,15 +47464,15 @@ license = lib.licenses.free; }; }) {}; - nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }: + nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree, which-key }: melpaBuild { pname = "nu-mode"; - version = "20171007.1521"; + version = "20171021.1508"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "4a3fe40585031a1c2b323e28f536a3840f0776bd"; - sha256 = "01pl34cn6z1hky7gwh832vrkpyjsbc62ihbnqxj9rma5w9dfwarx"; + rev = "161f41f67b3fb10c2e3025670485a2dde24ab54b"; + sha256 = "0bqc0v4q222lx39axys2yfcfby6a5mcllnmpr3jdgsgagdhxxk05"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -47318,6 +47485,7 @@ help-fns-plus transpose-frame undo-tree + which-key ]; meta = { homepage = "https://melpa.org/#/nu-mode"; @@ -47583,8 +47751,8 @@ src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "079dbcbfa229407ae2f53689a4d045f827adabd5"; - sha256 = "0jinxwv72yypns22iv2v4ll1wkg2ca5vbx1v36pgxgmjvawfilvr"; + rev = "f0bfe88d6032e9ae8f4953e2569aeca5431a3e3d"; + sha256 = "0ak23m2i24ix9443236zdvp3f3j27dis5k6pivic3whmb618g3v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; @@ -47600,11 +47768,11 @@ ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-axiom"; - version = "20161122.1222"; + version = "20171021.1448"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "110e20a7a86c"; - sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm"; + rev = "fdb3336941b9"; + sha256 = "0adi26fj1rgcjis5xspbcrdzb98d3fd693pxv9311ffsxkpfsl9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; @@ -47914,12 +48082,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20171008.1733"; + version = "20171021.839"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "4a181127000e43dd520e600880b49607747d8f08"; - sha256 = "01gfj11pd97xp02bdal3c9wy77ha1dcym1ddrbpzkvck2ja1s6ib"; + rev = "c93d26342c28d1ba01ab46406f7f277128d85e6d"; + sha256 = "08p7sm40s0sb4cplh92krp18jkjm62m5wsivcpzyln7ambb9ml3y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -48040,12 +48208,12 @@ ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-php"; - version = "20170819.245"; + version = "20171017.2206"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-php"; - rev = "ffbda1f7df86778e3209ffeef832433f0eb25a69"; - sha256 = "00ca5m6rmrxzy1aldmavv7f5i4pjfcyivrlgv2ri6dm8amvbk72r"; + rev = "c281c1e17f0fd7de4adb6c3e6029dc2bd76beca1"; + sha256 = "1c0967cpimmr5j7ymr4654y62f615dfrv1h3385i7n57jsvqr6bs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php"; @@ -48527,8 +48695,8 @@ src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c"; - sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; + rev = "002e047d848beb0e0b77538f0674dd171efc9d66"; + sha256 = "1al44f7nrh4jbx4vdpbps92pk6px0my43b24brinck186j8d7vc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -48670,12 +48838,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20170823.1754"; + version = "20171017.210"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "da7955aaea2a3f3ad07b457b9737a24534674e33"; - sha256 = "11qvlwsy6l4v9jcdnf7g3yxy85g1qii4hmrpv6s85vbfsn9rxxw0"; + rev = "4c8b62f54ec4151cf8b48a7e1f904d3b4a7d73d6"; + sha256 = "06hyn8mmi7ikgwpyds17z35rjwxrlwjkvv1dmjcp4jirnqbp9lmk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -48712,12 +48880,12 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "20171005.955"; + version = "20171016.1440"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; - rev = "192d51d843c6581d593a4eb01f1b49ad59d206cf"; - sha256 = "0n24rhzl1zhlkdkjigsczyc0z3yrihz9qnn1icrk6nkms107qbnn"; + rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea"; + sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; @@ -48775,12 +48943,12 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "20171008.1207"; + version = "20171009.1451"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "98cdc402c3663e30a2bd260911b2ac0c93f93129"; - sha256 = "19pwhbg4db5g4nq3j7axdh81k6ikm2jirwdkl38nqyr0sb0s2w33"; + rev = "9eee3161e5cb6df58618548a2173f4da7d194814"; + sha256 = "1cppy9p5k8737jjgjlmfqqfdx048kpjn5cx7iw0dxal180y3i39g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -48838,12 +49006,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20171007.416"; + version = "20171015.1228"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "40b6251a96057c80a958362a0886c06eea5bfd62"; - sha256 = "176qfjd0qfgypj7pyi2p7v6zn7sic86gcgxz056k4y2akm6aa2p6"; + rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a"; + sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49439,8 +49607,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; - sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; + rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; + sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -49453,27 +49621,6 @@ license = lib.licenses.free; }; }) {}; - org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-chinese-utils"; - version = "20170313.2148"; - src = fetchFromGitHub { - owner = "tumashu"; - repo = "org-chinese-utils"; - rev = "f44d7114899102f1e1109bb7aeeab4330281ff94"; - sha256 = "127nnjdd7p3sy38pd39ivrpxgnzdhbh6sf99667s7qxryfx837y8"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-chinese-utils"; - sha256 = "0bxx81zigbv5vv3aficd65p03lgpp2iknj8qgvn2k4wgbv56j4q4"; - name = "org-chinese-utils"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-chinese-utils"; - license = lib.licenses.free; - }; - }) {}; org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-cliplink"; @@ -50001,12 +50148,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20170527.2154"; + version = "20171017.2015"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "4d8bda9b5207175ecd3ae647ebec42b3546efd49"; - sha256 = "0877klmy48ad0rpy7azd4xbm9d07wrhr3g96sixx35wgp216kvlm"; + rev = "ff048833113bac1ee67284826a6c3a4cd70793b4"; + sha256 = "071z37sv6fw1dggi2ckphb1srzvanwnmy0xbsa3b2pfpv4yvvdhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -50026,8 +50173,8 @@ src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "cda1980b013afabd299e7a2294517897f6442d98"; - sha256 = "1y6idbp74vrr3g0r10n09znky8ih94kzf5fyil47sjkqyzzmpk3s"; + rev = "06402de02461338503bf034ceca44c3a5a898778"; + sha256 = "1myrxs1s51vpv3a47fbprsh4b17ylglxqv2nak5i1g2834plhpgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -50106,12 +50253,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20171008.644"; + version = "20171014.141"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "0a0aa9b11005ff620b447c75e15122f6c0f9d81b"; - sha256 = "1m5qih09zyi8awwf2badis9czy0biwnpxrhd26an3ssb07i7ajgs"; + rev = "db707a73379fb3b21ae6e24c6230bfd3dde7ef45"; + sha256 = "1sy5d1nnhvkan877bx2pbc16n7sy2jn5cpdsca06mrxb1m3mxzbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -50127,12 +50274,12 @@ org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mind-map"; - version = "20170912.1411"; + version = "20171012.1834"; src = fetchFromGitHub { owner = "theodorewiles"; repo = "org-mind-map"; - rev = "73026279191516396637e6e33628be9c0314545b"; - sha256 = "04v5gdmprga75y9yqx2ism28vnwsy5ky7hfzzdi44mq2gd3m8hfl"; + rev = "cd5dbe2bded1294de1bdc881e53d691244e5c921"; + sha256 = "0x7nbgcsf0nhda4m7qrxdaa0sffkndfd59nrr09vcxap84rfwacm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map"; @@ -50250,6 +50397,27 @@ license = lib.licenses.free; }; }) {}; + org-onenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, org, request }: + melpaBuild { + pname = "org-onenote"; + version = "20171007.2200"; + src = fetchFromGitHub { + owner = "ifree"; + repo = "org-onenote"; + rev = "5ce5cf4edb143180e0b185ac26826d39ae5bc929"; + sha256 = "1jlnnb04ichcl155lklvjw91l8j1dvg77bv1815chak226aq4xqj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7705ee9a8733733664b6214bf4eec15d640c6895/recipes/org-onenote"; + sha256 = "0qgmizzryb6747yd80d3nic3546f4h8vjd6c30jr99vv2ildjsfk"; + name = "org-onenote"; + }; + packageRequires = [ oauth2 org request ]; + meta = { + homepage = "https://melpa.org/#/org-onenote"; + license = lib.licenses.free; + }; + }) {}; org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-outlook"; @@ -50432,8 +50600,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; - sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; + rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; + sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -50453,8 +50621,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; - sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; + rev = "3b6120fb54bb6c8555dc24a883ddc1c8c1a601f0"; + sha256 = "0sqw4iaq9mggfwhgkc27pidqjzd3lz7qjqvdjjc23dyichsri3hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -50581,12 +50749,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 = "20170927.2056"; + version = "20171019.724"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "5fcbd975523281e5bacaf0284af21b4387147a98"; - sha256 = "0fc5kcz1xy819m960qn28hz9c13qpc542kzihmzkc3ykm5d96x3c"; + rev = "3c022af9adb6ff96edcc2f11ebf20cfd576df702"; + sha256 = "0qsiclmg9vm1svgr8m4yj0dwwvrvga1qaa6bzdhkw71s0r931sl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51054,12 +51222,12 @@ org-web-tools = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-web-tools"; - version = "20171008.2128"; + version = "20171014.804"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-web-tools"; - rev = "dac686b18cddbf3af4632054b15ff53c1ae8d564"; - sha256 = "1bw543dc0lbzf4s3sjwg6y8pszfpkby5dyj0pykg98pcii51agkj"; + rev = "e9583248e838806271643770102e786671fabaf5"; + sha256 = "07kdgkkl3f7w1nxdw1j7vcm2f05sdpd06dlw7vpdd77pdbwafp3h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools"; @@ -51114,6 +51282,27 @@ license = lib.licenses.free; }; }) {}; + org2ctex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org2ctex"; + version = "20171016.2343"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "org2ctex"; + rev = "1b74aa9cf45de224ffd6aa9b93f0debddc2b48bc"; + sha256 = "17qkz3ja87hhq41hvlxvdzqipmi1gn38khd00dshsxhk5hg7i99a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8f77fe537ca8ee2ddb6e3efe71f3b3c560c52c7d/recipes/org2ctex"; + sha256 = "0049zf3ls7vbbcz1hdwai57ih9gppk2j0gzwijzwkb23ccwaf64a"; + name = "org2ctex"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org2ctex"; + license = lib.licenses.free; + }; + }) {}; org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org2elcomment"; @@ -51903,12 +52092,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "20171003.327"; + version = "20171020.1659"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "c12467d1c6a2a3f89e1e271c44e29eb5409ed9df"; - sha256 = "0qlnxqzc3xw12w62kgjmmkvm2l25z4rjz77dnl4y15pqrjl4ljak"; + rev = "a93d1833533c3589dbba62dcdfd13f99881e0fad"; + sha256 = "1iqdsp70h98qwfah91w9rj9j29952zkr6q261mrfy4c43jvghvln"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -51966,12 +52155,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20170930.1905"; + version = "20171019.936"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "98346caff78f5e8740505bcade85e00914bc54a6"; - sha256 = "0c1ajqybpcv0nc5fklq01lkz1f0320wnn43i0r22d4m8dflqfhy0"; + rev = "d0e8a5d7505ebdd55074a3ecd6ca467931b98454"; + sha256 = "1r39bllndh44jjsj4j0h8sqmz8a3xkwlp6cj9d7jvp640s8wddim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -52050,12 +52239,12 @@ ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-latex-chinese"; - version = "20170401.439"; + version = "20171014.1532"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-latex-chinese"; - rev = "f79d25443987a169a1234f5fbb2bc115cccea33e"; - sha256 = "1sw7wvsyp5z7jdijkc3lyfx7b0cq3c60fjdvmqlpygl9020md99w"; + rev = "3af3872c5435b6d4feccd0fd2bac32cd156724dd"; + sha256 = "06b3k3c407dvj0gx73w8wspy2mndl1q2s9wlq4g6hs2v4i2pd9dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese"; @@ -52138,8 +52327,8 @@ src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "7a7635ceb3e6c6050e1a932dc91b639c41572b51"; - sha256 = "1fr33hljpb9f8035ghqrrw14ybqjnc8w0m714yx8jp6hbvjvgkdn"; + rev = "63a1e2b39049a95f6ad7f599561bcfea45086bc2"; + sha256 = "0iw5imsf7qllkrh39p4pwp6ibwx08nfydfrzwc7bvck0qgzrs7fv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc"; @@ -52407,12 +52596,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20171008.2352"; + version = "20171020.1419"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "6c288fd22eef6332adc5680aa0843d1c678c4832"; - sha256 = "1s2p5c1c8fyiwi6idjl4bw2cxikdim0maw6w5pf12k2j1bwm98qy"; + rev = "e4d174870ea40275a8bc35996416326cf28051f9"; + sha256 = "00p7hrcb2ivk6sjxqccbpswjsk5rj02nyd29d2nd6b8r3fskskzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -52593,22 +52782,22 @@ license = lib.licenses.free; }; }) {}; - page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "page-break-lines"; - version = "20170829.157"; + version = "20171020.108"; src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "c82759f267a81a07ed7aafffbbbfaa3e94941b59"; - sha256 = "17kly423l5fyqzmhbxqwd9fvn191bzq6pn3ng1ynla51cg47zskl"; + rev = "ae1c0065984429c7364a667abb9180e80134c4c0"; + sha256 = "1j2fw5p5cwyxpb3clym59jbma06r7la83n62xmz0q1z41llmwx4j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1"; name = "page-break-lines"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/page-break-lines"; license = lib.licenses.free; @@ -53077,12 +53266,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20170928.1118"; + version = "20171010.410"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "adcafc25e1bbd43b70251305a07252cc46d20308"; - sha256 = "0hbbqgj0vi5xlb48fjdy7yh8qx43hi6rw3jqrcmvlh3gnm47yhky"; + rev = "0f4ff034fb31b18f387e67f1de4029826db6cd0b"; + sha256 = "084497na8qql638qjhgad02rvhwyzz81xwh70p6rxxwfzj0i1p17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -53186,8 +53375,8 @@ src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "c1b3ff04425844ed88fac2a634232bdb8e2662bc"; - sha256 = "07hfca1r09m5p5i8y62b54xmhw1ymcq68ys0gk579d7lvvy6s5qf"; + rev = "7252e8b3cf829e908179913daad16ff2b8bdefdd"; + sha256 = "1wmayp7wjlfxdjb0wlmjqyxqa95ssrhhxhkiy0ip3bgip77s7rbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -53665,12 +53854,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170918.934"; + version = "20171012.2226"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "52acd65c0db97a83e3f86ca97f9a3bf27135e8f3"; - sha256 = "19d5nmy7kdlysxzig2akbxvg9h1vnjagp4xh1qpyw8iqgm3kpxxn"; + rev = "094b2931de775c734ad353c5d06cf5fc6a55f11d"; + sha256 = "0g92rd68m1l377hw5rr1y14z7fcs1blmyc6vi5a9gybr19bcxb7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -54125,12 +54314,12 @@ phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phan"; - version = "20170205.604"; + version = "20171017.2045"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phan.el"; - rev = "6442663bf7618bc614b6c47b0ad7bc591c68f947"; - sha256 = "0s38vbnsbpazca0jsahjmms7qgq74gsvfn2zkrfkhx9y8cpfxrrb"; + rev = "17b44a62580272bcf5ee91fb58098292e9de6f83"; + sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan"; @@ -54440,12 +54629,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170729.1258"; + version = "20171018.1236"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "151ae717b03d6d5fcc2bc86e349175840bfbe079"; - sha256 = "00f2k41zmda299rj4lfpxisnrr9i5f0gg51cb8fri7lyjzrq829a"; + rev = "0e87a708fb0cf7bb5ad88baf08bd60e061e8b63c"; + sha256 = "13676hca2mdfawc61g3hp1m56wv45i37g8gxhjb3mvjyjrb10rkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55217,8 +55406,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "b05d13f04990f6ed74637ee8bdb42fd1500974ac"; - sha256 = "03bcknd6y6rhg6185bjga2idswq4p0d87jmyhkx2x56gdybpa9mr"; + rev = "981c523ddbd1462970335a1069573ca3bdd3df5e"; + sha256 = "1aq95scp0lg5r1fsn62r54dqamm3174wzrr0h3vxx75m3iycsxxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -55297,12 +55486,12 @@ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: melpaBuild { pname = "pocket-reader"; - version = "20171008.1411"; + version = "20171015.1705"; src = fetchFromGitHub { owner = "alphapapa"; repo = "pocket-reader.el"; - rev = "410add35782f037e4c42d3f740fb5623901ebf39"; - sha256 = "1lchwlv32b5gfgkp2i3li3rk3w1xyz8axamz5mqs1imb6mkc1dws"; + rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd"; + sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; @@ -55873,12 +56062,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20171008.2002"; + version = "20171010.713"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "b51217d52ea0b8b91b15783d364562b6668ac0d0"; - sha256 = "0afhs8dpvlc29xpdgwm0jp1syyyraqipscxx89x1yi0idkgvxj29"; + rev = "595a9c1b230f4fcc4d72e6ed9c67aed7b838452d"; + sha256 = "0xpvsrr4klsw3fkclpkxcxrfwg2gk4fzc20n6di22cs5pysilp8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -56418,12 +56607,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20171008.135"; + version = "20171009.848"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "933fcbd849781ea5e0ace32b9dc655d00de7df06"; - sha256 = "020j7cpa5ljblanf4y7xsr7gvz12b8cdgpy75k0hb4igc62qzkym"; + rev = "dd48cb8af4cf41d109fb6d46f0c3f2134f37fcfb"; + sha256 = "0qgw3g4xq1qa6dvxyyhnb6536ay29jzf12829z9s689xqg0n7zsn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -56604,6 +56793,27 @@ license = lib.licenses.free; }; }) {}; + projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: + melpaBuild { + pname = "projectile-trailblazer"; + version = "20170928.924"; + src = fetchFromGitHub { + owner = "micdahl"; + repo = "projectile-trailblazer"; + rev = "a37a4f7b7f727d98e4c74c0256e059e84263553d"; + sha256 = "1njs2aps4mlbnnfjkfwrb8vy8lg6lyxzxkxpscv91la7yf3wpc3g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer"; + sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4"; + name = "projectile-trailblazer"; + }; + packageRequires = [ emacs f inf-ruby inflections projectile rake ]; + meta = { + homepage = "https://melpa.org/#/projectile-trailblazer"; + license = lib.licenses.free; + }; + }) {}; projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projectile-variable"; @@ -56842,8 +57052,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "77f64bb7779ec2195f9bc4dc82497d12c18fc6b7"; - sha256 = "0176y1ikr6pi3paz4q588ka3c02al25fnbn0y09z10mi7nplrx85"; + rev = "b189389e2f2ca01dd534a8e9ba3ac38ea45cdba6"; + sha256 = "1yr4073qf6br07azrmhy9xk8zq9zlalbmldjsrkbf7k5r59217jg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -56911,12 +57121,12 @@ psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: melpaBuild { pname = "psci"; - version = "20170914.1048"; + version = "20171011.50"; src = fetchFromGitHub { owner = "purescript-emacs"; repo = "emacs-psci"; - rev = "47a0ba79e7284c71bebd8abe753246badeb1251d"; - sha256 = "1j2zbxk2d7yjpwhhv48j6qlsnmapk0858zrdiqpcicapddbsv66w"; + rev = "5360b244c588ed2f2a5bb86180cb5d4deb2216de"; + sha256 = "0m9lpwwm29h0pms1rnwnh67ff1n1dmf25yy429g438zq98l94x9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci"; @@ -57016,12 +57226,12 @@ pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20171007.1642"; + version = "20171018.829"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "971ccf8d380965a5268e499a8c8785f2fcdef6f4"; - sha256 = "1zrs94vcp7yjz929x51243jf0lifb8kbxdzr3slkc5wbni5c5jk3"; + rev = "96718f802dad3acd5a3f770b1452b81e39f77d92"; + sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -57037,12 +57247,12 @@ pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pulseaudio-control"; - version = "20171004.428"; + version = "20171019.2026"; src = fetchFromGitHub { owner = "flexibeast"; repo = "pulseaudio-control"; - rev = "f542adc0585e7890c11e478bf193ef6f3b1f6eac"; - sha256 = "1h0li679pz683bsnbv08g8sr2q8slh12lad0v7qhyig1if3yh63w"; + rev = "30b47a785c5f5ee44ae98d522ab541c9ea310b35"; + sha256 = "0ik06rvgz6gj86ijd6jjpivd37wv5lwszqvcvhskvg68in0ybfg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control"; @@ -57711,8 +57921,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "0b1b25a63f6d68a4dc21dbc47a0af79d3eed973e"; - sha256 = "0n3ihw3p61y46a8njq1ah5gxb26m13aawqsciy944l203s305845"; + rev = "dd78aedcf0f499188ad8232f2193ba62c791d33e"; + sha256 = "0hqxh294hg9y8nz4i8p2mipg65d6p6wfy9kqlfx9zy5cm19dn7fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -59054,6 +59264,27 @@ license = lib.licenses.free; }; }) {}; + reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "reason-mode"; + version = "20171015.1140"; + src = fetchFromGitHub { + owner = "reasonml-editor"; + repo = "reason-mode"; + rev = "ee67917db828af02c97e18b0747725a16c3a0708"; + sha256 = "1vk00a06i2p344q5k3py38z967gsnhcix00m5k6z1vhlvd0r4m00"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode"; + sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr"; + name = "reason-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/reason-mode"; + license = lib.licenses.free; + }; + }) {}; rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; @@ -59061,8 +59292,8 @@ src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "ee0d8796eca831110b7084a2af96fb4184d0a418"; - sha256 = "138hs6lgql40cn86p7v2xhb7ck2zcvz1vi6jd7fk55l0xgj5w61k"; + rev = "add349748d0f648587bf17d14036677570f081aa"; + sha256 = "1932ga5j5cv3w32iwxjdjs2jdz20sw5ai10dnxb6bdzh68kkw4f3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -59250,8 +59481,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "887d32fa14ec6e9e024e50077c119b95b22d91d3"; - sha256 = "1ibrqnnnsqplgx2hdj3jf8jcg3dwc01d50pkfb75wwi1w2xvsjmk"; + rev = "164d0b65d05fd883fc9ac66dd62d7427660fea37"; + sha256 = "1h09mlvrh7qx55s47135nkamv7frhcm3865xacpvifj72z46alg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -60001,12 +60232,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20170930.653"; + version = "20171018.1317"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "1a4ebe8bf2e1052a1a8dde3dcbfedb802ca070fb"; - sha256 = "1lpb22ggw17d8bx2gjmaxqk5rbf64gh8llvf9shl18r813d3srrb"; + rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14"; + sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -60068,8 +60299,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "333e4669f76a0fb68b433117d377711e418a525e"; - sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic"; + rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4"; + sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -60211,12 +60442,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20171009.608"; + version = "20171010.725"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "487ce00922571f84918e99ade678fe83d55bd6e0"; - sha256 = "1q396gzpqba7a4knnnx5pjwgbdh7r4q8ac7f81z9mp624w2zlgam"; + rev = "4979f4fc53eb341dc1d76bb1762bd2c734dded40"; + sha256 = "0kf5sll3npw949hxqga2ywadm1mxc2sm9h136dvnrliaqvi4s95g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -60442,12 +60673,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20171006.1343"; + version = "20171019.1334"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; - sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; + rev = "8379c5d28cb81d1cdac749c3053bb94d8b53a3b8"; + sha256 = "18mygqbvikvg49fwlzyvj947w4fnfg177hqd0kz4cplyvvbwbc3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -60610,12 +60841,12 @@ ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-hash-syntax"; - version = "20141010.839"; + version = "20171013.50"; src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "f3270274a9d12537263d9ae0b8f4e60c542cf77f"; - sha256 = "1ck3xhavilq5qdcc9libd6dyzqz7b0cxd3q5nd7kaxicc28h9p80"; + rev = "bc05c3130a5d3237f04c6064297e56de5f73887d"; + sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -60673,12 +60904,12 @@ ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }: melpaBuild { pname = "ruby-test-mode"; - version = "20171006.944"; + version = "20171016.931"; src = fetchFromGitHub { owner = "r0man"; repo = "ruby-test-mode"; - rev = "9a686e6e18ac2d56be41020ed9d0814cdfe86330"; - sha256 = "02m0kaw86p6qmn6jxcq6vqbbp2v57b2dnj75fqai1dz2f521dh0g"; + rev = "87f6d770f8d2326c8d36099aeee5d577f3e2af69"; + sha256 = "0qiwc2h5hyh6np16a2gfcchbnyh7v5wnzd8idr64cmd9blg3jh8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; @@ -60820,12 +61051,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170920.1919"; + version = "20171013.258"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "eae291ab7b3e1a52e158261d1192ea1ca2b332f4"; - sha256 = "0g68yy281v232f3f8k9r16nqxlirkb52yca1wknng57addma4cjv"; + rev = "b8e49089713714a9f3f815b399df569a0e507e73"; + sha256 = "0ny5prsm70incv30g5310bknbpix0415dn16hhf55rhjhwg39dns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -60946,12 +61177,12 @@ s12cpuv2-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s12cpuv2-mode"; - version = "20170828.1901"; + version = "20171013.1351"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "s12cpuv2-mode"; - rev = "446696222fec364442fa7a52f523be10bb5cff68"; - sha256 = "1l8950p4bakgxwd61n9agiyi15s1l09r1rnrijl4dnyv6vxmwghl"; + rev = "b17d4cf848dec1e20e66458e5c7ff77a2c051a8c"; + sha256 = "1fc132gv48xwrxiw139kc9f5wkhjgsgqdfm6b7v97xj5025zg6hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c1b9bbdc4deb17636270c7f2be0b43b647c695a/recipes/s12cpuv2-mode"; @@ -61244,8 +61475,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "5fbb1060ad967ac8af34687c7e7bcac69c7381e0"; - sha256 = "1gfpkqhqw9n0x325ar7ln9j2052r8hk65ilhz3dp7x865mqdm2wn"; + rev = "bc00974cdcbf0366123fe2dc38253b1ba345dee0"; + sha256 = "0pd7w92z50xpr4vj2xnzm2bmz91728l0k1jr9my9hbpxss89xnvh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -62183,12 +62414,12 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "20170611.859"; + version = "20171011.536"; src = fetchFromGitHub { owner = "voloyev"; repo = "sexy-monochrome-theme"; - rev = "8def559784c9f3ebaad179caaff58a9c6afc83a5"; - sha256 = "043pplyjdvqz45q1vlnkh8j8a4fhiw4km3b2xb06bycgs3ysb42h"; + rev = "9fb835606088a0d24600faa12fe24d85cb2c0731"; + sha256 = "182wzr7lisrszivxpjp29m7vjxxi429mshp2labf2abqkfrb9jv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; @@ -62204,12 +62435,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "20170213.1534"; + version = "20171018.1120"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "979b021077655ca38749a60c9752c0817e8fd93e"; - sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl"; + rev = "0cee957bc0bfbdee5ea3f3e430e94cdcd87ed0c3"; + sha256 = "18zhrn18asbpanmlgasy271gfh6qywr947fx2svxz5b1w40hhyr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -63296,12 +63527,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170927.2004"; + version = "20171017.822"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "5fabc901a316569ab84edaf7ea3aa7143ab91796"; - sha256 = "076yk65wyqgcqd9w8d4pgada0hsdlb58gvcldhvirlqsbmvjp9wl"; + rev = "c8f4c3312b574b8f4cd5ddaaa6ec7710893a9ff0"; + sha256 = "01aibrnkzyi40b7bfz5wfl34wwjil4nylg6llkhrmzc6mfqabnjy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -63527,12 +63758,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20170928.1829"; + version = "20171011.809"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "6f7d1c5e5d51100c573f3e5b6d3eb1eabe3dfaa2"; - sha256 = "1684agg19nxc9mirpkr062z9ycri2d78nr9hg8y7kgkq814vbbsi"; + rev = "687942cb08525bb10abef0d0fdfb57dd69e988b8"; + sha256 = "1hzc6cpndzc9lb82g6k8g65spnw09impgnfj6lfm9v25pbyg8y2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -63650,6 +63881,27 @@ license = lib.licenses.free; }; }) {}; + smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-backspace"; + version = "20171013.2226"; + src = fetchFromGitHub { + owner = "itome"; + repo = "smart-backspace"; + rev = "a10ec44ff325ec8c4c98b1a6e44e89e60a9aa4ac"; + sha256 = "0p19qikalmvs9y1lws08mxvh2k8s219mpm3nyi9aqq62ryyfwf1n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/88cd95cd623fb00d1bc6800c1dd3c665a0cce349/recipes/smart-backspace"; + sha256 = "152xdxzrr91qiyq25ghvjlbpc627cw4s120axmz2p2d48pinwir9"; + name = "smart-backspace"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/smart-backspace"; + license = lib.licenses.free; + }; + }) {}; smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-comment"; @@ -63820,12 +64072,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20170708.1317"; + version = "20171013.849"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e"; - sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30"; + rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; + sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -63845,8 +64097,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e"; - sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30"; + rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; + sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -63901,6 +64153,27 @@ license = lib.licenses.free; }; }) {}; + smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-semicolon"; + version = "20171007.1833"; + src = fetchFromGitHub { + owner = "iquiw"; + repo = "smart-semicolon"; + rev = "c11096679dbed3875c37413337ee490ee7951b63"; + sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon"; + sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0"; + name = "smart-semicolon"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/smart-semicolon"; + license = lib.licenses.free; + }; + }) {}; smart-shift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-shift"; @@ -63988,12 +64261,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20171005.541"; + version = "20171021.718"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "456b78c5b7af52f84701aea0ad51a9d6d7de23d5"; - sha256 = "1b5mp87qjyjs0d2mn9rz0iy6qmdmhkb8699ddlbjxrmid2s8g73h"; + rev = "cdd10bc259fe7303e40efd8a6a05c7e43d12a242"; + sha256 = "0ybbbqnbnp1w4lksgjxjf9iccrvi012ihlq3az1c6k6ck18cmadb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -64324,12 +64597,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20170920.1454"; + version = "20171010.808"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "9a29ca3f5c7302a67f969b10defeb75e2fda688a"; - sha256 = "1hskg4llb0wfdmzgnanbvppbjj55zkifh2yan5rvzkkwma1vb2ry"; + rev = "95e8d8aa8312b54d6ea18b35667fa3005be1bc76"; + sha256 = "1fbn6wqm515x8barbf8bjxkvxyv8p3szdz0h9zaam7hz7zbpdap2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -64597,12 +64870,12 @@ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }: melpaBuild { pname = "sonic-pi"; - version = "20171002.343"; + version = "20171011.503"; src = fetchFromGitHub { owner = "repl-electric"; repo = "sonic-pi.el"; - rev = "f4bb7abafea564c97d3b9a28b1b2c3858191674f"; - sha256 = "1xdv94k830a70hi8cmvv2gxzybk16cfsf5my8c1b2kw7041a074q"; + rev = "6b362bbdfacf7aabeb494c3e22f6fd3f48ca9738"; + sha256 = "0xk03swaclhm41vnwzmwil05mgabkb23lrp28wvl6qxzhd3hmrwq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi"; @@ -64898,12 +65171,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20170630.2327"; + version = "20171016.157"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "e6ccec6c80ee2bbddbad5a88cb9d2cd2db8a1a33"; - sha256 = "0ga99imh00h0bnc4m2q335y0x8zp6xs1n47rqqhxp6iwmw2fz20z"; + rev = "251d92ef77ed4daa798e3300e5c671052870827e"; + sha256 = "13mnsvlncrzsh2q8xhx5ippvhlrk9sgsrbpcihk0m90d2bxj53qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -64940,12 +65213,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170918.1246"; + version = "20171020.531"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "7900aca87f9d96bd6ebaa62886e4ab135bf449b3"; - sha256 = "0kai39mqx0i2b46vcf5g2la8q65sp1pb8vnzfjwzv0qip4p9fd62"; + rev = "0a5a745c209daafc0e60b8db92993802a9c05fb8"; + sha256 = "1wnf0jwdavkpv3xz2mni7n29qfp60i28530hmaimlk8mnhb2x94k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -65632,12 +65905,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170926.315"; + version = "20171018.303"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "af7f33c85fe7d8e6c597fe5c674b1c7bf8ce2bfd"; - sha256 = "0n1h510v1bkq4yrmfyhih2721yagfb2slm97b0vpjfp3f94m2nvz"; + rev = "2226edb5fc91ab766177b82e578dbcc5c7e55554"; + sha256 = "0b2jq0s56mbl051313wyn1fpk3j5n819y1q6dcv8z7sa5zxsq7hm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -66323,12 +66596,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20171007.930"; + version = "20171016.1420"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "f9cd0db1c62073b5dacefad20483f181c2d8d019"; - sha256 = "0xhj6x1c9r69sw6xw9kdvdhkvmr000mnmw7ihqmy6fkar945046f"; + rev = "345e00569333095eb24e61239a80b0f0c77b2d11"; + sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -66362,6 +66635,27 @@ license = lib.licenses.free; }; }) {}; + sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sunburn-theme"; + version = "20171021.1407"; + src = fetchFromGitHub { + owner = "mvarela"; + repo = "Sunburn-Theme"; + rev = "566280a981097b89b19c4bba921f568c77212db6"; + sha256 = "08a3js02zxqgxrk4afr2n39jf34pnv9mwiykysbhf560blq8gha2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme"; + sha256 = "09shmaaii0lfd52v49cazn91sj4jz2siqbanw682vi7zsl79jx9f"; + name = "sunburn-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/sunburn-theme"; + license = lib.licenses.free; + }; + }) {}; sunny-day-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunny-day-theme"; @@ -66663,8 +66957,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "6827edffb70890f2e94c3d146ed129bde581992d"; - sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; + rev = "3cd76371d1213f9bb8142b99b0ab3eda1cf3fffe"; + sha256 = "0ix8qca2s18s8wdsidksgc8wgl3a9igywcidjz9mpc03n8b4rpgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -66701,12 +66995,12 @@ switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-buffer-functions"; - version = "20171004.2056"; + version = "20171011.1004"; src = fetchFromGitHub { owner = "10sr"; repo = "switch-buffer-functions-el"; - rev = "ce61a74a88bf64afa699d20ed27b8be4cc63f80a"; - sha256 = "1bdcsgbnyabkrri296dgb5q42vjb1v0yji2la5ir6sfxmhw0mrb6"; + rev = "651696ef9dec7affbe51c81d9318288376c35899"; + sha256 = "0xv57imh6w6kbh1i1ib9k9x2h01l4vdxs2i667a76ym6dmsjbx2x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions"; @@ -67665,12 +67959,12 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20170903.1212"; + version = "20171020.141"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3"; - sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg"; + rev = "13a0f1637a1f075d70211ccb8162e63a18a474da"; + sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; @@ -67753,8 +68047,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3"; - sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg"; + rev = "13a0f1637a1f075d70211ccb8162e63a18a474da"; + sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; @@ -68299,8 +68593,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "9f9e30b51e3912c0b63258badf5501d3cb2550be"; - sha256 = "1pxjsql4d02igqzz4qk5mc1l8as9myfml28bg9q2bqcjsl6rh0s9"; + rev = "54ce558ba80905d124b82727d196f6d58964b74c"; + sha256 = "060fqxwmqra2wxi22250lnkfgs98b0kps8wn0lmqjkqnh6pqy7qi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -68334,15 +68628,36 @@ license = lib.licenses.free; }; }) {}; + tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "tickscript-mode"; + version = "20171020.1330"; + src = fetchFromGitHub { + owner = "msherry"; + repo = "tickscript-mode"; + rev = "67400136647342b714c5f693c358f2bd671fe49c"; + sha256 = "0c3vap37rnr11cvwmgcamx4vl4z4bfmxj7w8hybxcrvs6wnjw20b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; + sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54"; + name = "tickscript-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/tickscript-mode"; + license = lib.licenses.free; + }; + }) {}; tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20171008.2022"; + version = "20171009.1142"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "e5d1d3852aaf63cbfb0abaec1792a62bed024a72"; - sha256 = "1kwssyzbjwl2vyll0p49l57z41yv6k1jnzbsdnh0d1h81nixg5wk"; + rev = "d4a86487475b08adcbc1974c3362ce247d65a381"; + sha256 = "1f0l8s50ihhl4w00q5f101g9bfn9zssh4ippbchfdz4ialisyk2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -68996,12 +69311,12 @@ traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20170916.252"; + version = "20171010.2353"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "bb9e86958a92cb5b6ca107f90d05c1890a47cf63"; - sha256 = "0vjql7z5wda701s63x1h5m6m02342dw1pylngbbxxs29d70mzybn"; + rev = "5ee7a4411fa39601ff59873f1e129fdb64df4e97"; + sha256 = "0h9hx5jpi0clmrj7sf0srisdp9h5zgakwrs7cyqs3hmw7z4ds5r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -69233,12 +69548,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20171004.631"; + version = "20171021.615"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; - sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; + rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; + sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; @@ -69258,8 +69573,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; - sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; + rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; + sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -69279,8 +69594,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; - sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; + rev = "3217aba17fd2c6b05b5dd7484548f587e319e583"; + sha256 = "18lwydg9ddhc8593d4nzva2bpi14c4lnd52jxdd2xy30q5jz5llm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -69483,12 +69798,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20171008.1240"; + version = "20171016.910"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "3ef5d4c4cad10b63fac200ece4604bf7370994b7"; - sha256 = "09v32d9diky72hrixjqd5k5358wsvyyiwwawf99rziaa33qvyns9"; + rev = "64537bc753094b2adc2e3e97625fa9c0a01f9ae6"; + sha256 = "03d0n49p6d77p221majmbh0gjyrmh2z4cb2l2vi5xxfwc1fsxzmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -69756,12 +70071,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20170831.619"; + version = "20171017.1128"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "0f41709e1525403767bd4889cb913900c68448dd"; - sha256 = "038fya0gd3vy5rpf2b4ynksc1alb8va0zw7flh4y4azrmgmpxwi0"; + rev = "30391a518a1d41d5c534a30850a50b0974132aec"; + sha256 = "1msslh5zj1mi74fg8wc1kzpxjq0g6s9ms66332r2ykwqzsw1iz7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -70312,12 +70627,12 @@ unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unify-opening"; - version = "20170215.657"; + version = "20171011.201"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "unify-opening"; - rev = "2f0164328b9234c9083758349103be873cb65af8"; - sha256 = "0d7advfxfnx0v2y292fq4ynqm7ial6p0x7mh28l511b8b4qgpjgv"; + rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf"; + sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening"; @@ -70501,12 +70816,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170812.2256"; + version = "20171013.1548"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "16abb66246170fe06325ff32a4889e4b51bfd979"; - sha256 = "1fav32ax7qykclvrimlf00pyp534yfngizm697mbr9346va1zqm6"; + rev = "cb89901b52a9413b6c233d7fbb616a2d8f38b50a"; + sha256 = "1fypvrmn1brrq2200kr8s8zbcc30z9nhfv3k8vs36iawab2g573k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -70795,12 +71110,12 @@ vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-fossil"; - version = "20171008.1303"; + version = "20171018.2216"; src = fetchFromGitHub { owner = "venks1"; repo = "emacs-fossil"; - rev = "7bb3121ccd89f1533c6b91d5f952755b358eb0eb"; - sha256 = "1x2x59k3qxna32a8fjqb0vs6bykynii3i8qnlj770dn6drmnzlfd"; + rev = "abdb5487831e641c291c0dcb3848f539ca11f400"; + sha256 = "024bf8cjf3srz0zrxk90c63yz9v525m83znb2fscwa1fwvnnpqkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil"; @@ -71068,12 +71383,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20170928.822"; + version = "20171021.1257"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "d4178edf27cfd54a473d10d5adfa819c748dc801"; - sha256 = "1cxfgb068sdlyr8i8r6hi0jm5capbsc58zrh5g7jyknya7z02ajp"; + rev = "3c5b181a32df5d7defa58a7a19021fa16d3670f9"; + sha256 = "17zakj614vrkyy2y3a1mdkqaa3p7r77zhg8wdaqapwiq36f5gcc1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -71530,12 +71845,12 @@ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20171004.744"; + version = "20171013.1728"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "3b3cbbf6cb89380a721584dd62528cf3568ad9c7"; - sha256 = "1nfxvfpiwqjyn6h53gwpifmrsv0l4az9fsv7mrvnvf67pk3jawg0"; + rev = "0a6b7c226c5c0a26f3402cfe40169cb00f5d792f"; + sha256 = "1s08rc3d2k6rnnn4fir854ndwq2b2xxh1blv1f2055gdf4jw25rf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -71718,12 +72033,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170916.37"; + version = "20171019.550"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "0249c9b12dcd13df709441edff3c7fcc4efcb198"; - sha256 = "1xcxg24jwazkvc5afnqnmqisql6cr1brsmbb754a70a0r374965r"; + rev = "15a8ca7a28d086066d148ca8bfbd454e32cc5f77"; + sha256 = "1a7xm3x8zyax6crrj8fj932yicwds12774znv991yggjzw5kcwcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -71949,12 +72264,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20171002.1316"; + version = "20171017.1214"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "c15743454d0de944e5872a2ac4c9111d8cd61940"; - sha256 = "13hndf7ldw6nb2jkr3x1yxj374j2m116q0xl74ihk32vf8kb8j2a"; + rev = "4754211f44e9fe1389e4378553ad538460282225"; + sha256 = "0c1p8srr1zacpp697rwy83rjz51yhgff9w1sb4cv9wi5yzfsic56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -72075,12 +72390,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20170612.1352"; + version = "20171021.1419"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "655a364fb1a6c9f3d49a0bbaf338bbf492b5b4d1"; - sha256 = "11dqcch0fcxkqnnfzk9hxmimxckimpj74fz7rx3b7bvkmrh9snyy"; + rev = "bf082078fdfcefa38a4397f56c0366cf14c05600"; + sha256 = "104fzirvpp9c5h4gpb99j8i8j1imb3mr6zxh8gr42g38rg2y1nh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -72432,12 +72747,12 @@ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whizzml-mode"; - version = "20170525.818"; + version = "20171015.938"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "92986cbb260642c129b049950036b2b6698a8bd9"; - sha256 = "01mxjyan8bbjxl055f8zbsydsn01iszk3qi3668aa6i1m3vsz60h"; + rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22"; + sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -72520,8 +72835,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "597b3e1cab9f32591561a299670999260112afbe"; - sha256 = "1ndxd5s3raw4630zfxp5iz0mmnc6rrim6lgpzp4wjipb4zryjlnk"; + rev = "b05d584a4b3e0db168c3b920ce4a270b3908d842"; + sha256 = "0shgxd08da8a7ij37k5ybmvyqbqzq4nqxdyfbbpgnh1vgw61gr6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -72747,12 +73062,12 @@ window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: melpaBuild { pname = "window-purpose"; - version = "20170920.15"; + version = "20171018.821"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "44d31e373ce95d133c560169eb225d2c16a32b7b"; - sha256 = "0wpndc2p4pcq1z07r659pxv0db1g6hqkgdivjs5dxc75sb3mrrmw"; + rev = "2b8059256a90caf578ca5ba62205ca7f0d67a740"; + sha256 = "1pv5sjsvm3xmhfbf0j2581ifp7yykgzhd8bml9cav242r1m2dnh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; @@ -72897,8 +73212,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "4d41c0814bbc"; - sha256 = "1xy9a27qdl7hm7x2gbhxql63paxi16441rczl2i8ps032l4ffdnj"; + rev = "7633b2a5133f"; + sha256 = "0j6j9wkmq95dhx5cr3z2gpx5mvsqsgissp2060ij252ijc3l9k4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -73523,12 +73838,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20171009.422"; + version = "20171021.39"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "15dc0360011eb8ec542db5e8e5bdfa1147366557"; - sha256 = "0n8j36q16njkcyr23qc8zx19wn4qx7pjiankimgjp96bcxsfa9df"; + rev = "2aa7ba860e72329a96395aeef1206e2adc637cf6"; + sha256 = "0vjlc5cs56g1d1gzww7cmkyf8mzgr630xg1krlhz4bb73c538k1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -74199,8 +74514,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "18ee56bd687238be2bb6834062be3f04d9e9a283"; - sha256 = "13a6qy22jwyxrlcxw2xmqw3dckzlkxa84babdwrgpdx7kx4hqa5h"; + rev = "011bcb8e2f27b333b3300d7bcab3f52d70020e45"; + sha256 = "1gkls80rbj1hnima1fnbxnrz42qjqc55shdpiphzmdyv9hmw8vvf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -74489,12 +74804,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20171006.918"; + version = "20171010.1224"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "29ce99b8412ef919b7f03f259a877c4111362410"; - sha256 = "0xq3vjlsm4fvk809r69bln8i7fkqx49xi1gk1nff0v8y5b26vnxp"; + rev = "07389c67234e67c8ae423779468f56d0bd65da5e"; + sha256 = "105jdikzwggn1isnqmvj6hcmni4z387r2nfy2cwd11pan31vd4wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -74592,12 +74907,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20171009.702"; + version = "20171012.1610"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "dfb0b02d0e19a05c8712d1877834a3eaafe453d4"; - sha256 = "10w5194lj6s5bvwl9r9zgw479f2a1i4lx87954xymcbridbcih6y"; + rev = "f31894da73c2b784bc9e0885ddfa6e1077782417"; + sha256 = "1v8klyrs7wivh9fd4ba18g1n72c6ar707pgwqhsxn0g3f42mlpck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -74746,6 +75061,27 @@ license = lib.licenses.free; }; }) {}; + zel = callPackage ({ emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild }: + melpaBuild { + pname = "zel"; + version = "20171014.132"; + src = fetchFromGitHub { + owner = "rudolfochrist"; + repo = "zel"; + rev = "23b12d107f123667ddd443b9f3e2047209e0055a"; + sha256 = "1m8bw588r2a1034ynigrzgab857261nrjwnzag5i3rgwn27brfcz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b48132eb4c0fd01b9fc31236c5c4701f8f83a806/recipes/zel"; + sha256 = "14qf83n1wz8hg9wfmbh8b50c5xshc28x1xq6wh4g4lfqbfm7marh"; + name = "zel"; + }; + packageRequires = [ emacs frecency ]; + meta = { + homepage = "https://melpa.org/#/zel"; + license = lib.licenses.free; + }; + }) {}; zen-and-art-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zen-and-art-theme"; @@ -74770,12 +75106,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20170511.1337"; + version = "20171010.543"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "2f31ef9a954ec08202668a8d1b004db5a05831a2"; - sha256 = "0g4vgdzpbp0l734ajd1r9lj6qylljxaazk139lhzzyvmqd5dwaf9"; + rev = "a26323ca3029d653f658b8236ae9528d242c885b"; + sha256 = "0gx6yl3bl3z7rgl4m1np8bx8b53ywbni4wi2bhc716f4b96q658x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -74853,12 +75189,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20170928.827"; + version = "20171016.59"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "248e95616304e4eb1adde458bbb59442c11d1cb9"; - sha256 = "1bckvqfid2acmn5xcxzflid7hqhflsjw51r9gws3vxb9hpj5qqyb"; + rev = "ccadcfba1a708352508d4c0857359df7425e7574"; + sha256 = "1mg1dhda9zvdinxizckvz454633lrl62a382vdm838295gvc40wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -75063,12 +75399,12 @@ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom"; - version = "20171008.1325"; + version = "20171018.1314"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "zoom"; - rev = "a78361f6db1753ad749f5b865f2076579a276971"; - sha256 = "1c2ww8a6q64w486hb0gp18hcxvxyjjw3qpkwqkx7rfj5smy12zim"; + rev = "dc6747c754622ed88eeac896f18845681c90cae0"; + sha256 = "1innar1xrjlh8pvq3gj903xrlpkr8qwjbr60k7zi7wd2r6lqd7h0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index c97402c0f65b..22c98d88ed23 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1031,12 +1031,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "998407f56009f441a7cb83d678118d4d8e68f661"; - sha256 = "0brggqlij0nacx0yjk10rkn045nk0z03r8llmnqkangjm47ffksr"; + rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3"; + sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1073,12 +1073,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "85a1af27541f6a73a63120fac2cfbb7ba39531c9"; - sha256 = "0z1kh8xj16lp7ydzw1fxypw37vlrcxcb8bpx96w6aj6zcd7pzwmn"; + rev = "2b06d75096d6a1c06682b70e229f2c932e9eac2c"; + sha256 = "1jxss4gnlg2vkgf10v1kj1c7isbh7vh040iqrzjkrhclf4qiag5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1732,12 +1732,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "0.2.1"; + version = "0.3"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "74b27a95429b3207d0005610d11223728039ba81"; - sha256 = "1vp5crdjk3pswn6ip3vgkkc49kqnpayfjgzivfi6fplvhz8klrr1"; + rev = "5d25972192cd34553997ba193c09eab093a2b870"; + sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2662,12 +2662,12 @@ beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "beacon"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "Malabarba"; repo = "beacon"; - rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b"; - sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn"; + rev = "729338b02a0e331a4faf475da9f54771a3470106"; + sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; @@ -2722,6 +2722,27 @@ license = lib.licenses.free; }; }) {}; + benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "benchstat"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "Quasilyte"; + repo = "benchstat.el"; + rev = "b39a97f3072c2d3c1d3f86790b9e134d05b8d7e6"; + sha256 = "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat"; + sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9"; + name = "benchstat"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/benchstat"; + license = lib.licenses.free; + }; + }) {}; better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-defaults"; @@ -3649,12 +3670,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.0beta1"; + version = "4.6.0beta2"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "185bf236abb2bf10abfd3bff45c723ba10551c80"; - sha256 = "0057iik539jfcw287vcacb8hfxdnyfk17cc0ymxxy3sk5y1mfjik"; + rev = "817604da4d38362b6b2bd4c7787a5add6741cd21"; + sha256 = "1d49kiv9nfr624924qwmf0mfsvja28mvliipaylfbslyb3f7jpkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -4646,12 +4667,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.0pre1"; + version = "3.10.0pre3"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "ecaddda2fea374089d867ad17b8b4700b189f397"; - sha256 = "0j6zzirbx1pcb0hyih77w6dbjmz2axknib7aryrcm7pjwd9d0q23"; + rev = "319622a49fb300cd8a7efd8378421a32204510de"; + sha256 = "19n0s0kd051xh3av9nd5ncpccx6bmvay6115g0kqgmi8wbw7587q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5765,12 +5786,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487"; - sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9"; + rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84"; + sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -5867,22 +5888,22 @@ license = lib.licenses.free; }; }) {}; - counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-bbdb"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-bbdb"; - rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555"; - sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7"; + rev = "f95e4812cd17e5f8069c9209241396780d414680"; + sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; name = "counsel-bbdb"; }; - packageRequires = [ emacs ivy ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/counsel-bbdb"; license = lib.licenses.free; @@ -5909,6 +5930,27 @@ license = lib.licenses.free; }; }) {}; + counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-etags"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "counsel-etags"; + rev = "5d7b51ce7806bbe7e1f75077b4dde2ac17a53c5d"; + sha256 = "0v3b3gs4jy8cqkvchnakwpws3a0igiklchb9q3754lnmk8784dn8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; + sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0"; + name = "counsel-etags"; + }; + packageRequires = [ counsel emacs ]; + meta = { + homepage = "https://melpa.org/#/counsel-etags"; + license = lib.licenses.free; + }; + }) {}; counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-gtags"; @@ -6416,12 +6458,12 @@ darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; - version = "1.2"; + version = "1.7"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-darcula-theme"; - rev = "da9852867ac115a54ee350a750d4dae182706117"; - sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s"; + rev = "25f179b9fb72c1b95a3907aa4b4a44f8d261e45a"; + sha256 = "0x1amh0ycjvk218d6cyqizkak47b6r1wczakbfkvnbr0khgkgmr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -7214,12 +7256,12 @@ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredfl"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "purcell"; repo = "diredfl"; - rev = "2393653a1518b118180ff90ef2b66cfb7d0b555c"; - sha256 = "04yykal90pc4nsdlk08z6svsnddjzaz1drwvs3bqfjw01fr50xcs"; + rev = "45e9c46f58c655694758d4986b9195c8bb40ddf3"; + sha256 = "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; @@ -7833,8 +7875,8 @@ version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "023d2edde61d"; - sha256 = "1izhlafsbxfav4jvl7bqg188d71895r1sqacxsblvcld8c0brsqp"; + rev = "9e446540a794"; + sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -8018,12 +8060,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "1.9.11"; + version = "2.0.15"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "8f16fb1f510a147e7ab846030057d4c74127ffb2"; - sha256 = "15axmg6z1nlaz7xsf70arxazkkskkga2fa71iswpnhwqsrr90w8l"; + rev = "0b55c207c6552223857de03bf8aec8be3344ed26"; + sha256 = "103ivy1gmb22xacxj2b99zmilqy20nbzmwvmg5i6aqnya1vs97q0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -10022,12 +10064,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.1.1"; + version = "20.1.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "69292a11cd4b31fd3ff73b44f28d527f2d16f555"; - sha256 = "1v5hna4gf2i9lmiyykbs4w2r1yym2p6jb21nxfa5vlhwq85mldfb"; + rev = "919ef5de2858e606d4a9be3e0e995b0802c76e33"; + sha256 = "0y76ci80wmzrxvj90bhiz6cvwbis34kcc6dzas9xxsj92b6sh7sk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10819,12 +10861,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62"; - sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20"; + rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a"; + sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -11260,12 +11302,12 @@ evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visual-replace"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "troyp"; repo = "evil-visual-replace"; - rev = "9bfbaf71898294e25d588a887fb4753641edfbe9"; - sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s"; + rev = "163fc827a1ffc106475da470c37fb26f4cc9b008"; + sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace"; @@ -11616,12 +11658,12 @@ fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fancy-narrow"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "Malabarba"; repo = "fancy-narrow"; - rev = "cd381c1acd5e0d9b6acd7f3e76c3b1de21e8b6df"; - sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91"; + rev = "c0f70b4333d4764323b7154e37a378adb1610ab7"; + sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow"; @@ -12546,12 +12588,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "b16b77f95e4e53a8951ebee6209a5de311748447"; - sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh"; + rev = "29a9eb320d62400564360986f7ad400b74070d8e"; + sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -13701,12 +13743,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "1.9.10"; + version = "1.9.11"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "71435fdd100712d6894d8d72a5667b250a0d8eb7"; - sha256 = "1c718gfms4zhzj06zmzdw71q6vhbf7mh3cgvq9vf8bnlv910p832"; + rev = "5504550605354146842c8f5c34482ece778b7b31"; + sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -14234,12 +14276,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "0.1.5"; + version = "0.2"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "f315677e3d35951021e1f10cc7b4f629814a13f0"; - sha256 = "1k2583dnj9did2pnd3ma4rfrd2n6r83yjccf403sgxzi1p054yl4"; + rev = "e04050f81106029c342deb7adbfc67b2a888ec58"; + sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -17476,12 +17518,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "93df6808dda8f50da4f435c47763733703905119"; - sha256 = "1zyl8x03n9n9sc7bys2nqdmzadl5qrwi01qn1gy48jrkfhgiva6g"; + rev = "26749ff9f34b2abddf7c47ff71b1046942e38398"; + sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -18148,12 +18190,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "a6a01cd4688fc9264fd36c279c0249f16704132b"; - sha256 = "0b6g9j76zd5wdqg4xkw34a6sijf8jsdvnnr7hbix7zf8cxrr2gqr"; + rev = "4ab1372c252847c316f8978a81e2fe92ff79579e"; + sha256 = "1kykbb1sil5cycfa5aj8dhsxc5yrx1641i2np5kwdjid6ahdlz5r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -18316,12 +18358,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "5.2.3"; + version = "5.2.4"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "abe2933e3d1f82e4eecfba11ffed27f7f52ca469"; - sha256 = "12f1mmkapjf5l6ka3k09s4i3qg5pk1cr0mv182657n0rvdn041d4"; + rev = "e18ec3f55e288883f8042065190572e91651733d"; + sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -19510,22 +19552,22 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "0.28"; + version = "1.0"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "83ad172b96bb011bb705add136a7571b08f6c4c2"; - sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l"; + rev = "db3b727c9deedcf9afa13e07cd25734cbf7305a2"; + sha256 = "1cm6zm8d7rywvlhzf1vpblqb1kgn6c7bwk9q2mjz7f5gdcsx1jp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; name = "indium"; }; - packageRequires = []; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/indium"; license = lib.licenses.free; @@ -19785,12 +19827,12 @@ intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "intellij-theme"; - version = "1.2"; + version = "1.3"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-intellij-theme"; - rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54"; - sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl"; + rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606"; + sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; @@ -19911,12 +19953,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9"; - sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8"; + rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605"; + sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -20473,6 +20515,27 @@ license = lib.licenses.free; }; }) {}; + js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "js-auto-format-mode"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "ybiquitous"; + repo = "js-auto-format-mode"; + rev = "705e300a2c880f6dbfa830d6c69818b7a3a95c09"; + sha256 = "1a3dwcknjydaxnyhaycgbmlncj92qkp3m5flmi6fyqjx11lz26ag"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; + sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs"; + name = "js-auto-format-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/js-auto-format-mode"; + license = lib.licenses.free; + }; + }) {}; js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; @@ -21890,12 +21953,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.17.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "0da66c7c01e8fea952faa3e21a34664b37918400"; - sha256 = "0xzqg5nrrsapxsnyk919w5nb6pad7w06f0c266x9cs4m9wih82wk"; + rev = "145d21d65b5469e682ef464ae8f4e0e3d8c0f04b"; + sha256 = "1h188cprka13bd1prfj1w86m5z8c1nfaz4dw18g88jf6b0gyazhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -22869,12 +22932,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "0.7.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "92caeddbb3c3de61707d12db62b9915e271807b7"; - sha256 = "0fajz4k3p2ki237jz0c3wfab5272fvvw9vzxzfivpmpcnws6gbn6"; + rev = "d714219aeb388ded88582c47940f2c6febae333c"; + sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -23181,6 +23244,27 @@ license = lib.licenses.free; }; }) {}; + meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "meson-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "wentasah"; + repo = "meson-mode"; + rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee"; + sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode"; + sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80"; + name = "meson-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/meson-mode"; + license = lib.licenses.free; + }; + }) {}; meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "meta-presenter"; @@ -23687,12 +23771,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36"; - sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r"; + rev = "019e07947426f0192fc3458f3f72c19031b607de"; + sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -25258,12 +25342,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8"; - sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4"; + rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674"; + sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -25279,12 +25363,12 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; - rev = "192d51d843c6581d593a4eb01f1b49ad59d206cf"; - sha256 = "0n24rhzl1zhlkdkjigsczyc0z3yrihz9qnn1icrk6nkms107qbnn"; + rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea"; + sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; @@ -25342,12 +25426,12 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "e73d4c3f9e0d4774261496d018cf944a254e06f5"; - sha256 = "0rmpnqb16v0hxfhw4lq2d27vhfhqv1mh8whq2l718l8c280yfn6k"; + rev = "636374c59c7d33c2f72c97ad8ba9fb4854f2324d"; + sha256 = "0w62bk2m0gs4b605s691z4iap9baz1z6c8z4v9vb05917qlsx5xb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -25388,8 +25472,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "40b6251a96057c80a958362a0886c06eea5bfd62"; - sha256 = "176qfjd0qfgypj7pyi2p7v6zn7sic86gcgxz056k4y2akm6aa2p6"; + rev = "d7a63cd5f592c131615a3b6523fc2b2a04a9f00a"; + sha256 = "0cvsys9jyb0zbkj5q01q2fgjmcqvb12dxgfy049fl7a2gd9n55fj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -27010,12 +27094,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "022406066891d7a0f1fe8e2f1ddd7741dcf0accb"; - sha256 = "1yybx9psjydbrrbdp7fpp4pih8jxflvl3wz9k489hvp6p0nffapp"; + rev = "4b4585264a28152f2eda0f7e5ceed132f9d23e16"; + sha256 = "1k3lv4qqkp87piwlwl3gahac1zpjzv397f65g4khbpby2kgg8dpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -27052,12 +27136,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "a0a1bb95d12fd45e3e111d29fd49b8171db1109b"; - sha256 = "00pn5adk6qw4lpfsw1lxhp0466q3sndgqgrh4y821lbxssx89lh7"; + rev = "16cf5d595644ee4e05b05b351e0c4fdd5df0ac44"; + sha256 = "1n5xbgwv9x2b9zmv7nw0x64qbll4ycjf2dp09rdj3m4bmcg2gv42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -27388,12 +27472,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "17a6690d42a1e854ec270ed930c7494077570fc8"; - sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc"; + rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245"; + sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -28119,12 +28203,12 @@ phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phan"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phan.el"; - rev = "4e3528f490e77d3aa6d81729b30b569434ef679f"; - sha256 = "1aif1hshwpzi353k2gcpwk9s76jlmz3s5dyf357qfv14b5ddhw6l"; + rev = "17b44a62580272bcf5ee91fb58098292e9de6f83"; + sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan"; @@ -28618,6 +28702,36 @@ license = lib.licenses.free; }; }) {}; + pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: + melpaBuild { + pname = "pocket-reader"; + version = "0.1"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "pocket-reader.el"; + rev = "93ef3a0737e93fb2e73f230fbb38f0b9f6f9d9bd"; + sha256 = "02l1yd0s7dnq6wj7lldbbxqq1libdcczygc2lzx4rdc5jnr4lnsh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; + sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf"; + name = "pocket-reader"; + }; + packageRequires = [ + dash + emacs + kv + org-web-tools + ov + pocket-lib + rainbow-identifiers + s + ]; + meta = { + homepage = "https://melpa.org/#/pocket-reader"; + license = lib.licenses.free; + }; + }) {}; point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-pos"; @@ -29163,6 +29277,27 @@ license = lib.licenses.free; }; }) {}; + projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: + melpaBuild { + pname = "projectile-trailblazer"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "micdahl"; + repo = "projectile-trailblazer"; + rev = "79299498d74876f2ac3fe8075716b39a5bdd04cd"; + sha256 = "1lkj9jdr3g7nl80fxvic6g5cn7vbkyxys7m3kcmd6xa9mq7nvci4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer"; + sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4"; + name = "projectile-trailblazer"; + }; + packageRequires = [ emacs f inf-ruby inflections projectile rake ]; + meta = { + homepage = "https://melpa.org/#/projectile-trailblazer"; + license = lib.licenses.free; + }; + }) {}; projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projectile-variable"; @@ -29373,22 +29508,22 @@ license = lib.licenses.free; }; }) {}; - pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "2f22d9c2e3ebb0230cee8836c5f5186e05a038dd"; - sha256 = "1fvq1vx7sg3dqc9zcqbsp0iq1y7c2cjag0ng3snssyj0qh8q6ib1"; + rev = "96718f802dad3acd5a3f770b1452b81e39f77d92"; + sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85"; name = "pug-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/pug-mode"; license = lib.licenses.free; @@ -30297,6 +30432,27 @@ license = lib.licenses.free; }; }) {}; + reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "reason-mode"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "reasonml-editor"; + repo = "reason-mode"; + rev = "6b53815a0405be1f364a082d22fe5c900409a01a"; + sha256 = "1433bgakbfyf5d5vq69rwj4zg1h0xwjy9qsryvd9r1ssax2hzi7r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode"; + sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr"; + name = "reason-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/reason-mode"; + license = lib.licenses.free; + }; + }) {}; rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; @@ -30846,12 +31002,12 @@ rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rich-minority"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "311ac8ee54078f95b7279e532da6cf5a2afb4125"; - sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3"; + rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4"; + sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -31182,12 +31338,12 @@ ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-hash-syntax"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "a0362c2dc449a1e67ef75ad736bcf8b03b083226"; - sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k"; + rev = "bc05c3130a5d3237f04c6064297e56de5f73887d"; + sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -31852,12 +32008,12 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "2.1"; + version = "3.1"; src = fetchFromGitHub { owner = "voloyev"; repo = "sexy-monochrome-theme"; - rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96"; - sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg"; + rev = "f64714a176d9212c9fa82355dd8ec89587ce13f0"; + sha256 = "17ahrdyk2v7vz13b4934xn8xjza4b7bfrkq8n42frq3pc8mgwqfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; @@ -31873,12 +32029,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "979b021077655ca38749a60c9752c0817e8fd93e"; - sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl"; + rev = "55df581cdb3cfaf9ebf9c54d8849f8f5775cf74b"; + sha256 = "1s59v6fnyzvgnbjcd1gpll4xp8316dqmdpi77382w0vjfcrsvbih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -32731,6 +32887,27 @@ license = lib.licenses.free; }; }) {}; + smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-semicolon"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "iquiw"; + repo = "smart-semicolon"; + rev = "c11096679dbed3875c37413337ee490ee7951b63"; + sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon"; + sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0"; + name = "smart-semicolon"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/smart-semicolon"; + license = lib.licenses.free; + }; + }) {}; smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-tabs-mode"; @@ -34955,6 +35132,27 @@ license = lib.licenses.free; }; }) {}; + tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "tickscript-mode"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "msherry"; + repo = "tickscript-mode"; + rev = "eb6eafee2df253a0f1356f260cc7f435ab68aea2"; + sha256 = "04pd1dvvs914f98yaq5n0nv1jbjr2sjgi3a288vpismrmxfybcch"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; + sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54"; + name = "tickscript-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/tickscript-mode"; + license = lib.licenses.free; + }; + }) {}; tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; @@ -35167,12 +35365,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.11.5"; + version = "1.11.8"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; - sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; + rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd"; + sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; @@ -35188,12 +35386,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.11.5"; + version = "1.11.8"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; - sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; + rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd"; + sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -35209,12 +35407,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.11.5"; + version = "1.11.8"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; - sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; + rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd"; + sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -35311,22 +35509,22 @@ license = lib.licenses.free; }; }) {}; - tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "2.0.10"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "93b9c6cdba3a8f333cc817c3822fc76b71ff4dcd"; - sha256 = "14l0y7gahbz1l4ag5nvswj7cl4skchvzr6r7zc1a5k000skdmv69"; + rev = "64537bc753094b2adc2e3e97625fa9c0a01f9ae6"; + sha256 = "03d0n49p6d77p221majmbh0gjyrmh2z4cb2l2vi5xxfwc1fsxzmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q"; name = "tuareg"; }; - packageRequires = []; + packageRequires = [ caml ]; meta = { homepage = "https://melpa.org/#/tuareg"; license = lib.licenses.free; @@ -35761,12 +35959,12 @@ unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unify-opening"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "unify-opening"; - rev = "2812e43029cab7183197ce5e3c9577856bfd22c5"; - sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p"; + rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf"; + sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening"; @@ -36580,12 +36778,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "77e6154ece15ffcc58db80dca48fe342376831aa"; - sha256 = "0zj1hhz7m0fxaj03aqjfd6jhcg2khi87l6742miwkdxxggwhdijj"; + rev = "aed3e00b6332a068d53ce482f5139a95c3dcd245"; + sha256 = "1p4sgn0rh8a5f0f6f1njq329zwgs6yp8j3zqs0yfz4kaikw1xw10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -36832,12 +37030,12 @@ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whizzml-mode"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "662c60173cdb396fcb2386d7d7c774d26f16cd9f"; - sha256 = "1nyl1whhi3zrzb5b4vkmqdaggnxrqmzmw1amf7hbw0mvx5mpy9pa"; + rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22"; + sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -37063,11 +37261,11 @@ wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wisp-mode"; - version = "0.9.6"; + version = "0.9.7"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "4d41c0814bbc"; - sha256 = "1xy9a27qdl7hm7x2gbhxql63paxi16441rczl2i8ps032l4ffdnj"; + rev = "7633b2a5133f"; + sha256 = "0j6j9wkmq95dhx5cr3z2gpx5mvsqsgissp2060ij252ijc3l9k4a"; }; 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 1dd0f37b4687..8d47f36f3469 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 = "20171009"; + version = "20171016"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20171009.tar"; - sha256 = "1v8y4gmfrnzsdy9mspqzn157da7lb7z2wvp95r1iywf64325gv5s"; + url = "http://orgmode.org/elpa/org-20171016.tar"; + sha256 = "1v89wl8xlxavvv2kdd5vms0rwpqaw2x73q0162ybxmrzf4a5f5mw"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20171009"; + version = "20171016"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20171009.tar"; - sha256 = "0iv1f7hbqh46mymk097x69q00pqpbkcyzjfd9a9slf5xkw1g1lk1"; + url = "http://orgmode.org/elpa/org-plus-contrib-20171016.tar"; + sha256 = "0xy2xrndlhs4kyvh6mmv24dnh3fn5p63d2gaimnrypf1p8znwzh4"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index bf8374fdaaa1..a5049e4236b3 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost163, zlib, openssl, +{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl, R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: @@ -10,7 +10,9 @@ in stdenv.mkDerivation rec { name = "RStudio-${version}"; - buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ]; + nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; + + buildInputs = [ boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid ]; src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; @@ -96,6 +98,8 @@ stdenv.mkDerivation rec { cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ ''; + enableParallelBuilding = true; + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index b5b2a49c42b6..23bcdae5fb21 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.17.1"; + version = "1.17.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "09nvibfn2z5cxjcdxqa2xy63jqwpvfgk7hdy1pc0mnpszz6kn4v7"; - "x86_64-linux" = "1fb3hil7dggnz7hks1i806ckd3wl5g0a2syjdbh9dx5iqarp2782"; - "x86_64-darwin" = "1vgbsmbcsdxc0h0ny61a3rhbwxzrfzkxl47sy3w410xcqlv8ad2v"; + "i686-linux" = "04mnj74pqkgfgdacq4643qrd7ybka1366lr7mwn0f70lk05wb2h2"; + "x86_64-linux" = "0y37wwvq6flaa2fh2r6b9cplbcszq726zrx6b8slzq6s5wl2lgmr"; + "x86_64-darwin" = "1cqyir7ijwafy68d5vbw47cs1x2lqs1wjnvhhw15yi2d7c14fq7q"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch b/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch deleted file mode 100644 index 149a2b2b1aca..000000000000 --- a/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch +++ /dev/null @@ -1,25 +0,0 @@ -From beb9ad0149adfe448acfa650fb3e171d5fdd7e27 Mon Sep 17 00:00:00 2001 -From: Moritz Ulrich <moritz@tarn-vedra.de> -Date: Wed, 22 Feb 2017 15:28:11 +0100 -Subject: [PATCH] Disable `-fno-operator-names` - ---- - core/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 89e06827e6..01d0c88ea9 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -98,6 +98,8 @@ include(MacroOpenCV) - include(MacroJPEG) - include(MacroBoolTo01) - -+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ - # ================================================================================================== - - option(ENABLE_OPENCV3 "Build digiKam with OpenCV3 instead OpenCV2 (default=OFF)" OFF) --- -2.11.1 - diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 96b1ca54d558..44ee807fe984 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -8,6 +8,7 @@ , qtsvg , qtwebkit +, kcalcore , kconfigwidgets , kcoreaddons , kdoctools @@ -28,12 +29,15 @@ , lensfun , libgphoto2 , libkipi +, libksane , liblqr1 , libqtav , libusb1 +, mesa , marble , mysql -, opencv +, opencv3 +, pcre , threadweaver # For panorama and focus stacking @@ -46,17 +50,15 @@ mkDerivation rec { name = "digikam-${version}"; - version = "5.4.0"; + version = "5.7.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; - sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg"; + sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; }; nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ]; - patches = [ ./0001-Disable-fno-operator-names.patch ]; - buildInputs = [ bison boost @@ -68,19 +70,21 @@ mkDerivation rec { lensfun libgphoto2 libkipi + libksane liblqr1 libqtav libusb1 + mesa mysql - opencv - ]; + opencv3 + pcre - propagatedBuildInputs = [ qtbase qtxmlpatterns qtsvg qtwebkit + kcalcore kconfigwidgets kcoreaddons kfilemetadata @@ -98,8 +102,6 @@ mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" - "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" "-DENABLE_MEDIAPLAYER=1" diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 79333e7d9fa1..411705e6a6ae 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -29,16 +29,16 @@ let in buildRustPackage rec { - name = "alacritty-unstable-2017-09-02"; + name = "alacritty-unstable-2017-10-17"; src = fetchFromGitHub { owner = "jwilm"; repo = "alacritty"; - rev = "22fa4260fc9210fbb5288090df79c92e7b3788e4"; - sha256 = "0jjvvm0fm25p1h1rgfqlnhq4bwrjdxpb2pgnmpik9pl7qwy3q7s1"; + rev = "5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6"; + sha256 = "0h37x12r33xwz9vf1n8y24c0ph5w17lhkpfi5q6lbpgidvbs6fyx"; }; - depsSha256 = "19lrj4i6vzmf22r6xg99zcwvzjpiar8pqin1m2nvv78xzxx5yvgb"; + depsSha256 = "05gkl2zg546i2pm0gx11s56f7dk72qpm39kml1d2myj81s0vyb5z"; buildInputs = [ cmake diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index f4547c69dc4a..a9d32d4b2522 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -7,9 +7,9 @@ let version = "0.96.1"; sitePackages = pythonPackages.python.sitePackages; - inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted; + inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted; -in mkPythonDerivation { +in buildPythonApplication { name = "bitcoinarmory-${version}"; @@ -21,6 +21,8 @@ in mkPythonDerivation { sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true; }; + format = "other"; + # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. #patches = [ ./shutdown-fix.patch ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 86b2ab6eb1ca..b348f253b350 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv_gcc5, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python @@ -10,7 +10,7 @@ with lib; -(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec { +stdenv.mkDerivation rec { name = "blender-2.79"; src = fetchurl { @@ -57,9 +57,8 @@ with lib; ++ optional jackaudioSupport "-DWITH_JACK=ON" ++ optionals cudaSupport [ "-DWITH_CYCLES_CUDA_BINARIES=ON" - # Disable the sm_20 architecture to work around a segfault in - # ptxas, as suggested on #blendercoders. - "-DCYCLES_CUDA_BINARIES_ARCH=sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61" + # Disable architectures before sm_30 to support new CUDA toolkits. + "-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61" ] ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6569c8920571..ab106f6dcd93 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.9.0"; + version = "3.10.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0zsf1czw8bz41nk9f55vxwncf0chxdflyhjj2khw9da67ph6yknx"; + sha256 = "01vb5xjis9ldva7rg1f720lwys5frkj00z8x7cajqwxliilhvais"; }; patches = [ diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 3fb669072955..1012f187497a 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,18 +1,18 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, curaengine }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols, curaengine }: mkDerivation rec { name = "cura-${version}"; - version = "2.6.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "03rsw6nafg3y9if2dlnzsj6c9x3x7cv6gs4a1w84jaq4p1f8fcsd"; + sha256 = "0ks8bb3mif6kyvb01ddhpn1c2l31s8fxivi70kmpm743sqv4kjaa"; }; - buildInputs = [ qtbase ]; - propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ]; + buildInputs = [ qtbase qtquickcontrols ]; + propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ]; @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = https://github.com/Ultimaker/Cura; + homepage = "https://github.com/Ultimaker/Cura"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index ce7109dd6fcd..575889ad2c6f 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "2.6.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1vixxxpwrprcrma0v5ckjvcy45pj32rkf5pk4w7rans9k2ig66ic"; + sha256 = "0x1ss3hppw6062rmmxh0dpnm5cg6r2mp01k0nxyw5riiljj59ydy"; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = https://github.com/Ultimaker/CuraEngine; + homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 0781617eb695..abe8d0dde84b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -13,6 +13,7 @@ python2Packages.buildPythonApplication rec { dns ecdsa jsonrpclib + matplotlib pbkdf2 protobuf pyaes @@ -30,7 +31,6 @@ python2Packages.buildPythonApplication rec { # TODO plugins # amodem # btchip - # matplotlib ]; preBuild = '' diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index 4a77423bea80..40631b0a0dbf 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -2,23 +2,18 @@ stdenv.mkDerivation rec { name = "et-${version}"; - version = "2017-03-04"; + version = "0.1"; src = fetchFromGitHub { owner = "geistesk"; repo = "et"; - rev = "151e9b6bc0d2d4f45bda8ced740ee99d0f2012f6"; - sha256 = "1a1jdnzmal05k506bbvzlwsj2f3kql6l5xc1gdabm79y6vaf4r7s"; + rev = "${version}"; + sha256 = "1d2hq6p1y2ynk0a3l35lwbm1fcl9kg7rpjcin8bx4xcdpbw42y94"; }; buildInputs = [ libnotify gdk_pixbuf ]; nativeBuildInputs = [ pkgconfig ]; - prePatch = '' - substituteInPlace Makefile \ - --replace ' = gcc' ' ?= gcc' - ''; - installPhase = '' mkdir -p $out/bin cp et $out/bin @@ -26,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Minimal libnotify-based (egg) timer for GNU/Linux"; + description = "Minimal libnotify-based (egg) timer"; homepage = https://github.com/geistesk/et; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 3c9eeac891db..9349c07a62e9 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -12,11 +12,11 @@ let ]; in stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.8"; name = "hyper-${version}"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "0f0qxhvwwcpsjnv1rgmdzdl5jwfprnd7fjnd6sb8liq250pij3ld"; + sha256 = "0v31z3p5h3qr8likifbq9kk08fpfyf8g1hrz6f6v90z4b2yhkf51"; }; buildInputs = [ dpkg ]; unpackPhase = '' diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index e36fbfa0f3f9..49e4711550da 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,11 +8,11 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.36"; + version = "2.37"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "1j6qhy8h3z6higbpq3q9v04amvgbn90yj3kbsvj17azdkffkwzny"; + sha256 = "1wfbpfjng1blzkbjnxsdnny544297bm9869ianbr6l0hrvcgv3qx"; }; sourceRoot = "."; @@ -98,7 +98,7 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; homepage = http://www.keepass.info/; - maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; + maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index f79d71ca2505..ad2ab147340e 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "pell"; - version = "0.0.1"; + version = "0.0.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; repo = pname; - rev = "3f95341eb9439c7a6be1f3c6366c0552ab8208f0"; - sha256 = "183aj3ys080g2kahl8x8rkhzlsb6h5ls9xm1v2kasfbn1pi5i6nn"; + rev = "ec14de0a9b666433954184167bf3b82cf21193f8"; + sha256 = "0r2gbb4l9rr5x99m62zicknsp1gf9fr124xpyd8ak9izr5hvskn9"; }; installPhase = '' @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/ebzzry/pell; - description = "A simple periodic host monitor using ping"; + description = "A simple host availability monitor"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index b604905320b2..3f39a356312e 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -24,7 +24,7 @@ assert stdenv.isLinux; let - version = "4.2.10"; + version = "4.2.12"; binpath = stdenv.lib.makeBinPath [ cabextract @@ -57,7 +57,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; - sha256 = "0ws94hgxajaww450q8ivrp28ypv39mashs29ak41faxf29cr097m"; + sha256 = "03k8v9dknc5hfrfzqw1nkpifz7wkixv3mvjl1vnp4fx8rj2xrjrq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 1e8320d75a3c..bdf14c03bcc2 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.4.2"; name = "rofi-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; - sha256 = "19x11s71q24gjdnsjf1ar6raq1drav7qp3nzjkw8qajpgvjrxwcn"; + sha256 = "0ys7grazqz5hw3nx2393df54ykcd5gw0zn66kik5fvzijpg3qfcx"; }; preConfigure = '' diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index c6430af55608..24e76500a6a5 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, libpng, libX11, libXft +{ stdenv, fetchurl, farbfeld, libX11, libXft , patches ? [] }: stdenv.mkDerivation rec { - name = "sent-0.2"; + name = "sent-1"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0xhh752hwaa26k4q6wvrb9jnpbnylss2aw6z11j7l9rav7wn3fak"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; + sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; }; - buildInputs = [ libpng libX11 libXft ]; + buildInputs = [ farbfeld libX11 libXft ]; + + # unpacking doesn't create a directory + sourceRoot = "."; inherit patches; @@ -17,8 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple plaintext presentation tool"; - homepage = http://tools.suckless.org/sent/; - license = licenses.mit; + homepage = https://tools.suckless.org/sent/; + license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix new file mode 100644 index 000000000000..7eb0f2d41b55 --- /dev/null +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, python }: + +let + inherit (python.pkgs) buildPythonApplication fetchPypi requests; +in +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "tzupdate"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wj2r1wirnn5kllaasdldimvp3cc3w7w890iqrjksz5wwjbnj8pk"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + description = "Update timezone information based on geoip."; + homepage = https://github.com/cdown/tzupdate; + maintainers = [ maintainers.michaelpj ]; + license = licenses.unlicense; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f6f9a829c2d1..63483b4da710 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -133,22 +133,14 @@ let # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags - ++ optionals (versionRange "61" "62") [ - ./patches/chromium-gn-bootstrap-r14.patch - ./patches/chromium-gcc-r1.patch - ./patches/chromium-atk-r1.patch - ./patches/chromium-gcc5-r1.patch - ] ++ optionals (versionRange "62" "63") [ ./patches/chromium-gn-bootstrap-r17.patch - ./patches/chromium-gcc5-r2.patch + ./patches/chromium-gcc5-r3.patch ./patches/chromium-glibc2.26-r1.patch ] ++ optionals (versionAtLeast version "63") [ - ./patches/chromium-gn-bootstrap-r19.patch - ./patches/chromium-gcc5-r2.patch - ./patches/chromium-glibc2.26-r1.patch - ./patches/chromium-sysroot-r1.patch + ./patches/chromium-gcc5-r4.patch + ./patches/constexpr-fix.patch ] ++ optional enableWideVine ./patches/widevine.patch; diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch deleted file mode 100644 index 602be1e3ba74..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000 -+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000 -@@ -571,7 +571,7 @@ - // it's best to leave this out rather than break people's builds: - #if defined(ATK_CHECK_VERSION) - #if ATK_CHECK_VERSION(2, 16, 0) -- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY); -+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY); - #endif - #endif - break; \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch deleted file mode 100644 index 036d57b601da..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h -index 99f230ce7e9a..de2415d402f5 100644 ---- a/base/numerics/safe_math_shared_impl.h -+++ b/base/numerics/safe_math_shared_impl.h -@@ -21,8 +21,7 @@ - #if !defined(__native_client__) && \ - ((defined(__clang__) && \ - ((__clang_major__ > 3) || \ -- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ -- (defined(__GNUC__) && __GNUC__ >= 5)) -+ (__clang_major__ == 3 && __clang_minor__ >= 4)))) - #include "base/numerics/safe_math_clang_gcc_impl.h" - #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) - #else \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch deleted file mode 100644 index 8d2886fbfa94..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/chrome/browser/devtools/devtools_file_system_indexer.cc -+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc -@@ -34,7 +34,6 @@ using base::TimeDelta; - using base::TimeTicks; - using content::BrowserThread; - using std::map; --using std::set; - using std::string; - using std::vector; - -@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const string& query) { - if (trigram != kUndefinedTrigram) - trigrams.push_back(trigram); - } -- set<FileId> file_ids; -+ std::set<FileId> file_ids; - bool first = true; - vector<Trigram>::const_iterator it = trigrams.begin(); - for (; it != trigrams.end(); ++it) { -@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const string& query) { - first = false; - continue; - } -- set<FileId> intersection = base::STLSetIntersection<set<FileId> >( -+ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >( - file_ids, index_[trigram]); - file_ids.swap(intersection); - } -diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -index 94bb9161ec85..e40c6387f72e 100644 ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast<uintptr_t>(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include <math.h> -+#include <cmath> - #include <numeric> - #include <vector> - \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch deleted file mode 100644 index f2be2d5b8aeb..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r2.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast<uintptr_t>(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include <math.h> -+#include <cmath> - #include <numeric> - #include <vector> - diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch new file mode 100644 index 000000000000..7605df6b145a --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch @@ -0,0 +1,98 @@ +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast<uintptr_t>(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include <math.h> ++#include <cmath> + #include <numeric> + #include <vector> + +--- a/gpu/ipc/common/mailbox_struct_traits.h ++++ b/gpu/ipc/common/mailbox_struct_traits.h +@@ -15,7 +15,7 @@ namespace mojo { + template <> + struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> { + static base::span<const int8_t> name(const gpu::Mailbox& mailbox) { +- return mailbox.name; ++ return base::make_span(mailbox.name); + } + static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); + }; +--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h ++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h +@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> { + static base::span<const float> matrix(const cc::FilterOperation& operation) { + if (operation.type() != cc::FilterOperation::COLOR_MATRIX) + return base::span<const float>(); +- return operation.matrix(); ++ return base::make_span(operation.matrix()); + } + + static base::span<const gfx::Rect> shape( +--- a/services/viz/public/cpp/compositing/quads_struct_traits.h ++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h +@@ -284,7 +284,7 @@ + + static base::span<const float> vertex_opacity(const cc::DrawQuad& input) { + const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input); +- return quad->vertex_opacity; ++ return base::make_span(quad->vertex_opacity); + } + + static bool y_flipped(const cc::DrawQuad& input) { +--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp ++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp +@@ -480,7 +480,7 @@ WebString AccessControlErrorString( + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch new file mode 100644 index 000000000000..cb978d58a060 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch @@ -0,0 +1,98 @@ +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast<uintptr_t>(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include <math.h> ++#include <cmath> + #include <numeric> + #include <vector> + +--- a/gpu/ipc/common/mailbox_struct_traits.h ++++ b/gpu/ipc/common/mailbox_struct_traits.h +@@ -15,7 +15,7 @@ namespace mojo { + template <> + struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> { + static base::span<const int8_t> name(const gpu::Mailbox& mailbox) { +- return mailbox.name; ++ return base::make_span(mailbox.name); + } + static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); + }; +--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h ++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h +@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> { + static base::span<const float> matrix(const cc::FilterOperation& operation) { + if (operation.type() != cc::FilterOperation::COLOR_MATRIX) + return base::span<const float>(); +- return operation.matrix(); ++ return base::make_span(operation.matrix()); + } + + static base::span<const gfx::Rect> shape( +--- a/services/viz/public/cpp/compositing/quads_struct_traits.h ++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h +@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> { + static base::span<const float> vertex_opacity(const viz::DrawQuad& input) { + const viz::TextureDrawQuad* quad = + viz::TextureDrawQuad::MaterialCast(&input); +- return quad->vertex_opacity; ++ return base::make_span(quad->vertex_opacity); + } + + static bool y_flipped(const viz::DrawQuad& input) { +--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp ++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp +@@ -480,7 +480,7 @@ WebString AccessControlErrorString( + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + +@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, + } + default: + NOTREACHED(); +- return ""; ++ return WebString(); + } + } + diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch deleted file mode 100644 index 624267153669..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685 -Author: Pawel Hajdan, Jr <phajdan.jr@chromium.org> -Date: Wed Jul 26 21:51:54 2017 +0000 - - wip - -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 1390560f8e37..ff2ae57c46b0 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/metrics/histogram_base.cc', - 'base/metrics/histogram_functions.cc', - 'base/metrics/histogram_samples.cc', -+ 'base/metrics/histogram_snapshot_manager.cc', - 'base/metrics/metrics_hashes.cc', - 'base/metrics/persistent_histogram_allocator.cc', - 'base/metrics/persistent_memory_allocator.cc', -@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/trace_event/heap_profiler_allocation_context_tracker.cc', - 'base/trace_event/heap_profiler_allocation_register.cc', - 'base/trace_event/heap_profiler_event_filter.cc', -- 'base/trace_event/heap_profiler_event_writer.cc', -+ 'base/trace_event/heap_profiler_heap_dump_writer.cc', - 'base/trace_event/heap_profiler_serialization_state.cc', - 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', - 'base/trace_event/heap_profiler_type_name_deduplicator.cc', \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch deleted file mode 100644 index 999fdb7eda76..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r19.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -576,7 +576,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/trace_event/trace_log.cc', - 'base/trace_event/trace_log_constants.cc', - 'base/trace_event/tracing_agent.cc', -- 'base/tracked_objects.cc', - 'base/unguessable_token.cc', - 'base/value_iterators.cc', - 'base/values.cc', diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch deleted file mode 100644 index b5ff0d8cba11..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-sysroot-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/chrome/installer/BUILD.gn -+++ b/chrome/installer/BUILD.gn -@@ -3,9 +3,10 @@ - # found in the LICENSE file. - - import("//build/config/chrome_build.gni") -+import("//build/config/sysroot.gni") - - declare_args() { -- enable_linux_installer = is_linux && !is_component_build -+ enable_linux_installer = is_linux && !is_component_build && use_sysroot - } - - # Meta-target that forwards to the installer of the correct type (if any). diff --git a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch new file mode 100644 index 000000000000..9f187752ea67 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch @@ -0,0 +1,98 @@ +From aab2cc3a20af9ebe9ddb8dfd15089f131f95817f Mon Sep 17 00:00:00 2001 +From: Tomas Popela <tomas.popela@gmail.com> +Date: Fri, 20 Oct 2017 14:06:42 +0200 +Subject: [PATCH] Fix the build of base/numerics with GCC + +Initialize the uninitialized variables where the build is failing. + +BUG=776705 + +Change-Id: I5782e18086a752b3676f8738930bf0553f3f97ad +--- + base/numerics/checked_math_impl.h | 6 +++--- + base/numerics/clamped_math_impl.h | 10 +++++----- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h +index 2926b37b5e..e083389ebf 100644 +--- a/base/numerics/checked_math_impl.h ++++ b/base/numerics/checked_math_impl.h +@@ -67,7 +67,7 @@ struct CheckedAddOp<T, + return false; + } + +- Promotion presult; ++ Promotion presult = {}; + bool is_valid = true; + if (IsIntegerArithmeticSafe<Promotion, T, U>::value) { + presult = static_cast<Promotion>(x) + static_cast<Promotion>(y); +@@ -127,7 +127,7 @@ struct CheckedSubOp<T, + return false; + } + +- Promotion presult; ++ Promotion presult = {}; + bool is_valid = true; + if (IsIntegerArithmeticSafe<Promotion, T, U>::value) { + presult = static_cast<Promotion>(x) - static_cast<Promotion>(y); +@@ -183,7 +183,7 @@ struct CheckedMulOp<T, + return false; + } + +- Promotion presult; ++ Promotion presult = {}; + bool is_valid = true; + if (CheckedMulFastOp<Promotion, Promotion>::is_supported) { + // The fast op may be available with the promoted type. +diff --git a/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h +index 7b5e4346f2..303a7e945a 100644 +--- a/base/numerics/clamped_math_impl.h ++++ b/base/numerics/clamped_math_impl.h +@@ -87,7 +87,7 @@ struct ClampedAddOp<T, + "The saturation result cannot be determined from the " + "provided types."); + const V saturated = CommonMaxOrMin<V>(IsValueNegative(y)); +- V result; ++ V result = {}; + return BASE_NUMERICS_LIKELY((CheckedAddOp<T, U>::Do(x, y, &result))) + ? result + : saturated; +@@ -114,7 +114,7 @@ struct ClampedSubOp<T, + "The saturation result cannot be determined from the " + "provided types."); + const V saturated = CommonMaxOrMin<V>(!IsValueNegative(y)); +- V result; ++ V result = {}; + return BASE_NUMERICS_LIKELY((CheckedSubOp<T, U>::Do(x, y, &result))) + ? result + : saturated; +@@ -136,7 +136,7 @@ struct ClampedMulOp<T, + if (ClampedMulFastOp<T, U>::is_supported) + return ClampedMulFastOp<T, U>::template Do<V>(x, y); + +- V result; ++ V result = {}; + const V saturated = + CommonMaxOrMin<V>(IsValueNegative(x) ^ IsValueNegative(y)); + return BASE_NUMERICS_LIKELY((CheckedMulOp<T, U>::Do(x, y, &result))) +@@ -156,7 +156,7 @@ struct ClampedDivOp<T, + using result_type = typename MaxExponentPromotion<T, U>::type; + template <typename V = result_type> + static constexpr V Do(T x, U y) { +- V result; ++ V result = {}; + if (BASE_NUMERICS_LIKELY((CheckedDivOp<T, U>::Do(x, y, &result)))) + return result; + // Saturation goes to max, min, or NaN (if x is zero). +@@ -176,7 +176,7 @@ struct ClampedModOp<T, + using result_type = typename MaxExponentPromotion<T, U>::type; + template <typename V = result_type> + static constexpr V Do(T x, U y) { +- V result; ++ V result = {}; + return BASE_NUMERICS_LIKELY((CheckedModOp<T, U>::Do(x, y, &result))) + ? result + : x; +-- +2.14.2 + diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 24ab054e0a66..f7cbf5187320 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "27.0.0.159"; + version = "27.0.0.170"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "00nbn8nv6irsak05cwlx9x8q0n91kbjxnkdg4c66ilx2gq5wrz05"; + sha256 = "191gqgpsl5dl39m04mm5bkkbv5m5npg91anbwsvzb29cs2yqq95m"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index af4c30b431f6..5fe20b9a9818 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0c8qn2i7iygl3kgrdwwd8h3l5j8hg66dw99qgr618cgca1b4im68"; - sha256bin64 = "04mfg18zpx19ha0mrlwx2aabn0vhl08n9c60hazivmw99pzlg8dn"; - version = "62.0.3202.29"; + sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; + sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq"; + version = "62.0.3202.62"; }; dev = { - sha256 = "1zd7rid626fglbyrp7c6517jldhgfk3vjn357vhlhy6pgj1ydrrn"; - sha256bin64 = "0hqb5prf0ags4bnla6skyi5vmkrazhd8n3ri4ijhbqjbb536bfpb"; - version = "63.0.3218.0"; + sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb"; + sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv"; + version = "63.0.3239.9"; }; stable = { - sha256 = "06r89jim9cq87668ya8wwk69hh17rl04cj94nb9c28v6mj69cda1"; - sha256bin64 = "1cm9snw29nkzq4bafqgi6fd0gqcc3jp60y6vfsrf9k4dvdard2sv"; - version = "61.0.3163.100"; + sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; + sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq"; + version = "62.0.3202.62"; }; } diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 715fefe17d83..b2067effb96c 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; - enableParallelBuilding = true; + # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm' + enableParallelBuilding = false; meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index e8b84c7ee9dc..94f3237abbcc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b6"; + version = "57.0b10"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ach/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ach/firefox-57.0b10.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3c6a528013d0fd7f002990a095e1b1c3e1e01f82444d2a53f73544c4ad4e0aad62e49af561f90b8d0fd983e7f3e515e57f14e8b9c01ed625eb90db348d5f6b50"; + sha512 = "11ddaea89af1e10184a30e691bbac711928b3e9319dd28d208a6ac7338d56ade9a096f1301eeddc1ddd591a9fa58d3b3fcd248ad6232e6a0622440a7b41a5038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/af/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/af/firefox-57.0b10.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "f8ef0a994e3ad04a02f86f381020be2087674f56ca747be529bbf6bcfab03da221305767a1b056240524e473a986ac7987485bd3a94a21d2030e561eb16fd1ee"; + sha512 = "f725a89d99adbd3d11c85b8354b1bccd423e51aa08c26c0f593433e794ea30d01034bad710010f263fa98afc5cb020dd0f3020b7a99fcc78b0a1e0c809bdadf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/an/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/an/firefox-57.0b10.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "4df60570c8c7352fa1e9a0520c795947db6f03a7c757a8a554b2072fefb36bc2636c15ae58fc7bb28ec5e8aa471fda26c91c7e8aec06013407419e9522144c9f"; + sha512 = "0bcb5fecc974373ad5fec8ad4eee4c8647e6cf0cfbc5590238d8b369cb3ffa8ad048c67a9b1bc5dd4feb900011f79e521fd9adc7c5c74c32d837b20a651c4a6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ar/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ar/firefox-57.0b10.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8908830c2bf333d6d008cb900b97132abe26d84c4cbd4e0d281ce2d4cb211eab4241139836e5b39bcb8f48012254d8d5a06b227b1ecbdadc6539899bce1326f1"; + sha512 = "a2a9659b085cd47174913bb481c61c6df24e702ce4e03040d5280a64a985bf302b5163c9e9edafab59599144a2ff804d8fee275d7ef5d3bb2480de299126a34b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/as/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/as/firefox-57.0b10.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "28773583524bb22de708ddd9341192b631674b644ec639122661c25feaba70ccacdcbd77efed9997e490ccf59882fa9f5f5f3010a62f361fda2808ca73061276"; + sha512 = "c1289cd1e7675f804842486b79a9bbf9ce4845ddf8d625a00f614b84cb8331b111677b802dd74a2a908363c4ba175276b3816ee3b8cb77ca4c560e9c578fbc17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ast/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ast/firefox-57.0b10.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "7510a259f3ef4bcc38163b7ccf2f090cd4a4cad1133bd2d961470116d0f0bb34d41087a40d744cd31207afab1f5299049558657d02f4f0f23a3c99a98d752624"; + sha512 = "23b316a187c409317939c4208fcc75c473eaa18c5063ade7aa8df7f70919f9a3942c8bb306abc2a012915eb2cd153ed5dca024cef39397a7c7ab604f1d0e2271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/az/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/az/firefox-57.0b10.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8282183bc02bd7d4bad0cd9d74956634dc0db8988245caf1eb89f16d596d78a6ec00739065b38cb399dc93b113d35eef5cf1188a2a9c78256d002cfeb87114d7"; + sha512 = "24e5f8868e89aba56366e62cf9cccafe7c284c44425b4a29ee8882715401d62a296395b14552e7fe34ab4983e1f6c7c87fa356f4d351fc7ca73652f8d006a6f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/be/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/be/firefox-57.0b10.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6440aa65e05ddbddf4629051be4b05bbb030317c241fe51de08d8d11c003fc094808a532192651d874b6ad7e6d8f89aab66485442839b34df22189fa89ee8efe"; + sha512 = "361e1923bb59f21bd5fa16d3b94f487cc8da241914369cef925b838da63391e865061ce160390dc79b862e99b50a4e7a01178ac6c21e05aea7190b2dfa35bbd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bg/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bg/firefox-57.0b10.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "9489b8125e992f213c06583e6b4205d9195091824ff39b5b171896be2766c834261f648c34edc992da72bf1c4609e92224a119402913b4e8298edbe94159a860"; + sha512 = "506f933b1871e0a9913aacb0c79dcdf432dee6546190f08b48087ce9e292a90ebe9cda2bf047645e47d6faaeb93c0274322a908d928273b63c4a258f02b21a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bn-BD/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bn-BD/firefox-57.0b10.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "22db87e53116fc8db9b2c917dcd2416f0a14e19eef5834ce58cc141a4123b51e97e9d29f222c341f30180905e9e261d1f634579d8efde4db221ea78fa82cae32"; + sha512 = "805fde6efde1f6d452315b3df401a4d65cf5a807bf8528ada41c1005817c0bfd2cb924b5fd9d34bec131e4a2c0aedb7d059e49d58af6d4b68ffd29844b7ae05b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bn-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bn-IN/firefox-57.0b10.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "91800665d44a074cdd56333722ce3d1da54c4df40a9a964f63ff6153bd077e452008097f6bd678635d2ea16e30491ed960f60a473d7f95fa2ad35c9e717e6bc8"; + sha512 = "ac964e94f4a3dbb93f812712961439af7d7db6db4fdc3e054d17b99bae605658db40c974c58aa566f455cb4965b5d5bd378d03270b7237783adddb2bfb5ef7e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/br/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/br/firefox-57.0b10.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b95dba3b94b48d63b1954ac4983bb6d736777630899c60a84dce07d3f55843c23bb7af7215eee081cb3432c705700dc4e4df3665b329d0e5cd9e691e7da9bfe6"; + sha512 = "f6d30d417c0eb2fecdbb31821b8414e318e2a3f042489fbcaf96faef544005d7fb32c3c02fc2bdc2633acf7c7b76b8c24fba966c8539d6d3e9e928c2cdb3b1d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/bs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/bs/firefox-57.0b10.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "cc656b07f6cd1a2783fae5e09e9ba4e0abd3ba3b29649e8d496511564075a8dc442206b8f2955aa0f5ddf36329c6b184278204e9398eda210b51774091341be8"; + sha512 = "fc04a70c597082726b6b01759eb79d844a05d9bd0beff12b3802e9708b710cbc72b71f830ff561bccfd901116d8cad44384e7661695f0b6df00f6b1d8d2025c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ca/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ca/firefox-57.0b10.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c61f7f062989d10372bb79664ee94d5ae59e89ddd69d5eebaa3da7c3c639ba7c50a3f9608144e76a40befdda32c87ba5d32e14eaa0b98130fbf7d6b8ffdecad9"; + sha512 = "fd0bec7ae04fa945556ccc01cae9a3848c2cceb3ebd40f56a83ce3269b943b1dcb42c0de000bf20395e34277aab258f19c9d9678da6f4b9a59932ba6a904abec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cak/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/cak/firefox-57.0b10.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f2b5db704e668fe3e8e97aacea1663a2849eec0ea527b5107927c5710d95bc8a8d89f73a23f53b430fd24cd19b5c7c0e4a6ae34d71aabfa87b5a743e760dc0a6"; + sha512 = "5a22e5b260919d9d85976be09947fdd74b29d5821ed0110857c9f94997b2c54572c95568a87d115dfd049eac358c8cf7bcc6b41de92d278cea5de87468274b50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/cs/firefox-57.0b10.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "104f7498bcde823ea1f28e79e2be25acfefc5f9cd4755ef5332f160e15a63ba54ccb713a69c694027f2e99ce0e1b7ab07134c6bcc8a4d3caf8b10241ae27d3b1"; + sha512 = "deb041e2adee7dc7467b1fdd302545bee1ee6b08a03a9bf3c030096ae0507f0956c32f64c6731be95782ca4b6835e8066ee384bfc9c08e35f2aa386d3fb84cab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/cy/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/cy/firefox-57.0b10.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "dbf802eaca0fb11a5453cbbea4f050ae7fcc5081712cd9fcf3ce9b04a1e042dd4bc1ca721d82abafe26b9d6cb5bbea41ff6b58252bd52651ea5fbca580cad479"; + sha512 = "b837d159b13fa448cf13737e163d2202904b25dbef9bfd43c8f0f0e96e4ec7e65196885bb93575682c5c29267f07b07471e2861ae3cbd2f732d611dbec4dbb24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/da/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/da/firefox-57.0b10.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4dad1125de1f8010b3b30fd1ec84e26317046d5579c7841bf3bde480c059f088ca3dcf6e2b4a7843f1cd086798e28dcc95a6dfbf533919f456e2d6af062279e6"; + sha512 = "c341351d5693518d22ea1ff2f1a46ac187c933355e8e106b446b8a200a0eea6ed108d582917f99cd4f9dd2f376216b0e773c87485eba56e4b7ed8957a4c19fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/de/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/de/firefox-57.0b10.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "dcba94836bc0f0409992e33d65814cca86811bb6ba6695a082a8b109ff153a0d12e36b6d2ad2d62ee9b588a68315f40420efa7c2b70ee667900fba470f01cdba"; + sha512 = "e39b6dd52fa1eb10ad46e3cb54dc13a79722bdc5fa7a2addaae10a9ad1417b548767bb589a23efb8b5e0188f3a086f39de24c9e7a652882414533c439db219a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/dsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/dsb/firefox-57.0b10.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4bcc69f67901776a153f7b2bdd22d3dc7c23246a616095579008d4c2c2798ec09985488ae0c870e2c794aa553b687e95a56f262f9a5568b1712e04ef3dc884b6"; + sha512 = "37f858da1b528071b22ee1c3e3cfba6d20f54cb89397f844e648c9962b3f3a32a610012c0b51b12e2fdf9539cac8e7dd9c1f629d5dd840c401fab9982b1f8d32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/el/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/el/firefox-57.0b10.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "2cd4d4ebc3099761a4f3aac6edebd662b4e4397e276e2fa1afa8b0acf6ff2d9367ff7f27909350b5ad8bda3a309a73d46375d46fe8c986b35c209859b79da4fd"; + sha512 = "db560a967583e6913226c08baa44d1be12a6c7d158e260b7dece52703a5e46e62e8773699e27cbfdf14076b34094284099ef077ea7cef03cdf51707b32ff1d48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-GB/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/en-GB/firefox-57.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "86812a5b80bbe2845f628e9b02cfa037077f9a9bd39e292dbe8857437498ef48dd5576ff98f70765ce342faa55459c0df7ec57810c4491c5fcf1f874c02f6382"; + sha512 = "40f67b3ac7c3a3e557b60d6edd57d2754256f2776818c25846aa55b5a7048cfb1e775cac44b2c5459038454cbe0c544b796fa0c86e751866a011fdb4c79ffa9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-US/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/en-US/firefox-57.0b10.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "27d107999a86f31451ef4086d62a6449088619625b46c599869564cf0bd4484ba13c92c8a368afa1111039a81c01f8f49cc3a270680822638f8c73c3d088683b"; + sha512 = "03762f3354ced1aba8c0ac09d04cbb4d796fd63ba659ff0fd8ec50f9b63658cf3e009eb4e3965b91872feb43d6c15d2b853a49f3c69d9310a81b8c9f1756bba3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/en-ZA/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/en-ZA/firefox-57.0b10.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "0fa620dfc562e187fe799251d98c7caaec3021f5317f4bb31a78ffd9fd9501461d17cd66e0d47080e91cc2fa7247c1a1de8731896ad0daa8f891585d894a294c"; + sha512 = "b83a44cb172247d81943ada3526f4151ffe2c4245bca7f0243ddae8d136dcc988f02c7d6aa7dd5088717575431cafa66d9f15fee78a7f6d1529cff6a86c6defa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/eo/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/eo/firefox-57.0b10.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "3a07022582140f4a25992c5e0e93ae2d0f695c5a258a98c6f2b1d3edee41248b9eee3e655084d61b21a7c32b29dc03f4bbf5e605365a2d077d9b5ca069cbc2a4"; + sha512 = "fd6228801a9f4d09bf3de655603bd152c4799eecfc43a1701bf29f54d64be5228cf0a0644b1501ca68d445a0154e539574e16cd294aeaf24d7e4edf1a55c6ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-AR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-AR/firefox-57.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "bb5f9b65b6d92654761d99911afa9d10dd1adb2a80140f6c1beaf5e014cf46929512af716c1fc8c01bc7f13baa5b924252a11a71b916d3945c1d28ce52686019"; + sha512 = "e6527adc411f6fff1e2ccba4adc156db94f8a62b26c7453cf667434a30966db2bc06267d84a5760578d1c79b0f7f24751effc45e65f56cfc6651fb90213b40e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-CL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-CL/firefox-57.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "6f7df550a90d2d8fa9b8417ae4bcad8158b544c3a49f240a0be4b0bdd350b92ba1c7cf99edddfda85d4d702693f52dce2ef053ef985001b5cd0899302087b21b"; + sha512 = "47414369c504526d19d952157b14410f820c9cd08b7f026ec07ca10933efe3ae88463fd98cf8d04c1bc9c1b4b194fd4ddc0cb1b8973b658d31da5e13878ad92d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-ES/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-ES/firefox-57.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "d472091717f237a163db30be066589bcc1c0b2b72aee751dbad0e47557fc92075c29b2c65336961fbd91e3292307be0366a89220888f3ddf966a29ec1f2c765a"; + sha512 = "d1931cd9a0206384d10dbc1b2438a581fc466952657a82d8d46558981363f0c615c86ce06c285ea9c50949bb7ed1980de16a78cab95877a048152748a44a3a4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/es-MX/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/es-MX/firefox-57.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "ebf9eebe47cdec6ec2beae0d6edf48295089c7ee5aa1ead26e0ddb45fef583aa5be3941c4bf4c27b4fd7504f141a34342f674c6e15beb086f6994e8e3fe45ccc"; + sha512 = "e5befcb9749d65b3386140e15ba0dc16c72ea9d5036cf324d833ffe1fde79727adb45a7c2d23306dc023caffd533609bc50ae99e91c1a4bad255c9d27c09deed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/et/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/et/firefox-57.0b10.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "818c7c4cd486988496f50d5c5a4a56a12ac8538113549433f11aeeb33242d7337f144413e27920cdf2029fcdbc9a2b9a47a9dc7d92fd67f2066ec5b742b6c625"; + sha512 = "65160be903f009d4704e8f2d36d7e95e83bb8a70d7368b78673f576ababcaf813297af794086a980928c721c9222f4f5d4882fe92b2e1376c65ca0031a7dfc1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/eu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/eu/firefox-57.0b10.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "781df02d0977a9e50ff01e214e2ba3bda27fc9052119d0b03989304d2db13009583e7d6fe32a9d502eaff1abbfb81c55658c3682e4f59c6da78ab16b59e3bcbe"; + sha512 = "a434cae9cee1a4625bacef653bb4681df4ee9b149319092f10dcb69365e4fd259258c70af8340ee1c3e689a656f683afb2c8c135c970323e1fba06f53ec2aa24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fa/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fa/firefox-57.0b10.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "8e10c6d61d145a1dce790dc55691091b514749fd7565c41d1f5aec6a863814fa5a7b4d012068682dead8f87e4c1813787bc724438018393f5989f9dc49a1275c"; + sha512 = "94faccd5a129d7e7043b78b03c9988d7fd1385ce12e05d97fe98c3df1def44e175219874ca8d38257f0053fa350fba4abe3bcb072498fdf8e4ee971ca6f47a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ff/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ff/firefox-57.0b10.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "1429a4d627e655edc245c375cff00e39b4cc42176e1141e49e9bf5eb2a9564de88a0915795bb94dc842d44e0de1aea28601c30fbe14bee0b210e15384c958c34"; + sha512 = "7c0b7ebdf42f70929a6b04e9d710b228f85c0646d8fc89ea9b967c66c62555a68582c8017e55cffac2e29e1659b4789e6704594652d4570a9013836a544dbf85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fi/firefox-57.0b10.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "65e1034b856a51dd6e21a7c21436a7f2ebd6794d6eea8f0631161feed5c06c34725e99473bfe9d169ef963632cd4aae72ceba24b658369f3da6f1f34017baf1a"; + sha512 = "f6edf2f09d3c4b8fbe8af896ea32040a7d27b7ef22cd08c78fe4fa8e15c15c47e23db734440e73bc88a2f3527193955b685b0178b132b1c91595509dad94a6ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fr/firefox-57.0b10.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9369f1ada09541a46745d66722884b3eae920f79673763cdce587a56d36515d6a9c799775791d587dbe5cb33d683b87194996134cf530d20bd3509d09f62546f"; + sha512 = "468a21a47102e9d508e17e5d4f612ad528cd2b0de03c3744e185a7c988f6db77370d2e08fdeab1282bdcaf35b32ad8a3530f338f7040d33d48a1df7ef616196d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/fy-NL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/fy-NL/firefox-57.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e765ec0dee9ae728274c594906dc57124582006f0d2c1bcb671d2d85812a5656ee99955f00d262095664b9bfce9e664c62f2b8dd61cf08fa4e460f68b8b6da69"; + sha512 = "a440f43d36e623de0af15d0f1eae1fdb0b533146524d30ff7256a257047e10c7b73ae3448b6ff70e033898cba58e178e03d2895f9873694dff7ae95d897b3a82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ga-IE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ga-IE/firefox-57.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "32e409050d2d45cf2d8eefc7c55c62c89c4e510b7d69806ccd3b8dcd7b68f58abc75eaeecc7c899fce832daaa3954acafb1d7e35d1e70f62a10f78dd4dfb7712"; + sha512 = "d6291fbc6a0190922164b5ce61f8b2b27d0db272b5eb3e01d230f7128198e131b07521d78e0ba5904285682fd0bf6f700637feaa0d45ae54d258b225fa141feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gd/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gd/firefox-57.0b10.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "5b2418a12844bbf5943e57891a31ac7f95bc214a4708fdaccde772890bab94be88251cdb4a13b031623c396767e6386b5741f9bb46a6878ea28c380f91a28963"; + sha512 = "636d2a8931f60687d93a94b937a57cf3047149c6809a865345da76023ba692d4e2b070a8bf35706aae030fbf7bef470d4b853ce9485e2ff456012e27edc8c063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gl/firefox-57.0b10.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e45193079948904b1900bcde30128aa8e1aa29d7ca70269dd1ad73e55d9dc7a1f6b18d9c31a6b93fd13c84ecc7d8f6c474e41831434cf3455783597857f4cb34"; + sha512 = "b32f50d930fade62a185adf90a35356de33d7a377b15f80b52fad10b737d66561db04177d7c1b3e4c5a26f213355af8a9d553a6eea9eb9ab4aa44e9b557a0480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gn/firefox-57.0b10.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e062ae0ce3458bf95cfa37ba439d7da7f19d612240f9a23363cfe0724d264c48ec50826e4ef959fa22d7a211e964a9dca8eb23281fddc8069af267b015c9ad20"; + sha512 = "dcca8976607b4f0cc67190cb57b4a5147a7e73c4f60c6334c89657a20ac1b583f33041d430d5582717883c398a6dda40889f9fac543ea2d08f67fddef84ad4f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/gu-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/gu-IN/firefox-57.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "42e641fa032601903d34652996c08c6e74b1bb44bb2b579a20edcd064dc668739b4e4b8b973d571cd3ee5818bc99667e5f8114d8744de0043141c205c6ad320f"; + sha512 = "367e8cff652fa85bc546f095f9079dcc7b95c86db32379b6303188de62d396be65caacc9e602b21ea87abcc1cb7b588fb9aee280518bffe1e72d4223b7c5f224"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/he/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/he/firefox-57.0b10.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "1303b9dea95512a85112097a2b1871d6415acb2134bc538e27fdbf5af005f3ea5da58c813aa2d02242636bb1211943dcb8c62f47593b9cd2846c26d0f8f93d3c"; + sha512 = "f63a6c97b577d1d4c7970a496dd7ceda7672563f477cbe3b378ce2f7d24a96d8f9ed80f99bf6b28547ed8b2bddb6f8f788eff9bbf52bc4b4b8ec744fe9d8bd00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hi-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hi-IN/firefox-57.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "d8300d7678b5989884bce54fd7969c758eae4c7503aa25855279a3a24c3fe3c95097e4aee2a4e29c86e53c833be973571fa496290754d7da001cc6712fa11d2e"; + sha512 = "7ec57ba1fef3c771a057a156f9779cf168ddb33530ad1644bbec09431965dbf94e4b0933df500dfd271ee28288f0639ac36bbc80cd49b7d1e051a317c10cfcfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hr/firefox-57.0b10.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f6b7ef155300dd782ff5acd35202e42c64eac06d1eb623e3fddcfe60bdddd098649e477c7260d22f787591a54486ccae54d915ecb20ab114f05f88305bd4e099"; + sha512 = "d50c0c5e6e512d25c3724dcacff7a86fb14a5402aa9fc44247a162c8b5cb470cd4df747650fb40f6a40c5793590d77efcc72c1983a9cb1b0b5c75173b63474a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hsb/firefox-57.0b10.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "00e30546e596c8d2c06f57de0125e7f366356e4ecd4ec4c499120e459492b45965fe95ee9698e98bcb1272249b0c99240765f5b2cc98099403585b644add4a04"; + sha512 = "3282b44db976ced30fc26ae7dbd7c6ac0c76711a3c759ed7be22f6d7c19065860998d779f5bdf569fe73a35b28a247db6223e8a3da7585cba15142e6b1f65e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hu/firefox-57.0b10.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "6fa2b613d550edc2ce3328b020d868474e1a523b6aefdbe94a84b7d38800a81abea2ce177217aef88703672293ae2083ed7b0f278265b83430f8f2bc6c3aeacb"; + sha512 = "6cceeea7200eaf8fc7d73778021ee2522d84cc5499985d629aa8f81c24af540482420808d2f418d7e64fb211a3dbece0764a18652369f708fa6f444bad008e79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/hy-AM/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/hy-AM/firefox-57.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "14d31727a1ad12438ea4883c15c073bd76a4158a5eba874530068afef9e1f2ce017ff0733eaaaa27f1296b00276aab3875129ce01aaf98a148df6677875f3954"; + sha512 = "a4c01b86a8a0b5fff08190ac19d5cf338debe053d8499b3db44c96db92c41bd0c20e2d8a86cd9e0389e50999199b979e9b1a827cb79c58068a4b7b1b65c41366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/id/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/id/firefox-57.0b10.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "aa8d47e406e391111958419b45bf88150dcb945d2f3dbcad901a641e1c2008eb25538c987ca3c8ea3b55c8c62c3adba7987c0cedd997cefd8ccd74e77c3e9a55"; + sha512 = "e52e79a57239b145724d400e28af0fdc77b469f8c5b1c5d2cefd3409543c52bd135e165023d22de2af24563e4777a1e19c2a1cca41067e175c108d34140d6be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/is/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/is/firefox-57.0b10.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "18c714e424abb23d48e449a58ff883414e5426c1c8a0f1e54f3f0f0eb4759e94f33facc6d919299c2fe5f4db62bf6daba166576debdfea6be1456b5749494e89"; + sha512 = "6f7d50cdb623fe0097f1fead84b96d97abe548e46cd2c9617d6e285ae6474593d3d75739fda803770ee269277698c46857242feeefd63aaea78264ba18395d46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/it/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/it/firefox-57.0b10.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2da3a75200238e35a69622585da79cf31379e9a3386388c087a7706b6deae76db56ca0eb6f63d02689c79fa8cb8ec9a08dd3c304c203c5de64a8da3401f25a3b"; + sha512 = "b765aaed36acd834687196992488b169d72239254a1ce7569f469537f681197b2c95b5f7fa409da3270b86d0e1e05fed3d23ada8d80c0dcaa995840ccf3cd79f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ja/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ja/firefox-57.0b10.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "5656c13478d3bdfc8fa0d1e01335f1d6c49bcd3ddd85a5a786b97418adaaa1a64632b7b8c1e5a6cc72431dbf128e4e3d81508fbc5fa6cb0d79f2f79b58778bb3"; + sha512 = "26227fe542adeb789d9ad3a75e27cf2dec2f393af8d1ae1f1f39dbe2bc81f4bf233bfb2f9db22c23dc07226a7a3f2d29d4bad633959476e7973910e0c238b649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ka/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ka/firefox-57.0b10.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "1a8b488bfa87ef950453c9479943e41fdbe8c26051d68af06d341c0a555e84abf390b50d16b8a99b0d3799182a5781c4808bfece4e055e0b3a834f9b81a4c416"; + sha512 = "5b55ef6f8ebc2184be952f4a7d83cb714bc2afb3f52c7369e92007c4e8151c6a46ac9d02c9559632b820acadc52ae243a5927abeb6f678797e56f64ad8c270c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kab/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/kab/firefox-57.0b10.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "23ef286dcb57f552268aeb5ca01368bb6f5541812a0cfae1e88161b522b3097e86be3ad93a26f51618dd818f6a6014eb96352f75a952de5aa76f7a94d9a466e7"; + sha512 = "4fd51f54876d8ed1e23c73e36bd3e862541ae7c18269736f89f8c5190840a3daecb4b2e0347805854324753f2312ae66c67584c8722b9047f5da39cf96fdfa1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/kk/firefox-57.0b10.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "f2324279d127b6a626114edb1f947e45073ee99751c960bba06cb02dc71ef2e32554be8d85756c7f76947dbab0af00969222b0bf25d896562e4e0d8ee832b959"; + sha512 = "4014e1882473d52a05fdae5550a52800af16f31689c4fae47d530a4be228c2cb59b0ce23dcb2cf96e1a23b153de2f5b766208c422d0ea7bb54faac1dea6da6ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/km/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/km/firefox-57.0b10.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2a4a1b22e6d3aeb61e1a3e7446feff92fb85873862f02d4b201952c99dddf67fcab219e69681df29429d6603468c83ded93af90fee938b5eefe8fc2cc58d17bf"; + sha512 = "67c0a62b308b707fde6a4499e3ff48ba010cff2cf5eb084712e5795b0e6be7eeefb4d65fb65a471de1e734fef990271185a303bb143c6ab0bb223c596bf54dab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/kn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/kn/firefox-57.0b10.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ab1a4fd00b09dc73c971be1cca674408f5474ea7da77b4da8fb692c046a0ecb69743912ad47313efdd6ea9338e338f4093904e42cda125f67be13f281e7841f5"; + sha512 = "f8a6759bf2ee73209bb8abf65c0acff57959791b946e82e42e2ee4011f67192797e5f66575ca492b82239df8a444ea5adc544d1de0cd407ae1f67385c2a20e29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ko/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ko/firefox-57.0b10.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "76482e0199dfde34f0fbd5a32ea79875285331a65f1270246bf8b413dc72f07b8bfea7b6a721005189107c8f2baf54f5b4c2aa5e9008e7ab70ca5c5f3bf2656a"; + sha512 = "dc0b12e24ed0f68ad22e386eef6f2c3184aa23210d9b2f208185db76788ca8d54342476830adddc3aa0e7139e678046fafeb1fb331207ab0e5298b77a52a11cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lij/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/lij/firefox-57.0b10.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "bdc30b4a4ce2fb4a4f0a761066ea17cd30fe0d4c682f7b5ae4a4a9d6f220e9aca7a918f69a2fbca85adec8eb95d4c5c664e8958caa73d57d79152549f03e4bff"; + sha512 = "8bcb2fbb9689bcd73903cfd7582f5421d6c4eeaf0feb95079ce8c6c008e120110b981aa638d831030e20696b062b251d0be552c1867431fc6ae5220f38a0a75c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lt/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/lt/firefox-57.0b10.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "afcb9b001e0751530d179dd3f797240d72a31a51263ff91b8ba055a90b474958b62cf7a7142ff43a84e2d7c3388feefc13232f818a96d82bf58d6d2a39c52db1"; + sha512 = "7299042c6a29d70b38dffdc5b1d842e841bd3e7ab70a57ecbcc0d4c75ca087606aab1a73680e1566401112123cdde3d4a7f0908b7f54ff0c82fa66ea16579454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/lv/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/lv/firefox-57.0b10.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "75c712b5df622308e113ec2dc04d513b911f15d180ceff0439b2bef9304c9ff359ecb895945b5328579906eb5d0e2fff6f1fa2698a085d104ecdb19d06727341"; + sha512 = "3173dca01bc34c51ac775b70424a78f1bf5cc7edde3fb30f43eb67c4d73b6ca70bef28438683115906ae45bca731be3cbfed4d8b21dad255f15bc5d9141a458b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mai/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/mai/firefox-57.0b10.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "e2e0654d8f43062fb173dc4782b83641c2e9a5d5aeff4e0bfa38293956f321d7410eb9c5e2a5e17992d6895575fe5f1c94956cb67ad6a4571673a093b44b84bc"; + sha512 = "a185b31c33b3a7a120d7bd6e9b7236b7f2c8fc080ad4607ed0c25b451716ecb26dcc36ce6970722b76e9025826964ccfaa93ddc75aa4656174fe25f13665d3f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/mk/firefox-57.0b10.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7eb2cec4b09a6204986c6a71333d5b08802617a0ee29f1bbca52c8a268c27456904e518128d15f74fcec0cdb040f5696c365669d0a8f1653740cfb2a25815161"; + sha512 = "269ed71e11458ddf930b701a0b1ca6477723790868381188ae30bfff6bf310048d931a792050b18bb914809e48f867b1274cb25f3d19613a2b1875fe048ec554"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ml/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ml/firefox-57.0b10.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "cb7f5fa2d2b1650ec24969c25fb2d42dcf2f478b2f7a4ff48aa2afd2a08b07ca2fde842c830bee2c3f6de588fd83c3970ca965dc62677400c43beca6472fdfa3"; + sha512 = "e39c80c81520e5d00a7d1e1ad94a1f4480c3d791f412673b7c3a1443d03e830802cfc1fff581eebbb986d83e1b38fb6b144cbcec30e60ad124692884cdf4b2be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/mr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/mr/firefox-57.0b10.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b67631b0ac97123053b5e941df3b833ae3881b8a37d1c25e18ca962a04f2a600ee23257561a5a7b69bd37948b480cbe75b610313d67f1a3ea0c64b36ccb1b0d9"; + sha512 = "0996deb736677c9b3b3cc9e192835f3760103b868f6a449df4675ea8eae812f5ff9d2f4fd33a3dd8be9a13ea44e383cfa1de4d5982fb63475fe0d709ff48f8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ms/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ms/firefox-57.0b10.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "614fb7f03b2fca659575600c2d7bceee35e4066f0c16cd3d88364b2b4c36fc6261161d5ece691ae8230767d5af4302d84d6e24ecc2786ef7f500547c8d039850"; + sha512 = "612d8e6c21116190c15a1ef945f179450bb6667d4e83268c51e88a150efcc5acd9b04ffd1d80eeea13e65d3bc3fd9c925bf0f19738ef542187be913c9396de4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/my/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/my/firefox-57.0b10.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "e568525fa0151e5188a325d695fad47af3e2f59b15ce4075d27c6e6b16b387e86cd94d03dd5207c675cb0f7a4fa95d3f7e67248876391259d858277cb5ab339e"; + sha512 = "5824bc5759c9223c68c888ae9fbb2393f8d6b02f7a12f48918dd6b331abd2fae043474999d55864cae75d12fe55e29fdb94ccc4ad716c0fd780d0f63fcca974d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nb-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/nb-NO/firefox-57.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a7008a0e2da4d0a273d0fa9b9a7fb1c873570227536600820df353deab63b7fd3eca438e0647e73a9e93207fdd66513c051e91949f83f6af4a064f50392eef27"; + sha512 = "111c1ec84ebcd06c1563e2f74ad28a9461044a4c75ec66e0f9d0b497305041e94176ea1eadf9f202e1ed35eeee7c81328debf3de9f9d32984d20ecaf007a0237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/nl/firefox-57.0b10.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "380d4d0381cbcd9eeab57a1eb0d7b90a73d0c163c825033d3f7c65412ac418a7dcdc07ec0a10131035f4d02a9ce37133b4514ef953dc5bdac3f0d415149b4364"; + sha512 = "635bf72cd6b18e82cadd8268bb97301bc3d82f6720ea6a33aaacdb671e01447ea348cda0351236600f226e673884f6f2d495bdcebc3a0a87a5d389d82b2f4715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/nn-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/nn-NO/firefox-57.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "60d9157c1add1064b9f5d3d0873a36fa7a29f9f19da6b0da83385db86798ea645ca98162a63a43f4eaafa8b79a8c19cc2e547e08b3c06da8c36c077993fa8faf"; + sha512 = "03f0b9bad6ef0f1fdd1507733c6a059ba35350f33cb8c636b7acff4239f5e1e5b86acf1a29cf8b5edf102c4a20a7af4ed5f4026e44dc56f5dd97d08715d7410f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/or/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/or/firefox-57.0b10.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "0ab3abff83d0d992c929ead73e2a2de174475b386559395a2256d40e7ce8c4c6bd48d59bd2f3e343b12c2c31c2fe2febe5c4baf658fb38a9dc4bce2106c8d159"; + sha512 = "a9506ab8cdf3adcffab1406c895ea229c97ab515b5b866f19eed43cbdec8bf877eb22fbb3d29ec429b9624e4f8a962a13a5da033a87bed8f9e67b0f83fbc1348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pa-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pa-IN/firefox-57.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "29d743e8f90568a1f4f4a1e0988c9f5f598dceb589ea4a6366d9793c4e78e650c0c5f8caf0a30c5839d5226c0788c40e5e128c027554b33e33f883a65504ac6d"; + sha512 = "b0eeddc8b3b421fb7b4215b146d644c1541a05f928258bed17991a0bf7c91eb5d64d834dd1ce4ecbc7735fb6fe104558a4a41592d4a284cfd7166ac015177bc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pl/firefox-57.0b10.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "7738550ad840a14871da75c913816f9c7d27dd5037c3a8a6ade0415094c28e2f1a00c6b92dace368284ffb0f859131f1894da3b0ba720442dfecd6ed67bd3b3a"; + sha512 = "c3c1094cb2e7f4698da8d05ff85bdf6fa127ad91c07af13f9139dd9f36a99d542edf5b58b7ced08b8af277e9b5748d085468eab6ca45c9770461d2e0621d243e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pt-BR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pt-BR/firefox-57.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0a738deb89fed9c4faecde5412bba4bba9c83829f31ad79253265fbcb7d5e479160729ba537935c2f88d29b987cb984f338dc6232489938d22333da49aedbec5"; + sha512 = "e80d2810f3f77d090a1b11bfb808ec6e159134e52838cfabda83e31164049fec54c2a6142be127eb745c79413955d5ffb59a314b26b3c38b5c18b10f8a2fc714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/pt-PT/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/pt-PT/firefox-57.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d51ce8adfb710e8061abae49b47a580278936b819be2d438833ebdd81bfc1d7cf631acf13c4837ef3134be6b9dc31b5f08714d7f37271faa5116d3fd2d4c7937"; + sha512 = "357959313de47ee9637e1b492d88f92e340b22f7ab1c512df483fd31aba55e83265feac6cc0ef9698b1e08c9070384bf94b1c54f9fcc613aa87b81f307baa37e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/rm/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/rm/firefox-57.0b10.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "bc2f9d3cb33474c330c637a8e5001d3fe427172ac9ecee4a9ed2f612cdf0f4e6e8213f5a4f01d964e8326b6ed713de5a6d4470fa87685487800f29485727ce8c"; + sha512 = "fb45631df64eb1796627cbf3fbf4f0748d145e05fb0cf1fcf3136dda89efe3b0b1e54d7bb346c275d8ccb1ab3d30aff343021d26a218e15aa8d5b052cd598794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ro/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ro/firefox-57.0b10.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "66e25774ab24a48988bd8963d089c375f8bc48d73ca104bc83df36c1ee8da7d1c46831dce2539fd447e956a2378060999b53e60a9cd7dcf5dc780ae3aef21648"; + sha512 = "394ab7b62ef980390d278a297dbfaa2730dc3211e537959ecb7110c6b061aa434f647a0457619a6239c01d9e08f97fb53ebf925d7f47fb582919b7bee812829f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ru/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ru/firefox-57.0b10.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "0b3548eaeadceb0f15dc0d9ff198feb2fe94be579be3ebb77026894a3dd6aef6c4be36b32cc0876795fece91ce96fd6233ab12bb85aac415e5368c8f00dd97fc"; + sha512 = "462e706c702be21109cf11ee275ec2683e448fddd99861461aed3e1aaec307d526f692adb8b09d3a813adeb86a3b80fc5c561ef56275593b6ab8145fbc11694e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/si/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/si/firefox-57.0b10.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a77772ce7197a9878cdd1f9fdfe9bedd21984bac5846a81ef9e1d08fa64da6bb8dbc80b758b0aceff58e3a97f0aa4446e9f82126430c56690a87363fb65b02f6"; + sha512 = "0fb26e2d6700998d199cd743252d981bcb119562f10c63de589a8bdc81759d593070c1b6e961230d9203f5d4a4a25fb96bf88eb58a29654de41e2d5130bcb574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sk/firefox-57.0b10.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a9ae3d06e954d07da9cb3312e0f567593952e9b8cd8597a42f5fbfa80009f8ff79f3bb502e2032402c62ba3dfd10887a7314406d25301e5c00ff653af5fa3046"; + sha512 = "fa35b0c5722c237b06e2d9954256c4cd84fc8752d2705e429b21c3800ea6a163b598281b29347596ec30d9fe7c706fc3de0e075519a65221eb459dc671b6f541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sl/firefox-57.0b10.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6b63b681bffdfe6942ed11a1483c7072f5d8322a513a2a6a8caf45cafa3e8f1bd750ef9db3a48ceccc49ba281dcd57655805a483a52325d542607511afb1c6bb"; + sha512 = "7ae6a7676cf281e773de163eda410c19497b5c099f675328a7a75882e3326c7734c0ed12ae224be368b922b8f207667962de5024281de1291d1cbc59a19f6c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/son/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/son/firefox-57.0b10.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "121e67c39bbc546aa06f409cc62699a3c7f43307a11140c0ed57f5daa009be92e527fc5a8eccba7311fefe650baede394c0e0ecd01e2adecf783439536caec72"; + sha512 = "e548b454499f0067c03758af8d32aab3ad50e6e9625abec2220af11052e056de965686ea9ae6bda2b4aa88e49aad9d5388b39aba77ef00ef6a1b91cb36caaab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sq/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sq/firefox-57.0b10.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6e4db28b27bb6991faa10703b07dd251a53d9f30b27a9bb6f640c491a05059c6706f13363557d455d5529281d8797620272eda189da74c0f449d03bac8973b96"; + sha512 = "15ad7a9f7a08f257d3db1ef1e454cfeb9fb82dee05e4d12a4c6e6711c5ff1640fe5a5e0638340429778ec135eec3003518fc6e739372fe2055be2003e3b795df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sr/firefox-57.0b10.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "eb2d92f3470e97f54b70fb12b87e2b0653664ea0f7a59e93f85a907564dc9619a639d6ce418e1ab90e8c40676e37463d9e4ecc29c07d810500186bc1c234e6e2"; + sha512 = "9175b246684ef4377045302c0ba7389e45d6d90673739b6be4fee7d7ebc582e69607c0417c311aa924fea0e94c685cefa35fa764b5c033885868829b087892f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/sv-SE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/sv-SE/firefox-57.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "faad39482bc2ee50ab66ab8172097860cbdf7d5d81270bce700af8300896b4d30d1b9ff4737ca0841015058ff42fd1ff16db68672109e64edd67d6f0592add7e"; + sha512 = "661e508900ed982749ad961283d82b1430ae9f81f352109986b918f68e07d60760469c17ac831fe8dfc5f249d9096bb800ac4319e9be123f772d3a414ebe1630"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ta/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ta/firefox-57.0b10.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "ac0cd929bfd9dd5e112077194601e1d70d40b86b0c8fb347be8edcd30b4d622974ea7580709f6502627f0cfb99eee465a615b9899e38d427181a567e47593e20"; + sha512 = "586ba071cf1ae05dfd71f42a2be169bba5229edd25aaa9f3f40660f9984c204387a325fbee2763775f340b459d1ffb79f0f2cbd9bec5a07db9f184e1218349de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/te/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/te/firefox-57.0b10.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7c45aa88117399629b0985d4f64e503c63e116e05acffcdad18c05cde84556d359834ea1c478a0585bcbd8838d23c1ca9ee117cb3fddd2957a10acfc243f5e70"; + sha512 = "8c5eae33d036a6cab73f680992428134dfd78bfe18aa9b0c28d4a9b145c23b9087179fc377728b870749fc3b5899cae3f961cc4ea079830c2571ca49514093a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/th/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/th/firefox-57.0b10.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "fae97f4b0dad5a0e474be35ebb9ff2195a94e5d11512697a41fa45cfe1f131816283107110f723de319f2d4e9bdb7a311e7d72cf02eb4eed325b10e7067f95e1"; + sha512 = "cdc0460ff16406f5c3368c07ded2fa131db8ac0b3aff4fdaaff76b326b34484a66e898c857e95b645477915f34a4fd14f07aee883085923e20beeb20d26761ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/tr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/tr/firefox-57.0b10.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "a54215a44aec2972d55ec698b44144bed15174aceb445c0710b3e3e5cfb8539784e1ad6c98317a1f1a585f7601d33d28a4d65936ab9bae219ccf42c3d0e98a33"; + sha512 = "0b9cd2192131817f012117cf721064f073fe6e36cb282ec4473102403501507c282bad16494c8590e63788395db3fe584746e1f8c67de76b14cd78a0547ff9d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/uk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/uk/firefox-57.0b10.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "10098291464cbd4e48caebdf9b95bb30f4df61a0cd5e617c6fb09b22cd0aa46eb214e3f2b19bce14c9bb703deedcd7b22fc2d25f780759c955a65d1bdacb2603"; + sha512 = "92f64f9df846f1113732a94a4b613f33580f7e6ea084b3eb4039428040b175b573a9a847f62e9cfd443aca556b0088a1ad5904e08f56e3c6827d6959c18acf36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/ur/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/ur/firefox-57.0b10.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "5d40e66225e097eac31889c1f5ffe8389ba3a3f159956cf6f0083ae40decd1141d306805cb51e79b69de84c73b84858121d40b0244b645efcae1b791cbc788ed"; + sha512 = "68078ed247e3896fec7ae1233194d5ffae3aa18ada09243ea00ed0ec0037f9d26cbf62b87d5563ce34d5d6b0b1b117de15255ef91787fe5db2be67365bd206fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/uz/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/uz/firefox-57.0b10.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "d3a6e6310dfba8182cb529ef96c650a5344065be61569a56f310e23bc443c500af99d0e61092867c0ea94fbc65d63af2e94bb077dd8a5d0dbe1dca1aff1f6183"; + sha512 = "8ac6ff11ab3d1e351b3a84c5cb12a6e822ed7c57878e286a68189edd1ad432369befddbeae535825db3ca4570d25c89fc3be7eb8a97af1a4737cc13d6aece918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/vi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/vi/firefox-57.0b10.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fc4a085b72e31a92d9ed708eb02b42d3bba1d2d747b50891e4fce5e1b24578ac0637eb46c6a99cae7d81911cb2d6987659465e1168beb4fb27a0e128cdc06d7b"; + sha512 = "2c4a73c0ba10334fa5beeec9682ec716a82662b84a371f4e5943f5e2daa3bf225029ce2ccec82c6b024f18c3f6e68a763545a30147be954f187660ddc45c701b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/xh/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/xh/firefox-57.0b10.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "57f6cf74ca703f00d29a5c1f11223728c6f9e06bd25696effa69b155820d839680f29033dee1294ee71a2a658f35482fa05c4840a812a8aec8c9b052882b8fbf"; + sha512 = "16972b57c56d028be0c64c91809aa99bf7bbc62944f966c868c5624d1e0683a865212cee6c0e940d5f755b32f7b8ee34d6d8747324e1000e3f7b72ddcdee11a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/zh-CN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/zh-CN/firefox-57.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "52f2c50c3d65a2edaf033d313a4e2221c074cd76f1d89ccfd1101b9deb363fadf15acb9a795604c343e55ec11fa61705559d7f71134c71726b92801df348f677"; + sha512 = "7fcff685808bae83933b16a9c3512c466e63c0dc3d9ecbced5c8ef4a02f031d0574e12059086b2cdfc89628e23e6954bf687eba620d47ace390d1648d66ab26d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-x86_64/zh-TW/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-x86_64/zh-TW/firefox-57.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0f22ee573b8ca0a041373c33588496d1717eeab134210dc9cc23c951fecdfd319a10ccca18329543f969445bf261bbecb1b6de6a1223101bd50af8a1244a9475"; + sha512 = "58a9fb93f1481193586a6b80af25dae35749584a9b1ef2529cf4f5732f0d4e10ad98c7d3fb5496a64d113050b451ffed25a8f726104ac4c92fe0ada73003a06c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ach/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ach/firefox-57.0b10.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "0c474ecba92d8c6132a1bb484702db6f9cb34c9503babcc9f339cfbd97f03cbf6f9e51a4b7b7a69efa6cc9acffc648a0912d2ab92753d6e00ff9bc92667f263c"; + sha512 = "9dd0661ca1901626478449f30ec6718f359c810d9f85a06abda0df4eaf0c3ed8b84f7a5924ac80c1f6a9b4be8cb964572dd1224f2643ed9381b7fdb7b13e5ac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/af/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/af/firefox-57.0b10.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "68e0875f2aa221d639067c2479cc949a6bec5a8097efdb20452b9c6c9ca1c781570405356775c05c02939f04ce4a4ff23a84ffc1eefd5c213a37d6ed7da64fd4"; + sha512 = "c86e56ef1f5eb4872fd0ebda3703b3c5e6e365628bcb45a42404bae8ded8574580683e557f8c16943d23caad60df3528882b19323d0589b56dbd12e4a5e534c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/an/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/an/firefox-57.0b10.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "c5c95b2bb6822d80dbb83277d9efcc7e750581a7d46295257802c760dec6016dbd79c9d90767c2bc75842775ddb489b6cacdf3e7e66d63dc19f6c310fcbf0b97"; + sha512 = "ff9495dcef2ec58650e1373b0fa2741cd61d90926618bda08058d92f23d7f8fe86862b62986ef2d18603d2f38af7f4247e7537e17d37d66c430c44bc8c1a3ea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ar/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ar/firefox-57.0b10.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7a86badfad03dbb4198d2cdc287c502c54df2a8eab6be487211b3c4372b0d8d82104fdd136f84a3f6b265225f639b12f3b23f3378ac0fe185919cde202a9e542"; + sha512 = "7f66d056000ab52143843cdb6cb4b1ea0ab393dba611f14a5cad0c111e6ec78890950d8f287f7d1b8c167a88efb38de302b100cb833f28fd5c54d7435d103566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/as/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/as/firefox-57.0b10.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "1fde68d53458c0916f49be591c5bd744b7a3e3b4dcdbc0118ccfad103c357d5317e8d1fa7419cc1ffd48deee4ba196a2a41d9f8429c53be444fbcc5a8385bcf7"; + sha512 = "7a73fa66a1d6d00790d0438233ac75e740f5bbf3fc824e87d6d0c003f6a6307437f01049ec414f7e655b371de59a0c8e84a9bcdafca53192bb08e0f155f12bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ast/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ast/firefox-57.0b10.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "721e9822c9638299ffdb39eafc1f2b485d862acfc6bb0ecb02563433fefa4a081845d31b75586984b1b7db768815dd5823a8ee8c0d22b655be13c15f3c840e53"; + sha512 = "bd7d6d9c0aca3e2636e74dcbec5614da134b29f13908e230abb209fc9765445a4f701761fec8de43f71e7229b5f984cb1888d10a17d8f8d94b657f9ad0e56f52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/az/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/az/firefox-57.0b10.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "99afed4563ad52bb2573c66a974cd47688a5f951635cd28c85ce745d8b846473adf488ededc22d0737b6406e98c6f2de6c828434b9637e57f0b9973997241691"; + sha512 = "15a2d4d6d80979cd26b383e61957a5848974971d43a3bbbba2059bd16164231131a64b7c8be4d83d684daf3cac0b5898c64883766574b92af07663a9307dcd71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/be/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/be/firefox-57.0b10.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "6e7e0306dfff0bdcc4af40a63c8003b7e06bf8e555129cccd88ee0a1d726f5e914a30980548d69db28b2df16fcaca3e9e88f4b7b1bf672e0048fb1c27d00da44"; + sha512 = "ed3bafbd2719ea2829f6fe4400a12d28f0e7ff3206f5869de60996a097b6a7a876dbb50b65352b3a8b7adc246f8255e8a9c5deed40fe8f6f7f4f640b79385738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bg/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bg/firefox-57.0b10.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "5772a034ba84844656c8d93286a514e49608e5fc1a2546d9b70631562e0c3da79f57cc36be1a4aec72f9ddfd187017db588bfc63af3142afc92ca331b23f32e8"; + sha512 = "2cf11489bfbe182768e5c7f3848df7bd4f07a4d5858d854e80ee26e258f7de631f5b4aad3b375075619defbc404fded93bcbc6769798342eac5af0ba0094237d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bn-BD/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bn-BD/firefox-57.0b10.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "6334057dd3661daa8434c1e3069b7a4e143fb148db821900b9f7c71f152777f77741c7dc720ef6f1513e4402abe83d51bb580354fc3355393b75488aa8969d64"; + sha512 = "26913074c0e0de2269f26409ee2518a6f3fcad7d42f535c0ff415361ced91f57785636b4553d7838549b9772173323fae02808cd1646c080c5a3d44dc054438f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bn-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bn-IN/firefox-57.0b10.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e73a7fa1b76cf4fc112319fa09685edb2a64a3048afcf4ca4f6fb278a9a10a7571fd8566968d7e9b1a86fbe4e262d9be5c8052a6a2a31097e2aa16a3657848f6"; + sha512 = "c85729aa0ded6f03c590c309bd502bb8bc86ba0e90a369c32ca11dccc938504f8590e93d932dd6a31409ad5d6237832002b132c008f0ff6695a415257d4cc5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/br/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/br/firefox-57.0b10.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6f52057beeb18dbaa99e2762ffbdef7f3da69cc1ec4801fbfbae4c3f8fa12619faa0086dc21abd92c656d7117022f241a70be18798e93bd33eb8ef9625070ed4"; + sha512 = "458459e0ea0323d32ea256c1b1678a315acefeca0286a0b05f9e39cf9ac1f89cbae69d8717ebb8e227204bc78d72e023a08789059c7cb0fe0883db5395894a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/bs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/bs/firefox-57.0b10.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "0069bf5b9c5499d3e5424b9043ac5f61ce6d9cb34ddb329a40d30482bdb79d1a0db4f00b14409690af4f0b9afca9f87cf65daee313da6343bae5e8684c1de266"; + sha512 = "3640842fced020ed3216c2711c0276bf563519d3b4f68a942b20b2cdd7a2a3d50c0247bf440d915a6c1d3af2b4d9662badcb37e9b12f23e3e5c02a4d91610711"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ca/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ca/firefox-57.0b10.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0cb95a2b288f7042c1f6767feb1cab88d345e0f0298f3fbe3385e58c5466bdfb59a2c28683deb3a8fc3f4936dc991486295b1a920d1bc09df96cb77f58ecc4ca"; + sha512 = "60848bd684c2e7fa5c67fd6c1dcd8467d39b6dde9e7121f5cef26e3225e155641fda7c68745ed02e2d1e3ed91dab3c813771254940ffe6dde4b77a1e206af350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cak/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/cak/firefox-57.0b10.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4b9ad14926a3c952ce3dc5aafc1a04036c6ec45a7a68835f512221ddef13d67c6473d40fc0993cdafa6d8ba6927910c20c089b331233b1b6f493c048770d7e53"; + sha512 = "a95f74d3ad5cc7e1c58b6b6762104c59eb0d0ce4a9bcd08967b32204c259bf71bd567cda8cfa019bc62d5c46439359f53d85fc8e07da7c8e5cefc571e13ddd35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/cs/firefox-57.0b10.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e7e748aaecb30b7ada664474f8b2f2f9a3632d58b195f895094de2d4ecc5952948cb688dce1a151cb2e3832bdae335ef74017241d29400d237c828369bb9c392"; + sha512 = "ba510c00e7903187943560bc468d90a6b723fe6c0887777157efd33b2e97e1274f36948db092e0d1b6b28e9c0abb7f67d900b3137cf94e310996945f955a439c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/cy/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/cy/firefox-57.0b10.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4799a27cb22216e9ab2f8b2c18b18edb6eeb101995e804d78e86a1c79738f8c9a6cae0a3ae2caa1b1b104d4eed2218560c80d0be53b3e453419e576ea3eb5312"; + sha512 = "7f2541b14108d922e0a32b28a7ce3abde63c2b365ee16114fd280d8984f69f83d31d33f7fa243896ffc84f46b070be231816f7c2394e6c6a8e2ffc8330670b02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/da/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/da/firefox-57.0b10.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "fd26938de7e4df391edfbaca4b7d536bd3ef96ff53d85bb26b62fc8e9e1ebdaa344d69856a217f004ccb0a2a9f5aa18eded9f62f5ca4196ac07d845a80f74043"; + sha512 = "7221ae31d54e85fe9cf6b58f6eace9f1ac8ddd37ee43f7f29409eb82f4c09fcb8c1ffae3cfc92f515a426ea200911c92a784312ca5573a4fd3aa3793e3bf5fd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/de/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/de/firefox-57.0b10.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "bd753ea3bbfc389028316f76784bb0e4216777e34606b415bbcb6efe45095536bc5e45d6bce6bdb632cd59a3d99df18abb4579219d6fb1745ab81ad32c9d3939"; + sha512 = "b592f17e95b28224f58d2cbc41baa4dbc2bf7fc631a0a7a21aaa5a357ffd8813fbe15932f9338641f431838e5db745eb580ce1443b62fd000f552a9851af8030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/dsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/dsb/firefox-57.0b10.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c5f8ee1bb7de2db1a6310b49c951749a0779f14fb3dba73fa4e925b69c7c6740330578e7762a796bb313c43ef3cd9175441e7494ccea719d1e904a7d06aa4947"; + sha512 = "2d0e0f0efd3d4b842f8b8511d44e194efcc7fcd9512b361174f097287ee40784377985e516a1c87cc26a7f691b6e9c7c38e8805608993de437008f343d8755c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/el/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/el/firefox-57.0b10.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "20d34d89e99653649766cd6f7ca49c0cecda2b0af76654fd077fc8287c730c49fc1050f7e30095a0d83e16a4f64e1c78e9a9119048d57f531968044d9ae50295"; + sha512 = "0a9ebb584ec52aa22ce51b18a92c8be2d29a916795a52060ac1663e4bd892006a464e2c2a99bb89a4d16796591fd0b452c2a114b42a99502317081c659c12037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-GB/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/en-GB/firefox-57.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "543c4cc7ae137bccd1e4f765ae9c4422605a584d939ab919d481e761d29cefebfa664e63ae1c40b78b12da9cc185a887480c93b5af64449a4b321ebedc81abf0"; + sha512 = "eaf2bc3bdd55114fe5226d877c9cc9d5f5f78f07363327995271d863286b6534e0d9ba9cefc6efcdf7fb1ec1091e943ff9bfa41b7090be4365ebb6a7dde35c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-US/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/en-US/firefox-57.0b10.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e678f84ff6b82c989217f1c911a0d3c1e923785a8f0f65afaa4689bfe44a591d3b20066c93b5ab3c594e3330056435c5df86e1bec47c5d9ce6de0dfc68c65192"; + sha512 = "7a937c9fa67ee0d7bfd7bdd6d504cdc81c4afd6642a2d9888489845376c1975fb5e1129a9f0b55d5000d400f79049365e6a1433d0e8ca9cc2d7ddf3fe312b7a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/en-ZA/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/en-ZA/firefox-57.0b10.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "117868c399d9f41bea55441fadae9f6b7af7dcba2f6063a05ca7f2bf8f9197814f9314fec06cd63f3976cf389ef2f3c6425fb0890fd08cb036e8612c68f02ca7"; + sha512 = "ef75b4bcd4eb37349058ea9020ecb7bbdbde2873d3f15a01e9b727e4fbb58c32f09112fa1947b38b6343a004e0c2a45336f99f8534afe736120e7c92dff0e080"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/eo/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/eo/firefox-57.0b10.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e2f496ccc935fe978d05675e1152e518bb1c7a4b3cd393dd8d30a2f93cd586953df027d06c108f3531e9228c25844e7fd83d81a7caadfdec11f1bb5fb7dfa3de"; + sha512 = "9ae6501dc2bb47de897aa61a633048279cba4a9545a3250a58cd9688ee546857a7c5c69e661d78b595051f76e7afb9de60ba929c68468bbd568f76c848a2fba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-AR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-AR/firefox-57.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d56dd6fc221ec085864c50fefb57a8b4a5c11d6dad5bc5a3a24ed2b968eda816ec1fff83b00bf89e5fec2272467147ab5a6e14b5e6f5f0be25b5550aba908870"; + sha512 = "19dc4c760481997aa9554a101263030ed1a322ddd0b2e4fa743f4b572305dd6cc69fc27b2196e586308c96c73dde8e5f155f1aa0f8f0239cfe64113b12586943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-CL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-CL/firefox-57.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ecbb9f624aaca6a02762ad0c0c15b9b6e4732efea4bdfe90f3557e4b242cdfece657d4bd71a369901b4866a36e6a95534d237f661c897c5375cb627d371ad3b9"; + sha512 = "0be6855e33910446d0216eb96a258e65db60dbb5820805c63cb4202c76adb25180c4fc343dec78cc3ac6030b476a77c87441343884e97013cb439daac45c84ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-ES/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-ES/firefox-57.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "2112e809b6109d9367f9257a24b0c4b66add2c63ca456647712e9ef4ff04ea0c38990e334381c4b822789b86b4bd9949e68ea323b95d626f1a5deebace4286d7"; + sha512 = "83164bef1ba1790ca2b9ffbdc89362e1f8b9c3d42aea938567841cf12b59f02bf30ecb3146a596b83715277bedeb8fc15b9f07ae1e34c9eb75cf7d464c7c2de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/es-MX/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/es-MX/firefox-57.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4291992b179e7d2c07d38b7bb0c41b6b78007929a535f6689e3cee287cbb11662c6e94e9e1d64dd20efa5e8b5f3d5df5f554d196d1e6a8606ea53dad2157093e"; + sha512 = "4a404f137b9d736d275672bb38eb7231d5d95f3538df3a320f573ba8d6a9e68ca8e02d3b89fe3a36ec08fc30dfafc9b57eb744f8bba25663b16575dfda5b4d3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/et/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/et/firefox-57.0b10.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "bc2cfa0b6729b1bba629db9bfaddeaf1e15ba6820ccf694ba2b468700b047e22ec8d8aad47a032af514e602023bbc45a9c94e80ca251b6f70fb5aa832491637c"; + sha512 = "e86f05f93c3e1e1c388f72248d79ab5d382610af3e2a23387a816cb76e3a670c22a3363d88187f83807d1d28b182775696d03c92869867217abe5bfa2561dfe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/eu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/eu/firefox-57.0b10.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f0021641ac2079869d698650bba26f3c3d9a265defbe17fbf27f7cbaa7be2ca76f37ba4e03f3adad453d093ddf768155df5ee53774dcc47cc4fa79eca3cbf613"; + sha512 = "fc93e9d91a7a9408f7e950b873630526ed2012849e7735bdfb4c63d7ac95bce3dc11327538845d58f83b70014095bf1e48f12bc29741a3b56462147fec244ce4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fa/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fa/firefox-57.0b10.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "169d6be0a9e344353976f16c860e8fdd68b75ab94800926ba63e6efb108c6af9116d18f48485d462ce441f2bb1d484a934756ca16d5f365c9280ff0f1894f832"; + sha512 = "241df02aa26144dbf6f22ea9b6c8a7de4fd5e86ba7999db5cf23be9e409172c565466686a8901525dc514e322a445ca9b9c0b367d2a0569edb13a2dc3d66c7cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ff/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ff/firefox-57.0b10.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "798be99da60a0ca0582b98dc3dd4e3f9c152e0f85f82a0f14adb7029905a206a801339d2565bac19c4acccdbb4617cc7d9f5b36df0497c3f33ca3f76c9fbb520"; + sha512 = "03f5240e53c36e847dd23b007f9b419bdf238a03b92678d702d0d13059516a306eb15f45c9469def50baf35dc43f420c924744d0ba862a614ad7d9860fe6cbed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fi/firefox-57.0b10.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "8659e136e27aea77acc9c73b679dfe0ed8c93176b70b69783b46828806ba41c3fb2f9e5b4679dcc554d7896c74589a86d8c9b35fa521ca84f051062f884fd501"; + sha512 = "f30ef14edaf8df27cff44349a34eab0fc45c90fdbb091bcffa6da89d7142be85f40d471a040b7d6340f03754e49c9c30e072b3800ea9133b194e5566cb87fa61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fr/firefox-57.0b10.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "effc8f5ff352e6690ed32fe5ccf0c47d136c43a083fe8223687e6c0526a772b9120a15d3418cda8a061d1964260a9d203c552dd0f5a030f0431e62dc8304f8a8"; + sha512 = "121e98383848129538fc9fd82d49c9aa7238576e89f639c1886a9c3fe23a9b01a084eeb398791bb584b09dc9efbdc803d2574177276cf74b0581e7aea194f684"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/fy-NL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/fy-NL/firefox-57.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "bff1f5d37a33d863fba0dab07d29fdf963c7be207cae27ad15c08657627896597c96bb6311aaedb8ce797e7d5adb3a7918512ef611836bdb0c083005d534a1c3"; + sha512 = "88879caa704f3169d548aba70392cf4a733c6ed49a32b6e34f0b25a40edfdabb37f7bbd2881fecd2028169477fc779a438f81a140dcc89ffa4fb70c0bb0fc17a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ga-IE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ga-IE/firefox-57.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a27f0f158d2384207448016e0f9a3a9752388303772b5765707b6dfe936f66890705849b490e00c8330254f872813da064639e666e4122cd1b6d8978ddaf87fa"; + sha512 = "9cbd9f42540e1a1d35f6de300a1e4946ce1331010b1089d8a6f366896cb732775c8ecb312fdf9a32488b3d27c4dafb0453a9c525b341b98142cded87f351c9ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gd/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gd/firefox-57.0b10.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d1ba5363a6629dbc62cbc9671ad8920a1c29ac9f23ac22c42af085ad862aa924d650a6349f5ae8ea1ecfd8a285205e48d7701a0ee72b16fb7c64aad4d30d497f"; + sha512 = "fa51ec9542d3c53d571045c6ab0afa49e880dd1aa5cebf831cbea3f780dc71d462b13f790438053e926828c53675eb6b0933fd7bac6605254c69570e415e6bb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gl/firefox-57.0b10.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f6c5c318369dad3651d0e65c79ccf7f3dffada3b6ba93455069aefd6b2346e3fdb630821146d1067ef64199e6ce737101caed5e474344a1e62780304c12dfe3c"; + sha512 = "c5ba307b857b02a9ddc61ce8d342e8c7b95a6cbf81b8849746a0020da4a3abce1953d2818940deb4e853c2aafdf1b12fcb8bf04de04d5f07334a9428f8accc6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gn/firefox-57.0b10.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "bd40bd6294cecaf72be721def4e26a0a5b6056e561a0980f2945202f77bb44dfbfad339f246f73159a83a4abd46732fd59916408c922dcd7232318147f321ee4"; + sha512 = "5547e86e15715271a1ea6f00dba37a6d82c8c51cd4ee619d7f31e70462aebace55a52ad00bba0720d7f90d7d8d37cf1254281e283dadb1d37d6362e4bc4c7c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/gu-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/gu-IN/firefox-57.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6d679736a588fd52af304764277c50466e296dab724654f928888d615b7a11254a96ac60b5350d2d35d4d6d534a4d94b684afc90c52fc1942a3521907c009eed"; + sha512 = "d9283d7ed1b8e5fa3becac5db518fc49a9503d11b88f58ecbea2b8b623a9c6b2837a0a08f682453d476445397cc9b8ac3a6fdf29de74368fdb0ded9ff1e52e2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/he/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/he/firefox-57.0b10.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0c45ac0a18279e10ac6864f917ebb98fb1e199cf14ef5cab1cccf333c0f7daa29ef8784bf55faae82fb7b9ea2d53384415e84a166ffc13c0ed0928834372cdb1"; + sha512 = "f95b7982911b1412828131ab5ee151a5e88ee6710c77779c761dd25051ec7eeee930c1d6693d51d7bebe281e489a7e66123c5e40a707645b569b340621becd74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hi-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hi-IN/firefox-57.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d021986f8d7cd98910a1ba7f1b057f5dd20b3c3ae652876be69e948f29c03515e417953a4c091511beca1a06d7fcf1df8dcacba4f32653601b0fdc1fc619d5f3"; + sha512 = "ddfa3141ad4e8fb3f6ca55f207a477de4f410795257866db7709986c8615e3e919fb6409ff4557ae658f33cbe2f7b19a1c282e4125b1ea084142d2effd002546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hr/firefox-57.0b10.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e112cf30bb21c7c30dcacd6fc214863070b4a3395fd02701e3914a4a2bfed59d82234b5f1f1e22fee9824e8a731f0afba52be71c468f2323982fbd6408d558c6"; + sha512 = "46a460c41d038dde02dc1a3d60e2eb75310239cebdf58559ecb7213f2cf65d97de4e46f24dfe63ca8256b0507f20a9301aea527d8af6020e141fd62d94a3732d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hsb/firefox-57.0b10.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f648acd408ceb7637851ddf05b3174dd7a1a201dd07856138025a22a181e17904d15f357cfc2d3bca0a027c7f43baa0891d347a65d0b80f1869ff1c951021400"; + sha512 = "a9b3bfeb32b632b716e9a849da4507f3620363bb25daad44451d6b4115260b91dc35cdc313d15f39abf9f53d3df30a80d16c90514c473f4341e2168fc7f08d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hu/firefox-57.0b10.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "3b8418ee8dfd195db7826a476613b47dd4ddb6e8b2b372f85e68a588ee13de89e89c3fc2e233f144c2199b75f7d18b245c4402f111f301b44be5c75f1eec262c"; + sha512 = "7a6fb1b9e0adadf7e0a7bd6f2c85ca0b71c0daef2373a3cfe5221c3af730862d5146aebc46911cc1de5dbe3abd279fc3405a216d7b58354706eaf103544ead46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/hy-AM/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/hy-AM/firefox-57.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a7be85d807202a0abf9704b43707a1bba75bd45f60e0d5e1cdeecfd1c2a0e932dfa0e16142e411ae2cbd8c3446a14c04766e50cc3ce8586a641c3f897172671d"; + sha512 = "9dad05aebf522b930533216a11621c599c8a232608c3d275763680463da2a9d1747632548825742f3dff4efc59e7badb04b306add7e63cf03cadbf619c29ef4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/id/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/id/firefox-57.0b10.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "eb1dd05c6c09998b020e21e344c0ac3303bf7fccfc65a0d73b6bdd3d7d371507a6b3fbf0814d621944d5b9ce57cb4e19379ef317e6151416a9f6cd1286825be8"; + sha512 = "a1fcdce6da2346c79a93a964b36d1abd9c79d7528622dc591a244855b8d3fc66194f8e16caf7d1f2085cd4fa2c6b223e20c0c78b10222bbc08868831607bfdf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/is/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/is/firefox-57.0b10.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "bdbb17aa801fea8a3e70ae75d197872a35114ef7a49c7ee56cf95763e26e2bb44a815563b2fe9e630843543599812015224c6634646915864ecfcadfed9ac978"; + sha512 = "8cfe06869122f5c03e650807a449b125d5694b7d0c6febe761d7f2779fa16af5190a4deecb497578564ed10bfe375a634f1b50eeddcf25d896af35ece936e1c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/it/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/it/firefox-57.0b10.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "915552b680051884db4a177ff17e19515352ef90ef4ae88b39abdda5db955bfc34cb92c65ac8ec4ff4a5ab69baccc42a91b3b079c0a58a93587468277d620da3"; + sha512 = "ece3ee07a11fa6ddc6479a3627b0fd77b083820244c216cdadba3554f3f3d63ae7ddab351b48b6168da5bf741aedc62fd8f294b4cde98aa32bd5ed2a3ccb93be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ja/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ja/firefox-57.0b10.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "1b3ab8420f3f18731385942f1e8012096708c49d7dd1614ee1439b80f5a742ec0fc481a55295d6f6989da4346940c58503fb67d13eb71dabfd332f84fb99c524"; + sha512 = "313b186761211111e357d87afbbfdb76c48f57b397b434d4ebf9ccc30d675a2c5b8b177b0325fb7ecce0796b5e5c5342e7cccb716217e11f5bcd8dd5a4b67d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ka/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ka/firefox-57.0b10.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "7d20045d38c471aa368401f0e65f31c08744953c96d15aedbcf306ee3d0b7e01a80ed0a6e207115565ab2bf1400312e9e7a8da1048af299f9b74c9e99ca5dffa"; + sha512 = "a02e9fb44ad5c373f95e8c3f4f880e10c2ed594f5d200a6c3f37bae4aed9135de510607291061e18fa954f98e15314c112b60587fb70bbaec2eb5b4cc7f2d7a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kab/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/kab/firefox-57.0b10.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7364dcdabe219ba4f72355e74d9e8be9bd5a08990910190753df3a6de346964558e17840367780e61b1647d507ebb204ea11beea703586aeca2145bb8a9cf9f1"; + sha512 = "5a621e60fff68f07d97cd8be0cb4dccee7723eeda74a3520d70e819c844eccc3f5a06234718e4e4b2e48e6aa417d4adb977e2d4a88471e9a54538d7852832215"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/kk/firefox-57.0b10.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "12c3c49f0f9d80cd03a32fbc20f329fa7c34cbadc1ae625946a567b1b17b53fe1149ff92e6b5be22c5949a65024f9b24693a865a38bd8b458203329025fbeba9"; + sha512 = "3ec65e3fb9e9c4d1e77501341cbaa83b2822fdb44d4fbd18ad7777a39ad98ce0a36f0166ab10cc53e2c55833572feabf3f5a7b4c47e75439b376d7e457748594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/km/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/km/firefox-57.0b10.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "808673a5345e56c6206f116fa3b9319de2fd3bb4560884236dbdd133de03e4b065059066ba6d6490a16bd6d2dfc5007f5ec00149b2cdade6fe91034fe4b2f9b4"; + sha512 = "c3fdd47cbb311ec76b2ff1e48094e5e4797d7bd92db4eda142fc18fb01ed9810c78c9b25efe277fabe2626e9ce7ca5a61727aeb7096dc246ebf389214903a6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/kn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/kn/firefox-57.0b10.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "15f0103356a44255c523db8c5dd6703997b18ff0a965beac32324180c631bcc3c57de1ce65f1ba98820af1c4c2c0db293333eef71b33e3806dafd654223cbf0a"; + sha512 = "15efbaec5edabedc7161c2c914257835fdb6c5a6ee9a7249fdcc2242ae60d415ec539a2862342060023f081318cb8806ca655e5fcded9068956e2008a8c5a2e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ko/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ko/firefox-57.0b10.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "fb8803093663addd2137bb336277bea3ff021dbfee15ec29da92ec92eea62c714f7a23248bf3804b276b58f82985eb34e28da64be6eea516aed32842ed621406"; + sha512 = "f6a77588d8409ce88f82e7b37cbc4def38ecbdd87e2d79915b3c3cf5441f4115c7d85844b19623cba9ac628fd37de9741dc709c8680c792dc3bbed3f89cac0b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lij/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/lij/firefox-57.0b10.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "161085ad5441331f70de49afac1d4d22ba7de31259d8675a828b36eadd36a0cfa97a800881a99fd3f8fe8a11e03b57d0aa7e4dbd15948457760f25cce0b76278"; + sha512 = "a0b8b995897dbb8bce215022d611169fa1bef4cadd0e347c36b3cc025715e8224f4b3684094586bd04e6a4461572a1d8261ad193addfe6f4524c106177d3c8e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lt/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/lt/firefox-57.0b10.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f5cc1ca615966721bad7e1c440621d9a09c1589ca0aca4b755aa8818c958b0e9f5e2b496aade5927dc0e7061c566794022a1ca38dd07a79683e38902afe124d9"; + sha512 = "d47509d0c2b18d00f867658befcb63d14c786f5e94d2c40ab93e78014330cce5a441edc42735157cc8bff5033246f0e0aeaeb99011b782f98baf1331a383f899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/lv/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/lv/firefox-57.0b10.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f1ebc2d348dd8dd908b84351f51403b069c3b531134289c03240746927a46830dd47a54b15235ae86dc2cd5aa01d2c3bc94bc9b3efe45d35e8c4bc7123839852"; + sha512 = "ec3aaf962aa5e7a935ac3da0f79ee74a3dd0e42f3141d339f728b503cd723972f7c87cbaf7c79471ef716343c28acefee9d905c121f872fccde7fc1da83345d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mai/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/mai/firefox-57.0b10.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b6facd8e1d5ec870468ff024f4e6d454dd45e35561d5c4f3cd1c58e025c2868922d1b44a2f7520c82eb5911b7a887c98a614e7785f6ed052ecffb0039720b649"; + sha512 = "33bab56345c4a4fb95297549d5e365eaf1eae617510d951a5c80a3970e37fe855f86ffe7ec6344bf444aacc68fe0e4c0e04478ccb4f5b4f3f40de371ea1de3bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/mk/firefox-57.0b10.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "dd08da071d273041c6e442938d0957a0eed3b19b228c8e83ed4f38cbd481aec8759fd65639cedb2de8f698a79ac6b803dad3e9939fc30a327222a651034dbbe0"; + sha512 = "6218a4c6a176690245173c10a5d46139a43a09fe0e7de30fee8416aa2554bf4140b9e754e27a2861b5d4693697aaf065febc9f441bd5fc84c622966d104f536e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ml/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ml/firefox-57.0b10.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "be151a11954741b6fabf0c083f708f2063aaef2ca6ed3c63eb887c48e3e1d7599dcca4de4af946251a01bfd5e4c9d32f85fad749c1d345879ed54b829eac3f4e"; + sha512 = "4da4580be951839aa1dc9fa9e927677f964424e91431442b36784476be3ae342a0ae724ecedfd63be7e8e6e6e83977fa9146e0df0c70d409b4ddd0b6aab4aa6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/mr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/mr/firefox-57.0b10.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "75b069efe46f4d47434cb1f0c12fa19d51138e383ac1aebf83d4e2261942b7eee769b1a1a29a9b4e28450382d47206a8649b12fbb470c9a594141062f5e2528c"; + sha512 = "e6ac8fe111b31c64ae7e118ead56ab136bc199d2d0bc83f128128c1a9044bc8d7e9dca148f717bc5d015a746bcebbb2c2cbd8aa7905bceb30aae2ffda0f2cbf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ms/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ms/firefox-57.0b10.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "77858037401e6a92662f488cce07849f4074c084c9b2b3b30652d3555efd11c20beb2ad1ea927ecdc8daa368f89b02aeae4db7579b7dbd89b5fcf91a82197aa2"; + sha512 = "701922f348cf2d8a853a34a6d08c947198a85f96d972a1a3d1968045f097fe503df84c4c0bb8c8a16ffa5afa729d26a8026f06809aff6724d3e2fd54899cc3cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/my/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/my/firefox-57.0b10.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "3ce9fd601346a4552d9ea7da3a3c8048ff72e1f18577b8eab156adb1b8e174e686866f52369108d1351520354fc6bf6af2ed9e3f1fa6e64255948cae9bcbe068"; + sha512 = "b68ec863d9229da9c619ea924d182cee4a76d8cb9aaaad35c64ea31d4e03d46d025536d32408210abe6dd662398fe2b194b25b1a7b8ed52c77c99850582f01ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nb-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/nb-NO/firefox-57.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "24a72fda7378ab7a6ddbc4cc1a0cc8a37af81cd75516858cd5a8f659e14b2528937c846252d44f379a08f7d041509b829c29857dce37f247d5bf810208cda144"; + sha512 = "4c9ef671abb97fb49e3ce5f0d0dcea9f268566e7cb9a1650bedf8bd42648d92f45a0d70f2d5433e58cbe6c8796e67a9e443ab711e42543a45551653747d8dee1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/nl/firefox-57.0b10.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0d826036fd6dd68b787b748e34e7bf304b4233fc5203bde7581b771725ac3144c6aaa2d50fe854d01999b44a5e064c63247ddd02dba351cc6c89fd4facf70720"; + sha512 = "b51c079046412cdab0ada80205ceffa55c3b9e20f65f8378216b78797137b39fcc3ff9f6bdd15513de97f3d07c59afd1d803304e265f4f38e4118dbcaa20f422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/nn-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/nn-NO/firefox-57.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "606aff032cc8fcb7d1739e1d6adfe3d2b05f1a0de6b5613269c5a3c2410976542bf2faa9105f122abc5d8891aba51f69b2fcd4d8dbd88b43112e37bb532131b1"; + sha512 = "3336e336d5baee973887a11836f3253c80134fdbfa218a4cb8902bc7f1909bd40bed217818d2fb8f6bcca6274a67ddcdf6ee71926c36dbde7e5fbb76294c1bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/or/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/or/firefox-57.0b10.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "974eb2e7fd4ef1e93dd96a36199afa518a421fb3fbc59780bbd815014a84533cde3a76908af3f051f3be7eda8dbaf6041750faa44d264385f33169130b5a4174"; + sha512 = "44f8bf97e5e86e069a628cad3a3eacc98a9a9e271fd4732b313cfa60f8fd38f8f565fc476d6d18a2fde63f2a7298231613aa470db9426b65b9d2fe10af1c1121"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pa-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pa-IN/firefox-57.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d6136d9049d9d19025c7c47c9268f1a93a5ee96bfa993078b3488ad23a9e29fc00c9450ba97e25608b7ae27d84cc3b40dfe50016db83658be6bc300b3be7cf04"; + sha512 = "37ae29a99719c6ede4e813f6e1f3646e69876ec5462c513dbce7f8c2f07c779ab10edec532cc7cb4177e53db13712e87863bdc8108c6975f56d1ac2323e85e33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pl/firefox-57.0b10.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5aec655cce588bde2465b5d827a3d8966e588ca083bbbb452a2a6f3c3366478ae565a4f9162fd0d5045beed76f3aebfd3f44233e46275eb0a53e33efb079d1a1"; + sha512 = "848a83da8419827903cefbbbea9872fb8bb35f4baa484fdd596985afab9b18017e8ba465bb10c9090e82fe6d25fa839109302338bd51e93127620d8a178ef026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pt-BR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pt-BR/firefox-57.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "40663403f97dd5a89d1853c7cd5ac0f48c761c23c6823314cdb7e821f83e1ff48f7eb3cb123784d55b7771dcbc6a2c2c4ce3e691642d25685817eede03947bde"; + sha512 = "e3f17dff2ca325516e16a834fbf7a312dd5204a56762ae81c0aab154ec515075bcd9cd003771ea6b5addd5d063d4d2ae74116509d12fa6468bce49727ddbbfb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/pt-PT/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/pt-PT/firefox-57.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "46600e098ee503aaecf43e161a54ba0b60c79bbbd61de65f391937de3659af2520c013ad7360b9ab1e3aaada63ad371667bbb5633e46f8942410ecbb22cf4f66"; + sha512 = "40bba3f30c76964e1524f5740bc1bae353b6c3c3db1baa5b6031bc025280caa482f8e85e146bac1eab22fd95a2624d08101a2cb93c40aa57beb165aa448a721d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/rm/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/rm/firefox-57.0b10.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "23e08b80859f6482fd8fad3d2a43961fb12a44827b5fa149c006508d3778ca0a3e307522e777535ec693ef365b0e2957344ac26a18bf05381c69f9dca509a9f6"; + sha512 = "a72d7922cd2adfc9a08c997c29e03ad4135ecd5403ef044331e8e08032fc7d5fcba32d43745b2eda22a2ea062c6e9a470dbafbdb15831fa270220191bf07e2be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ro/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ro/firefox-57.0b10.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "54433c53212ad816d27fcc176f45242d275cca2e84fe68f985404471929c2907e95002a85f9c6141f8cf494bf6844940081e44e8046ede30ed6dee0b72a9eb68"; + sha512 = "5cc76ffa6e74ae54e1b49777e431c88d60df8d2e62cd7facc452ae4e186af66cd1c59720633f69f8340bca0900be2441aac0b10b58757d2835638ae554853a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ru/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ru/firefox-57.0b10.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ee04e06bcf36056a876e9c4eb2e1d130b6b882653aa7ff1a313e4a21054741a7fe46a8f74ef179abd52b03d02fb4af94e4b7cdbaa885a4c1f019636c2b4cc02f"; + sha512 = "4cedb1b7b31be69c2e47ac6ec5a5d8d46fbf052130e7a7b3f12b3439fae293498cee78d972c2eb3e3fcb97a080a70318cad43eec82c3a06d7ed4bd2362d9d38e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/si/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/si/firefox-57.0b10.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "0cb344cb274b27088af5d7ed41c76db40bec19c11abbbc421bf9efc7acd303156efdc5cdf8140bb022bd9607932fb636e678bdad16e8ea0b8f9a929be68ee081"; + sha512 = "46855faed2fe0c27f821e61aa58e418eb926deb48142b44e9cd529b5023e11d3d37fdfd6c52d3fb7ef93361eb71cc4776941f9459c03041bc806f37e75f9c7b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sk/firefox-57.0b10.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "23a5f4c49993cc8727583028b1bd982845482261b793d50b8ce8779d3a4351549eb046ca35cac2d7edb6f3b40deddf077f6964d3e4a56837649fe86670452988"; + sha512 = "784e6a4f0ebffda6d53f66d8294e5e044dbf74230738d260c685dbc1d0ce8ef594383f41a658b3144c1b5ab8217389377387e5f6bf4c5b13590e7284be0c96e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sl/firefox-57.0b10.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7052a71800b2a5a3f9ed89db3638f30207da4f55887f4ce65c722dc326ad42663051384f195611cab20f86855a5b2289bf9c5fe2fc3c78c740afdc5a435f4b3f"; + sha512 = "a9423053a6ae8443b1fbabbfbf6e1cfb04b2cb8bd7ec5d020fb54000547ffc9e58fbf977897a0ccae2f27170b9180446a1812c37b47b04cc5475a72d2e39eb27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/son/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/son/firefox-57.0b10.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "6eea9ccac2c6100d7d7c9f80af4cca596cc4e3a0f3128beb22c7414ce0ef8a8e9f5aeb9e22c9fc8cf30db93eebe065e80d835d2927325fdc7af9b359e7b55b89"; + sha512 = "ffb5061b2852c7e0ae89a4d251dbf681c45f7fc150d92e00a7fa9f358b2b7c63b7ee5963db473b53412aab5d50418e59ea666b1e0b423730522002aed39f1384"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sq/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sq/firefox-57.0b10.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "049cb4f60f812673bf912b7ac06e440e40bbcc90f42fbd3e12f5d7ac08bd5e4a4897a435a1481201762d9fd4b99db954e838385953d9f458b80f86ce66b02ff1"; + sha512 = "77a7f68fc2aa93bb95419a2a17a8b2b2f3deaeefe33e061eca09e2cb1f938a6639603eb9936c967fc8af01461ae485362b6bba2e8b34cae4d4c146b5adc372c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sr/firefox-57.0b10.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "fb7db4165ff21463fd798246f18f7b9337b167c67e54d521d3d7e5bb5433b5cfaeeddf57619cea4079e852573bf109c57554cf574615232de86cb5ca922263ad"; + sha512 = "28c5c3bc8d57fdb2c76ec1c40cbe2a96ac1e7bdc734b23410b16e0950a26d082372edaf29f784c4cb55db6f3f34bb2f96cfefd3ddef72b703d4cfa7c43d8782c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/sv-SE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/sv-SE/firefox-57.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c8dbf8652a5a4be2325ef28a43e5cb8b464fcd552d62ca5241b072b9450ceb54d70bf5ac30e1136d03dca58410107c7d70f11539a7b712e3e2cf0da43c33eb75"; + sha512 = "b4998b2f2ac1b77353bdd91d9b580d5ca9e2bda1d90fa0306493e31e57b16e4cc3f32e88e7ced1d6b3f486b256344ea689163c422ca3fede581b902e45b73cb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ta/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ta/firefox-57.0b10.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "66f1d6cd06e96d8835404446becc6f38516f43562d56a66991f1a73ff9915e0dff9ec31611e89c5596154a2c4b582d84bed30186691353ddaed914244575a27e"; + sha512 = "79a6f7cd615ac1a3cbc2989d8b59aa390bce485826b44338edad92f151f345f9a9e5a59a20e36215962010c36dab6ef0200880d6433dd00c2e301b9f63c6283a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/te/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/te/firefox-57.0b10.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "aebf87f18e27e8acaa0c8956e7f90bd88da408aa266aa96285ef0d3fd85d3f25751eeeaae58e86948d4ff8abf295babc23e3d3a021e50d7c1329b2712306f64e"; + sha512 = "057b4eb4109f9d73e401d06502028be4875684136edd3f0b474ccb4b95629ce0f1d84aab08abe1382b5bc241842eb2a5d540202def12c4ee9bcde6eb940bc9c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/th/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/th/firefox-57.0b10.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff444997ab3a90cd5c4afd83a95d25c0d4d04d9dc82451bb8d33209433287cc4c31dd9f7887635ef4553776fe1be7407bac4a1fe7e5603679d209afa6717e2b5"; + sha512 = "20bb176c481ef473787f6cbb848a5a7f3d0610d6e24ade116d60565f2afe632c71651378850d144b20a1884562f87792a5609bbdae03a9120830fcfe4aafe983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/tr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/tr/firefox-57.0b10.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "8d5c1cb8ec1123cbf79cf156b54c86c28101078bed678b41dc996f42cad0b9d1fbbd83b02970a90f265e3839c2aecc9641d7231375146917b671411b02c913ea"; + sha512 = "ed1b30e3264b75dad2b44be7021ca98f6212b7286d1bb35e72f8bbcc6d2a260ebaf1971c403994e91df3cdb21e82991cc13e60788ebfc729a6a9bc74a51313f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/uk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/uk/firefox-57.0b10.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "452eb08a1fbd0c27a382707c8417717c3728aadf5eec774fc3a020d46f4bc598ada9ace6ce49661f14398ae5b618491c070b52cd4d5fb3cd304ad2946a870757"; + sha512 = "26ca1bd905fd7c3a888dd8d094bfe5eb33056ed156857331b2b03de7474528ed2c05c0c75246c8e20f81ac9cb943ac2b67d0db671bb8589a584b29ea8d6a59de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/ur/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/ur/firefox-57.0b10.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "379362f6fa4162fbed19994490183200ad4af8603ae0f8809637953332b811cd754027636f9cb49b5e5b851057320b5f936d09d1193930c6b400098dbf5440f7"; + sha512 = "301a4658a3f5833afc05222667202cc4ad8314e4539a2cc138bfdde954842b8ccbc0c2ec12822a2715de5f4e2bbfb089b5e1b3fea3b74de04277be2937454839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/uz/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/uz/firefox-57.0b10.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ff457ccd5f435de9b03208a285d1c0e6ea942ff61592e26fa61e4946df1efec988f9f1d94091618c7b5d0b223c45ccf67773e4513445ee96bd1cf1e354034986"; + sha512 = "81f3851e88fcfd329b48ee44c812c72f58f6ebebc45f0aea2075d1138e27406eed4cf6ee4cfaaebceb812c9d6f5ecaf0196b32a8e06d2b5b10221ab271a8901c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/vi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/vi/firefox-57.0b10.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "848ec90aa86f0761587082720b607c4b3c463300dbe2b97d7a59eb4eecae3263016a3dbcae2e92baff971ab2c4180f6a68abad52f3f74f72c0dc99d9865a0e25"; + sha512 = "f8d0458f10009b623241b69084402ed0e52ee191c9076c659d341a5574cd52f0acf18eb9e89bcbe25ff398704354f19ae516bd6b0e068c6850e64ea5d44176d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/xh/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/xh/firefox-57.0b10.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "f0b0d4f81021010cefbb2734859eb771d0943d8bee301064d11e222c625bda65f12a322e066a363a1215514cf6ef7eb601bc22959a6e1fa9f29ef8da0c02bc89"; + sha512 = "8d0e01339e7f1ee17f932a0db799d4f8b05eb588513deef38624077da061d9240f28aab5b43bdb029081b7b2936a94bb4c519044f57e9058965cfb32b71bc44c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/zh-CN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/zh-CN/firefox-57.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0ca9911452654086037a09bb49aa7b5b200f42c40af7b94ecb55ba527518587cd5f345c88295cb43d9df8391a0f975cd35945416dd48057dbe8d4138cc3ef37e"; + sha512 = "1420ad33af75efd58c57e4376ea1d755945d2bba0cf65a6f8d33a3d22662418a76baf1911557886fe85e4263ae2212ad0587eb9ea9ea5fee19d6d24ad7833680"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b6/linux-i686/zh-TW/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b10/linux-i686/zh-TW/firefox-57.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c643582dbc92145a9ade0d8763c8f30e1fc0fe3b9cb55dc6e1b88dae3001a3dc4b05eeabbe9b0fc040fd37f30f2d8cb07dbb7fa801d55a8e273bbd61eab69261"; + sha512 = "a42937bbd8fee40d58752c8347d5138181da11342fa533e6941b39302547e828c84242d8c953cb101acadada555ffd14ffe4c17d97ae22fe062fcead384df57b"; } ]; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index f26e815764f7..5034053a7342 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "27.0.0.159"; + version = "27.0.0.170"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0fgz1aszihjrxpzyrs29wr11imfgnyfb2ca9c1i3n6k9wpwv926p" + "018dx7vpl8ha5c7wlcvh422ll5f0zb9cb77cmylbai84dwb9wrvg" else - "052dx764b6cfbc7mkxckcr3hbwd5b7l98cp3jqmddkllv4w4h6dp" + "09qd15khv914xcr9c4vy770mm33bl6szfy334ddb5gv6dh6h2gd8" else if arch == "x86_64" then - "1p136zn059hp59j0llk7rfsybjx51qjz2h5sd4xl8zqbs0szynid" + "0hyc25ygxrp8k0w1xmg5wx1d2l959glc23bjswf30agwlpyn2rwn" else - "06l8rjnhpqip6ikc97rf3zsgmy381q4wgzyl9rsjwlvhpgqdlhrl"; + "1jsq8lgs4jvplwkkb2pngnr7vq9xv9knajk2247qpraq51fq2vd0"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 4d52047f16cb..9d64827df4a9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "27.0.0.159"; + version = "27.0.0.170"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0h9jpkdkf4kvr2sg61r6pkwcdyf4z3qdj0nlnm27whac9w56jjpj" + "1mz1sxg9wvkgpcwmvbgn1s8x01lx9vkm7wbldfn66j230yrx2mlh" else - "013a0ar5afm62bk7f4s89235bx36n75z65b3afv941jajijiacc9"; + "1ysdl7j7d9fqy509wz0gq2sray08j1v3bv9zwd6nzplgd60qdrva"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index a94b0973949f..da3c826adcd7 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,12 +29,12 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "1.0.1"; + version = "1.0.2"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1gphn8a0xfy5iqiznvgd6fbbzp7r5sp697ayfwnvllvmbr5az9vs"; + sha256 = "093nmvl9x3ykrpmvnmx98g9npg4wmq0mmf7qzgbzmg93dnyq2cpk"; }; # Needs tox 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 c9c67c015992..56cab9de5d07 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.6"; + version = "7.0.7"; lang = "en-US"; @@ -108,7 +108,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 = "11z3r0577p78ifi9lk4lrh9wb46k77wy77g5p9l8il02760bgq6m"; + sha256 = "1848j28majbb61r080g6dw0lmh7hbp515iidyjdrpgcwhazzg06j"; }; "i686-linux" = fetchurl { @@ -116,7 +116,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 = "1r8v5w66clmm76kzpkf0f5jcxs76whb5xrl20rkirp79fybqn4hx"; + sha256 = "08wvpymmyg16ifz23awnjy0pbva8xh1fdx2i8c1n18x3k12d5r7h"; }; }; in @@ -246,6 +246,11 @@ stdenv.mkDerivation rec { # having to synchronize between local state and store. mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js + # Preload extensions by moving into the runtime instead of storing under the + # user's profile directory. + mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \ + "$TBB_IN_STORE/browser/extensions" + # Hard-code paths to geoip data files. TBB resolves the geoip files # relative to torrc-defaults_path but if we do not hard-code them # here, these paths end up being written to the torrc in the user's @@ -301,10 +306,6 @@ stdenv.mkDerivation rec { # easily generated by firefox at startup. rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json} - # Ensure that we're always using the up-to-date extensions. - ln -snf "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions" \ - "\$HOME/TorBrowser/Data/Browser/profile.default/extensions" - ${optionalString pulseaudioSupport '' # Figure out some envvars for pulseaudio : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index 53c278bc0650..86c2f53b9add 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -16,14 +16,14 @@ { https-everywhere = stdenv.mkDerivation rec { name = "https-everywhere-${version}"; - version = "2017.9.12"; + version = "2017.10.4"; extid = "https-everywhere-eff@eff.org"; src = fetchgit { url = "https://git.torproject.org/https-everywhere.git"; rev = "refs/tags/${version}"; - sha256 = "179429pngyksp9xkr86nf2m5q6zmg19c7ng1dhqjfb1vsncwgw66"; + sha256 = "1g7971xygnhagnb25xjdf6mli6091ai9igx42d0ww88g8i0cqfzj"; fetchSubmodules = true; # for translations, TODO: remove }; @@ -47,13 +47,13 @@ noscript = stdenv.mkDerivation rec { name = "noscript-${version}"; - version = "5.0.10"; + version = "5.1.2"; extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; src = fetchurl { url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi"; - sha256 = "18k5karbaj5mhd9cyjbqgik6044bw88rjalkh6anjanxbn503j6g"; + sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42"; }; unpackPhase = ":"; @@ -88,14 +88,14 @@ tor-launcher = stdenv.mkDerivation rec { name = "tor-launcher-${version}"; - version = "0.2.12.3"; + version = "0.2.13"; extid = "tor-launcher@torproject.org"; src = fetchgit { url = "https://git.torproject.org/tor-launcher.git"; rev = "refs/tags/${version}"; - sha256 = "0126x48pjiy2zm4l8jzhk70w24hviaz560ffp4lb9x0ar615bc9q"; + sha256 = "1f98v88y2clwvjiw77kxqc9cacp5h0489a540nc2wmsx7vnskrq0"; }; nativeBuildInputs = [ zip ]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index cff68c5227ae..e8686ade5900 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1xfvfdn04wn7ldmr5ypnyi99gsrgz1w8l02jnvyalpdnjbj73b89"; + sha256 = "0lxagvv8mysw6n0vp5vsccl87b628dgsjrf298dx2dqx7wn7zjgi"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 0f1928fff2b2..cf41ca1b0b3b 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "firehol-${version}"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "firehol"; repo = "firehol"; rev = "v${version}"; - sha256 = "121kjq5149r11k58lr9mkqns2k8jbdbjg2k93v8v7axhng6js7s9"; + sha256 = "15cy1zxfpprma2zkmhj61zzhmw1pfnyhln7pca5lzvr1ifn2d0y0"; }; patches = [ diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix index d1f3ad696879..bb245928f07c 100644 --- a/pkgs/applications/networking/firehol/iprange.nix +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iprange-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "https://github.com/firehol/iprange/releases/download/v${version}/iprange-${version}.tar.xz"; - sha256 = "0lwgl5ybrhsv43llq3kgdjpvgyfl43f3nxm0g8a8cd7zmn754bg2"; + sha256 = "0rymw4ydn09dng34q4g5111706fyppzs2gd5br76frgvfj4x2f71"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 5aa1649ff5f8..bee3062a5a22 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.0.3"; - previewVersion = "2.1.0rc2"; + previewVersion = "2.1.0rc3"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -16,7 +16,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "1frfhys5s5lnqzk216y3wj2pli5g3b5imfzcmddxdcibksx13i17"; + sha256Hash = "0yc5lr01xb7lk4dsrwx79mimbr91vldpvqbrx37j3kym6p5m84cn"; }; serverStable = mkServer { @@ -25,6 +25,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "0vm4hir8yqj7xhykgg3x5rv1nj1qq6sg19sjj7r5w60brrlsw7v9"; + sha256Hash = "1lac88d9cmlhrwmlvxv1sk86600rwznw3lpsm440bax6qbdfcis3"; }; } diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index f3962811a8ac..7ae3e8c73611 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -2,11 +2,11 @@ , geoip, gperftools, python, swig }: stdenv.mkDerivation rec { - name = "bro-2.5.1"; + name = "bro-2.5.2"; src = fetchurl { url = "http://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "04cmm0vs8q31mgaq3pxybjk834py3ji16qp4qcir7vjbhq1fav1c"; + sha256 = "0w5rynw278nl6pdl5s7gsmxjwkl6z1g5pcm6byg930k26yyb35db"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index a2ad7e4d7b2f..75c4f9ac5c93 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.5"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "1a7f9g3hlccqlf9xj1csbxw4wgl6jfywg2xvkir6ww5viagkbzs8"; + sha256 = "1lasb8flic4qc1sd3pvfg9aig5skcxlyx6iy9bk73147r8vzaq75"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 6b765a0c9f16..4c1ddcef5cc8 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, ncurses, gtk2, pkgconfig, autoconf, automake, perl, halibut, libtool }: +{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool +, gtk2, halibut, ncurses, perl }: stdenv.mkDerivation rec { - version = "0.67"; + version = "0.70"; name = "putty-${version}"; src = fetchurl { - url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz"; - sha256 = "0isak6dy5vmfzf9ckcq6jvhgrn3xfmfcmziaa7g2jqm4x1c286c0"; + urls = [ + "https://the.earth.li/~sgtatham/putty/${version}/${name}.tar.gz" + "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${name}.tar.gz" + ]; + sha256 = "1gmhwwj1y7b5hgkrkxpf4jddjpk9l5832zq5ibhsiicndsfs92mv"; }; preConfigure = '' @@ -19,8 +23,9 @@ stdenv.mkDerivation rec { cd unix ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 ncurses autoconf automake perl halibut libtool ]; + nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; + buildInputs = [ gtk2 ncurses ]; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A Free Telnet/SSH Client"; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 65a7c9730e9a..1d90e8be282a 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor_icon_theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.1.5"; + name = "homebank-5.1.6"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "03rkl4bvi1cmb8rqyvmhxhg63bdmb3nzqa3firfimsbphm3x6gsw"; + sha256 = "1q4h890g6a6pm6kfiavbq9sbpsnap0f854sja2y5q3x0j0ay2q98"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 18c4514c4de1..48b278cc1dfb 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python2Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.67-rc2"; + version = "0.67"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "0l4q2dfnvyn0jr1lggf8g7515q4z7qr1lnmy0lsyhjf477ldszqf"; + sha256 = "1gdbzy9qyzj3rn9fsl0ss7lbk9kyka99656bphx2dah694yyyz5k"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix new file mode 100644 index 000000000000..05a85cafedf1 --- /dev/null +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, zlib, tbb }: + +stdenv.mkDerivation rec { + pname = "bowtie2"; + version = "2.3.3.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "BenLangmead"; + repo = pname; + rev = "v${version}"; + sha256 = "1pcyks76bnnkq6h0gqjw4fkdddjjnw7k5ibim7ajkbvfw58a99y0"; + }; + + buildInputs = [ zlib tbb ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; + license = licenses.gpl3; + homepage = http://bowtie-bio.sf.net/bowtie2; + maintainers = with maintainers; [ rybern ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 62d920d929ac..e866b947fbc2 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,12 @@ {stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: + stdenv.mkDerivation rec { - name = "gtkwave-3.3.70"; + name = "gtkwave-${version}"; + version = "3.3.86"; src = fetchurl { - url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz"; + url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; + sha256 = "1l1hikhhk7drkbpdmj9qg7c3lj1b86z7f5rnwagrql8bss2j80fx"; }; nativeBuildInputs = [ pkgconfig ]; @@ -13,10 +15,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; meta = { - description = "Wave viewer for Unix and Win32"; - homepage = http://gtkwave.sourceforge.net; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + description = "VCD/Waveform viewer for Unix and Win32"; + homepage = http://gtkwave.sourceforge.net; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice viric ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index cb28d38bf1d0..8dc3e3ce43dc 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -22,22 +22,23 @@ assert pythonSupport -> (python != null && numpy != null); stdenv.mkDerivation rec { name = "caffe-${version}"; - version = "1.0-rc5"; + version = "1.0"; src = fetchFromGitHub { owner = "BVLC"; repo = "caffe"; - rev = "rc5"; - sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c"; + rev = version; + sha256 = "104jp3cm823i3cdph7hgsnj6l77ygbwsy35mdmzhmsi4jxprd9j3"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake doxygen ]; - cmakeFlags = [ "-DCUDA_ARCH_NAME=All" ] - ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON" - ++ lib.optional (!pythonSupport) "-DBUILD_python=OFF"; + cmakeFlags = [ + "-DCUDA_ARCH_NAME=All" + (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") + ] ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"; buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ] ++ lib.optional cudaSupport cudatoolkit @@ -49,6 +50,16 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out"]; propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle + preConfigure = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") '' + # CUDA 9.0 doesn't support sm_20 + sed -i 's,20 21(20) ,,' cmake/Cuda.cmake + '' + lib.optionalString (python.isPy3 or false) '' + sed -i \ + -e 's,"python-py''${boost_py_version}",python3,g' \ + -e 's,''${Boost_PYTHON-PY''${boost_py_version}_FOUND},''${Boost_PYTHON3_FOUND},g' \ + cmake/Dependencies.cmake + ''; + postInstall = '' # Internal static library. rm $out/lib/libproto.a diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix new file mode 100644 index 000000000000..89ed0582b37e --- /dev/null +++ b/pkgs/applications/science/math/cntk/default.nix @@ -0,0 +1,99 @@ +{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake +, openblas, opencv3, libzip, boost, protobuf, openmpi +, onebitSGDSupport ? false +, cudaSupport ? false, cudatoolkit, nvidia_x11 +, cudnnSupport ? false, cudnn +}: + +assert cudnnSupport -> cudaSupport; + +let + # Old specific version required for CNTK. + cub = fetchFromGitHub { + owner = "NVlabs"; + repo = "cub"; + rev = "1.4.1"; + sha256 = "1lcdwblz03c0yq1lxndg566kg14b5qm14x5qixjbmz6wq85kgmqc"; + }; + +in stdenv.mkDerivation rec { + name = "CNTK-${version}"; + version = "2.2"; + + # Submodules + src = fetchgit { + url = "https://github.com/Microsoft/CNTK"; + rev = "v${version}"; + sha256 = "0q4knrwiyphb2fbqf9jzqvkz2jzj6jmbmang3lavdvsh7z0n8zz9"; + }; + + patches = [ + # Fix "'exp' was not declared" + (fetchpatch { + url = "https://github.com/imriss/CNTK/commit/ef1cca6df95cc507deb8471df2c0dd8cbfeef23b.patch"; + sha256 = "0z7xyrxwric0c4h7rfs05f544mcq6d10wgs0vvfcyd2pcf410hy7"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ] + ++ lib.optional cudaSupport cudatoolkit + ++ lib.optional cudnnSupport cudnn; + + configureFlags = [ + "--with-opencv=${opencv3}" + "--with-libzip=${libzip.dev}" + "--with-openblas=${openblas}" + "--with-boost=${boost.dev}" + "--with-protobuf=${protobuf}" + "--with-mpi=${openmpi}" + ] ++ lib.optionals cudaSupport [ + "--cuda=yes" + "--with-cuda=${cudatoolkit}" + "--with-gdk-include=${cudatoolkit}/include" + "--with-gdk-nvml-lib=${nvidia_x11}/lib" + "--with-cub=${cub}" + ] ++ lib.optional onebitSGDSupport "--1bitsgd=yes"; + + configurePhase = '' + sed -i \ + -e 's,^GIT_STATUS=.*,GIT_STATUS=,' \ + -e 's,^GIT_COMMIT=.*,GIT_COMMIT=v${version},' \ + -e 's,^GIT_BRANCH=.*,GIT_BRANCH=v${version},' \ + -e 's,^BUILDER=.*,BUILDER=nixbld,' \ + -e 's,^BUILDMACHINE=.*,BUILDMACHINE=machine,' \ + -e 's,^BUILDPATH=.*,BUILDPATH=/homeless-shelter,' \ + -e '/git does not exist/d' \ + Tools/generate_build_info + + patchShebangs . + mkdir build + cd build + ${lib.optionalString cudnnSupport '' + mkdir cuda + ln -s ${cudnn}/include cuda + export configureFlags="$configureFlags --with-cudnn=$PWD" + ''} + ../configure $configureFlags + ''; + + installPhase = '' + mkdir -p $out/bin + # Moving to make patchelf remove references later. + mv lib $out + cp bin/cntk $out/bin + ''; + + hardeningDisable = [ "format" ]; + + # on 2.2: fatal error: tensorboard/tensorboard.pb.h: No such file or directory + enableParallelBuilding = false; + + meta = with lib; { + homepage = "https://github.com/Microsoft/CNTK"; + description = "An open source deep-learning toolkit"; + license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch deleted file mode 100644 index a396a848f142..000000000000 --- a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx -index d71cb74..076facb 100644 ---- a/core/metacling/src/TCling.cxx -+++ b/core/metacling/src/TCling.cxx -@@ -756,7 +756,7 @@ int TCling_GenerateDictionary(const std::vector<std::string> &classes, - gSystem->PrependPathName(dirbase, header); - dir = gSystem->DirName(dir); - } -- fileContent += TString("#include \"") + header + "\"\n"; -+ fileContent += (TString("#include \"") + header + "\"\n").Data(); - } - } - for (it = fwdDecls.begin(); it != fwdDecls.end(); ++it) { -@@ -1061,7 +1061,7 @@ TCling::TCling(const char *name, const char *title) - ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage); - - // Add -I early so ASTReader can find the headers. -- std::string interpInclude(TROOT::GetEtcDir()); -+ std::string interpInclude(TROOT::GetEtcDir().Data()); - clingArgsStorage.push_back("-I" + interpInclude); - - // Add include path to etc/cling. FIXME: This is a short term solution. The -@@ -1070,7 +1070,7 @@ TCling::TCling(const char *name, const char *title) - clingArgsStorage.push_back("-I" + interpInclude + "/cling"); - - // Add the root include directory and etc/ to list searched by default. -- clingArgsStorage.push_back(std::string("-I" + TROOT::GetIncludeDir())); -+ clingArgsStorage.push_back(std::string(("-I" + TROOT::GetIncludeDir()).Data())); - - // Add the current path to the include path - // TCling::AddIncludePath("."); -diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx -index abf3929..e7dad98 100644 ---- a/hist/hist/src/TFormula.cxx -+++ b/hist/hist/src/TFormula.cxx -@@ -1677,7 +1677,7 @@ void TFormula::ProcessFormula(TString &formula) - if(fun.fName.Contains("::")) // add support for nested namespaces - { - // look for last occurence of "::" -- std::string name(fun.fName); -+ std::string name(fun.fName.Data()); - size_t index = name.rfind("::"); - assert(index != std::string::npos); - TString className = fun.fName(0,fun.fName(0,index).Length()); -@@ -1869,7 +1869,7 @@ void TFormula::ProcessFormula(TString &formula) - - // save copy of inputFormula in a std::strig for the unordered map - // and also formula is same as FClingInput typically and it will be modified -- std::string inputFormula = std::string(formula); -+ std::string inputFormula = std::string(formula.Data()); - - - // valid input formula - try to put into Cling -diff --git a/main/src/nbmain.cxx b/main/src/nbmain.cxx -index 55d4f2f..8490149 100644 ---- a/main/src/nbmain.cxx -+++ b/main/src/nbmain.cxx -@@ -173,9 +173,9 @@ static bool CreateStamp(string dest) - - int main() - { -- string rootbin(TROOT::GetBinDir()); -- string rootlib(TROOT::GetLibDir()); -- string rootetc(TROOT::GetEtcDir()); -+ string rootbin(TROOT::GetBinDir().Data()); -+ string rootlib(TROOT::GetLibDir().Data()); -+ string rootetc(TROOT::GetEtcDir().Data()); - - // If needed, install ROOT notebook files in the user's home directory - #ifdef WIN32 -diff --git a/math/minuit/src/TMinuitMinimizer.cxx b/math/minuit/src/TMinuitMinimizer.cxx -index 4e2082a..18215c0 100644 ---- a/math/minuit/src/TMinuitMinimizer.cxx -+++ b/math/minuit/src/TMinuitMinimizer.cxx -@@ -454,7 +454,7 @@ std::string TMinuitMinimizer::VariableName(unsigned int ivar) const { - // return the variable name - if (!CheckMinuitInstance()) return std::string(); - if (!CheckVarIndex(ivar)) return std::string(); -- return std::string(fMinuit->fCpnam[ivar]); -+ return std::string(fMinuit->fCpnam[ivar].Data()); - } - - int TMinuitMinimizer::VariableIndex(const std::string & ) const { -diff --git a/tmva/tmva/src/Factory.cxx b/tmva/tmva/src/Factory.cxx -index 36060ef..a1bbe34 100644 ---- a/tmva/tmva/src/Factory.cxx -+++ b/tmva/tmva/src/Factory.cxx -@@ -390,7 +390,7 @@ TMVA::MethodBase* TMVA::Factory::BookMethod( TMVA::DataLoader *loader, TString t - // initialize methods - IMethod* im; - if (!boostNum) { -- im = ClassifierFactory::Instance().Create( std::string(theMethodName), -+ im = ClassifierFactory::Instance().Create( std::string(theMethodName.Data()), - fJobName, - methodTitle, - loader->DefaultDataSetInfo(), -@@ -933,7 +933,7 @@ void TMVA::Factory::TrainAllMethods() - - // recreate - m = dynamic_cast<MethodBase*>( ClassifierFactory::Instance() -- .Create( std::string(Types::Instance().GetMethodName(methodType)), -+ .Create( std::string(Types::Instance().GetMethodName(methodType).Data()), - dataSetInfo, weightfile ) ); - if( m->GetMethodType() == Types::kCategory ){ - MethodCategory *methCat = (dynamic_cast<MethodCategory*>(m)); -diff --git a/tmva/tmva/src/MethodBoost.cxx b/tmva/tmva/src/MethodBoost.cxx -index 1349e5d..2125ab3 100644 ---- a/tmva/tmva/src/MethodBoost.cxx -+++ b/tmva/tmva/src/MethodBoost.cxx -@@ -389,7 +389,7 @@ void TMVA::MethodBoost::Train() - // the first classifier shows the option string output, the rest not - if (fCurrentMethodIdx>0) TMVA::MsgLogger::InhibitOutput(); - -- IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName), -+ IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName.Data()), - GetJobName(), - Form("%s_B%04i", fBoostedMethodTitle.Data(),fCurrentMethodIdx), - DataInfo(), -diff --git a/tmva/tmva/src/MethodCategory.cxx b/tmva/tmva/src/MethodCategory.cxx -index c2cbe80..d278cca 100644 ---- a/tmva/tmva/src/MethodCategory.cxx -+++ b/tmva/tmva/src/MethodCategory.cxx -@@ -147,7 +147,7 @@ TMVA::IMethod* TMVA::MethodCategory::AddMethod( const TCut& theCut, - const TString& theTitle, - const TString& theOptions ) - { -- std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod)); -+ std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod).Data()); - - Log() << kINFO << "Adding sub-classifier: " << addedMethodName << "::" << theTitle << Endl; - -diff --git a/tmva/tmva/src/MethodCompositeBase.cxx b/tmva/tmva/src/MethodCompositeBase.cxx -index 98fa5da..96bd9a3 100644 ---- a/tmva/tmva/src/MethodCompositeBase.cxx -+++ b/tmva/tmva/src/MethodCompositeBase.cxx -@@ -194,7 +194,7 @@ void TMVA::MethodCompositeBase::ReadWeightsFromXML( void* wghtnode ) - ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodTypeName), methodName, optionString ); - } - fMethods.push_back(ClassifierFactory::Instance().Create( -- std::string(methodTypeName),jobName, methodName,DataInfo(),optionString)); -+ std::string(methodTypeName.Data()),jobName, methodName,DataInfo(),optionString)); - - fMethodWeight.push_back(methodWeight); - MethodBase* meth = dynamic_cast<MethodBase*>(fMethods.back()); -@@ -259,7 +259,7 @@ void TMVA::MethodCompositeBase::ReadWeightsFromStream( std::istream& istr ) - ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodName), methodTitle, optionString ); - } - else methodTitle=Form("%s (%04i)",GetMethodName().Data(),fCurrentMethodIdx); -- fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName), jobName, -+ fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName.Data()), jobName, - methodTitle,DataInfo(), optionString) ); - fMethodWeight.push_back( methodWeight ); - if(MethodBase* m = dynamic_cast<MethodBase*>(fMethods.back()) ) -diff --git a/tmva/tmva/src/Reader.cxx b/tmva/tmva/src/Reader.cxx -index 94a8b28..0b67867 100644 ---- a/tmva/tmva/src/Reader.cxx -+++ b/tmva/tmva/src/Reader.cxx -@@ -401,7 +401,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( const TString& methodTag, const TString& w - - TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const TString& weightfile ) - { -- IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )), -+ IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()), - DataInfo(), weightfile ); - - MethodBase *method = (dynamic_cast<MethodBase*>(im)); -@@ -440,7 +440,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const char* - #if ROOT_VERSION_CODE >= ROOT_VERSION(5,26,00) - - // books MVA method from weightfile -- IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )), -+ IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()), - DataInfo(), "" ); - - MethodBase *method = (dynamic_cast<MethodBase*>(im)); diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index ac04321ae0c4..676395d03d53 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,30 +1,24 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lzma, gsl +, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lz4, lzma, gsl, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.10.04"; + version = "6.10.08"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0nwg4bw02v6vahm2rwfaj7fzp3ffhjg5jk7h20il4246swhxw6s6"; + sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl ] + buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; patches = [ ./sw_vers.patch - - # this prevents thisroot.sh from setting $p, which interferes with stdenv setup - ./thisroot.patch - - # https://sft.its.cern.ch/jira/browse/ROOT-8728 - ./ROOT-8728-extra.patch ]; preConfigure = '' diff --git a/pkgs/applications/science/misc/root/thisroot.patch b/pkgs/applications/science/misc/root/thisroot.patch deleted file mode 100644 index 57cd5838e64a..000000000000 --- a/pkgs/applications/science/misc/root/thisroot.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/config/thisroot.sh b/config/thisroot.sh -index 85dee20..532cb28 100644 ---- a/config/thisroot.sh -+++ b/config/thisroot.sh -@@ -15,8 +15,8 @@ drop_from_path() - return 1 - fi - -- p=$1 -- drop=$2 -+ local p=$1 -+ local drop=$2 - - newpath=`echo $p | sed -e "s;:${drop}:;:;g" \ - -e "s;:${drop};;g" \ diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index f8ac8c385e60..abd9013b6b03 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "git-extras-${version}"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0pr2vf5rajkwjm45zvnwkc13kvk3kyr18axxvmm8drsqdkr8lrjk"; + sha256 = "0vb8syyr5nbvmkj5g4rb1p8rqxb2hyl25gbyf4rd0b972d7iihhn"; }; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; - makeFlags = "DESTDIR=$(out) PREFIX="; + installFlags = [ "DESTDIR=$(out) PREFIX=" ]; meta = with stdenv.lib; { homepage = https://github.com/tj/git-extras; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 0463081fa4bc..5c2e99d8e3fe 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.3.3"; - rev = "c9d3beb098254f067680a5ccbb8742387f81d82e"; + version = "2.3.4"; goPackagePath = "github.com/git-lfs/git-lfs"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1hzpzbm46f45vh5liijpyppfcmr7wycnsa09vmilq0wm341ivnsf"; + sha256 = "0fv1ly9577jrjwx91jqfql740rwp06chl4y37pcpl72nc08jvcw7"; }; preBuild = '' diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix new file mode 100644 index 000000000000..734b9d3629c2 --- /dev/null +++ b/pkgs/applications/version-management/gitea/default.nix @@ -0,0 +1,50 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper +, git, coreutils, bash, gzip, openssh +, sqliteSupport ? true +}: + +with stdenv.lib; + +buildGoPackage rec { + name = "gitea-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "go-gitea"; + repo = "gitea"; + rev = "v${version}"; + sha256 = "15zw4b6hnx4hmzn2xlsi4p7jvh6jx4g4smbdidnrzrykzyq4rmpp"; + }; + + patches = [ ./static-root-path.patch ]; + + postPatch = '' + patchShebangs . + substituteInPlace modules/setting/setting.go --subst-var data + ''; + + nativeBuildInputs = [ makeWrapper ]; + + buildFlags = optionalString sqliteSupport "-tags sqlite"; + + outputs = [ "bin" "out" "data" ]; + + postInstall = '' + mkdir $data + cp -R $src/{public,templates} $data + mkdir -p $out + cp -R $src/options/locale $out/locale + + wrapProgram $bin/bin/gitea \ + --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} + ''; + + goPackagePath = "code.gitea.io/gitea"; + + meta = { + description = "Git with a cup of tea"; + homepage = http://gitea.io; + license = licenses.mit; + maintainers = [ maintainers.disassembler ]; + }; +} diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch new file mode 100644 index 000000000000..06ce521e9e8d --- /dev/null +++ b/pkgs/applications/version-management/gitea/static-root-path.patch @@ -0,0 +1,13 @@ +diff --git i/modules/setting/setting.go w/modules/setting/setting.go +index aafe2d1b..1e4a8064 100644 +--- i/modules/setting/setting.go ++++ w/modules/setting/setting.go +@@ -683,7 +683,7 @@ func NewContext() { + LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL) + OfflineMode = sec.Key("OFFLINE_MODE").MustBool() + DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() +- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) ++ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") + AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") + EnableGzip = sec.Key("ENABLE_GZIP").MustBool() + EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index d4cf4b6c4200..ae7625d1972a 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.10.6"; + ver = "1.10.7"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "99d68e4e0166c9a4e2dce6638e19cbe312b5981f6e1811ed0987578ceefac3e3"; + sha256 = "2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235"; + sha256 = "be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index aacfa9d8874a..680cad1ec252 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -108,6 +108,7 @@ in stdenv.mkDerivation rec { (enableFeature dvdnavSupport "dvdnav") (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") + (enableFeature stdenv.isLinux "dvbin") ]; configurePhase = '' diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 49920e28f766..48bb512e1341 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -46,10 +46,10 @@ rec { }; # This should go into the containerd derivation once 1.0.0 is out - preBuild = (optionalString (version == "17.09.0-ce") '' + preBuild = '' mkdir $(pwd)/vendor/src mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ - '') + oldAttrs.preBuild; + '' + oldAttrs.preBuild; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { name = "docker-init"; @@ -122,7 +122,13 @@ rec { installPhase = '' install -Dm755 ./components/cli/docker $out/libexec/docker/docker - install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + + if [ -d "./components/engine/bundles/${version}" ]; then + install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + else + install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + fi + makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ @@ -175,7 +181,7 @@ rec { homepage = https://www.docker.com/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook vdemeester ]; + maintainers = with maintainers; [ nequissimus offline tailhook vdemeester ]; platforms = platforms.linux; }; }; @@ -183,18 +189,6 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits - docker_17_06 = dockerGen rec { - version = "17.06.2-ce"; - rev = "cec0b72a9940e047e945a09e1febd781e88366d6"; # git commit - sha256 = "1scqx28vzh72ziq00lbx92vsb896mj974j8f0zg11y6qc5n5jx3l"; - runcRev = "810190ceaa507aa2727d7ae6f4790c76ec150bd2"; - runcSha256 = "0f1x1z262qg579qb1w21axj3mibq4fbff3gamliw49sdqqnb7vk3"; - containerdRev = "6e23458c129b551d5c9871e5174f6b1b7f6d1170"; - containerdSha256 = "12kzc5z1nhxdbizzr494ywilbs6rdv39v5ql7lmfzwh350gwlg93"; - tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; - tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; - }; - docker_17_09 = dockerGen rec { version = "17.09.0-ce"; rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit @@ -206,4 +200,16 @@ rec { tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; + + docker_17_10 = dockerGen rec { + version = "17.10.0-ce"; + rev = "f4ffd2511ce93aa9e5eefdf0e912f77543080b0b"; # git commit + sha256 = "07x47cfdaz4lhlga1pchcbqqy0nd2q6zch0ycag18vzi99w4gmh2"; + runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d"; + runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0"; + containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; + containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; } diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index b790a15e607f..c62fa63ea594 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-2017-08-09"; - rev = "083cdeece0577635d523244dcf0da86074e23e4e"; + name = "lkl-2017-10-18"; + rev = "bfb315c4612c38427e3239d0a427a125d9ba0ede"; outputs = [ "dev" "lib" "out" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "1fyh0p54jgsqywswj40zbw64jbqx2w10wax1k3j2szzlhjrv9x1a"; + sha256 = "172ccn2gsybnji7giiqq63bvp9nsw8kri88pjlvinwpwsv7x81aa"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 5fe4fa823fea..614122a3b24e 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -1,4 +1,5 @@ { stdenv, callPackage, fetchurl, fetchpatch, fetchgit +, ocamlPackages_4_02 , withInternalQemu ? true , withInternalTraditionalQemu ? true , withInternalSeabios ? true @@ -414,4 +415,4 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; -})) args +})) ({ ocamlPackages = ocamlPackages_4_02; } // args) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 2c94f7f6fecc..8de87d2e8fd6 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -5,17 +5,15 @@ , libXdmcp }: -let - # TODO: Sway 0.14.0 with wlc 0.0.10 segfaults - version = "0.13.0"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "sway-${version}"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q"; + sha256 = "1l8v9cdzd44bm4q71d47vqg6933b8j42q1a61r362vz2la1rcpq2"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix index a5ccd23b9fc8..dcda746c8dd1 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-themes-standard-3.22.1"; + name = "gnome-themes-standard-3.22.3"; src = fetchurl { - url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.1.tar.xz; - sha256 = "90f6f4e79eaa42e424fa35144cdbcb5db93db56e73200ac045742ba320febb54"; + url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.3.tar.xz; + sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; }; } diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 2bb4b7deceff..a828ba0fe7bc 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -133,12 +133,12 @@ let plasma-integration = callPackage ./plasma-integration.nix {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-vault = callPackage ./plasma-vault {}; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; powerdevil = callPackage ./powerdevil.nix {}; sddm-kcm = callPackage ./sddm-kcm.nix {}; - startkde = callPackage ./startkde {}; systemsettings = callPackage ./systemsettings.nix {}; }; in diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 7513c83c107c..f4d396047261 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.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 6bcafc5813a9..63219d8cbe1a 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, - qtsvg, qtx11extras, + qtsvg, qtx11extras, kactivities }: mkDerivation { @@ -9,6 +9,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg - qtx11extras + qtx11extras kactivities ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch b/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch deleted file mode 100644 index d5ac4b250875..000000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/keyboard/xkb_helper.cpp -+++ plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp -@@ -185,21 +185,5 @@ bool XkbHelper::initializeKeyboardLayout - - bool XkbHelper::preInitialize() - { -- // stop ibus so it does not mess with our layouts, we can remove this when we integrate IM into keyboard module -- -- QString ibusExe = QStandardPaths::findExecutable(QStringLiteral("ibus")); -- if( ibusExe.isEmpty() ) { -- return 0; -- } -- -- KProcess ibusProcess; -- ibusProcess << ibusExe << QStringLiteral("exit"); -- ibusProcess.setOutputChannelMode(KProcess::SeparateChannels); -- int res = ibusProcess.execute(); -- -- if( res == 0 ) { -- qCWarning(KCM_KEYBOARD) << "ibus successfully stopped"; -- } -- - return 0; - } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch index def5b577b972..d3f5166d5ed9 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch +++ b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch @@ -1,27 +1,14 @@ -Index: plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml -=================================================================== ---- plasma-desktop-5.8.5.orig/applets/pager/package/contents/ui/main.qml -+++ plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as - import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents - import org.kde.draganddrop 2.0 - import org.kde.plasma.private.pager 2.0 --import "utils.js" as Utils -+import "../code/utils.js" as Utils - - MouseArea { - id: root Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml =================================================================== --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml @@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas import org.kde.kquickcontrolsaddons 2.0 - + import org.kde.private.desktopcontainment.folder 0.1 as Folder -import "FolderTools.js" as FolderTools +import "../code/FolderTools.js" as FolderTools - + Item { id: main Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml @@ -29,14 +16,14 @@ Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml @@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 - + import org.kde.private.desktopcontainment.desktop 0.1 as Desktop - + -import "LayoutManager.js" as LayoutManager -import "FolderTools.js" as FolderTools +import "../code/LayoutManager.js" as LayoutManager +import "../code/FolderTools.js" as FolderTools - + DragDrop.DropArea { id: root Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml @@ -46,9 +33,9 @@ Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml @@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as import org.kde.kquickcontrolsaddons 2.0 import org.kde.draganddrop 2.0 as DragDrop - + -import "LayoutManager.js" as LayoutManager +import "../code/LayoutManager.js" as LayoutManager - + DragDrop.DropArea { id: root diff --git a/pkgs/desktops/plasma-5/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series index 36778cd1c560..6334deb7d973 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/series +++ b/pkgs/desktops/plasma-5/plasma-desktop/series @@ -1,4 +1,3 @@ qml-import-paths.patch hwclock-path.patch tzdir.patch -ibus.patch diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix index de46bb4373c6..f69644287624 100644 --- a/pkgs/desktops/plasma-5/plasma-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-integration.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, - kwayland, libXcursor + kwayland, libXcursor, qtquickcontrols2 }: # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration @@ -12,6 +12,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland - libXcursor + libXcursor qtquickcontrols2 ]; } diff --git a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch new file mode 100644 index 000000000000..b3f19c4e0025 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch @@ -0,0 +1,17 @@ +diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp +index f6ef54f..160034a 100644 +--- a/kded/engine/backends/cryfs/cryfsbackend.cpp ++++ b/kded/engine/backends/cryfs/cryfsbackend.cpp +@@ -136,11 +136,10 @@ bool CryFsBackend::isInitialized(const Device &device) const + + QProcess *CryFsBackend::cryfs(const QStringList &arguments) const + { +- return process("cryfs", ++ return process(NIXPKGS_CRYFS, + arguments, + { { "CRYFS_FRONTEND", "noninteractive" } }); + } + + + } // namespace PlasmaVault +- diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix new file mode 100644 index 000000000000..203ff50d7357 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -0,0 +1,38 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + + kactivities, + plasma-framework, + kwindowsystem, + libksysguard, + + encfs, + cryfs, + fuse +}: + +mkDerivation { + name = "plasma-vault"; + nativeBuildInputs = [ extra-cmake-modules ]; + + patches = [ + ./encfs-path.patch + ./cryfs-path.patch + ./fusermount-path.patch + ]; + + buildInputs = [ + kactivities plasma-framework kwindowsystem libksysguard + ]; + + NIX_CFLAGS_COMPILE = [ + ''-DNIXPKGS_ENCFS="${lib.getBin encfs}/bin/encfs"'' + ''-DNIXPKGS_ENCFSCTL="${lib.getBin encfs}/bin/encfsctl"'' + + ''-DNIXPKGS_CRYFS="${lib.getBin cryfs}/bin/cryfs"'' + + ''-DNIXPKGS_FUSERMOUNT="${lib.getBin fuse}/bin/fusermount"'' + ]; + +} diff --git a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch new file mode 100644 index 000000000000..b494df55c5d0 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch @@ -0,0 +1,24 @@ +diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp +index 47bb237..4ff064d 100644 +--- a/kded/engine/backends/encfs/encfsbackend.cpp ++++ b/kded/engine/backends/encfs/encfsbackend.cpp +@@ -132,17 +132,16 @@ bool EncFsBackend::isInitialized(const Device &device) const + + QProcess *EncFsBackend::encfs(const QStringList &arguments) const + { +- return process("encfs", arguments, {}); ++ return process(NIXPKGS_ENCFS, arguments, {}); + } + + + + QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const + { +- return process("encfsctl", arguments, {}); ++ return process(NIXPKGS_ENCFSCTL, arguments, {}); + } + + + + } // namespace PlasmaVault +- diff --git a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch new file mode 100644 index 000000000000..cd1b736a103f --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch @@ -0,0 +1,18 @@ +diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp +index 81ce494..d3c5c9f 100644 +--- a/kded/engine/fusebackend_p.cpp ++++ b/kded/engine/fusebackend_p.cpp +@@ -103,7 +103,7 @@ QProcess *FuseBackend::process(const QString &executable, + + QProcess *FuseBackend::fusermount(const QStringList &arguments) const + { +- return process("fusermount", arguments, {}); ++ return process(NIXPKGS_FUSERMOUNT, arguments, {}); + } + + +@@ -245,4 +245,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const + } + + } // namespace PlasmaVault +- diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index b28a1e87fb6a..6fc6ef6d9e19 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -1,19 +1,23 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, - isocodes, libdbusmenu, libSM, libXcursor, libXtst, pam, wayland, + coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, + libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, - kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff, + kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff, knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, phonon, plasma-framework, prison, solid, - qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qtx11extras, + qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, + qtwayland, qtx11extras, }: +let inherit (lib) getBin getLib; in + mkDerivation { name = "plasma-workspace"; @@ -27,21 +31,47 @@ mkDerivation { kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon plasma-framework prison solid - qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtx11extras + qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; outputs = [ "out" "dev" "bin" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + cmakeFlags = [ + "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage" + "-DNIXPKGS_MKDIR=${getBin coreutils}/bin/mkdir" + "-DNIXPKGS_XRDB=${getBin xrdb}/bin/xrdb" + "-DNIXPKGS_QTPATHS=${getBin qttools}/bin/qtpaths" + "-DNIXPKGS_XSETROOT=${getBin xsetroot}/bin/xsetroot" + "-DNIXPKGS_XPROP=${getBin xprop}/bin/xprop" + "-DNIXPKGS_ID=${getBin coreutils}/bin/id" + "-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT=${getBin dbus}/bin/dbus-update-activation-environment" + "-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper" + "-DNIXPKGS_QDBUS=${getBin qttools}/bin/qdbus" + "-DNIXPKGS_KWRAPPER5=${getBin kinit}/bin/kwrapper5" + "-DNIXPKGS_KREADCONFIG5=${getBin kconfig}/bin/kreadconfig5" + "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep" + "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown" + "-DNIXPKGS_SED=${getBin gnused}/bin/sed" + ]; + + # To regenerate ./plasma-workspace.patch, + # + # > git clone https://github.com/ttuegel/plasma-workspace + # > cd plasma-workspace + # > git checkout nixpkgs/$x.$y # where $x.$y.$z == $version + # ... make some commits ... + # > git diff v$x.$y.$z + # + # Add upstream patches to the list below. For new patchs, particularly if not + # submitted upstream, please make a pull request and add it to + # ./plasma-workspace.patch. + patches = [ ./plasma-workspace.patch ]; - postPatch = '' - substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ - --replace kdostartupconfig5 ''${!outputBin}/bin/kdostartupconfig5 + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\"" + cmakeFlags+=" -DNIXPKGS_STARTPLASMA=''${!outputBin}/lib/libexec/startplasma" ''; postInstall = '' - rm "''${!outputBin}/bin/startkde" - rm "''${!outputBin}/bin/startplasmacompositor" - rm "''${!outputLib}/lib/libexec/startplasma" - rm -r "''${!outputBin}/share/wayland-sessions" + moveToOutput lib/libexec/startplasma ''${!outputBin} ''; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch new file mode 100644 index 000000000000..1f4b83cf83bf --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -0,0 +1,1191 @@ +diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml +index 7e2d9758..40a5797b 100644 +--- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml ++++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml +@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents + import org.kde.plasma.extras 2.0 as PlasmaExtras + import org.kde.plasma.workspace.components 2.0 + import org.kde.kcoreaddons 1.0 as KCoreAddons +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: batteryItem +diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml +index ae6d5919..c2f99c86 100644 +--- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml ++++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.kcoreaddons 1.0 as KCoreAddons + import org.kde.kquickcontrolsaddons 2.0 +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: batterymonitor +diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml +index 80e7e53b..0083cf01 100644 +--- a/applets/lock_logout/contents/ui/lockout.qml ++++ b/applets/lock_logout/contents/ui/lockout.qml +@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 + import org.kde.kquickcontrolsaddons 2.0 +-import "data.js" as Data ++import "../code/data.js" as Data + + Flow { + id: lockout +diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml +index acdda88f..989de8ab 100644 +--- a/applets/notifications/package/contents/ui/main.qml ++++ b/applets/notifications/package/contents/ui/main.qml +@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras + + import org.kde.plasma.private.notifications 1.0 + +-import "uiproperties.js" as UiProperties ++import "../code/uiproperties.js" as UiProperties + + MouseEventListener { + id: notificationsApplet +diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in +index 85715214..294eab08 100644 +--- a/krunner/dbus/org.kde.krunner.service.in ++++ b/krunner/dbus/org.kde.krunner.service.in +@@ -1,4 +1,4 @@ + [D-BUS Service] + Name=org.kde.krunner +-Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner ++Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner + +diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in +index 7a86d07f..5b3030cc 100644 +--- a/kuiserver/org.kde.kuiserver.service.in ++++ b/kuiserver/org.kde.kuiserver.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.kde.kuiserver +-Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5 ++Exec=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5 +diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt +index fe29f57a..247db953 100644 +--- a/startkde/CMakeLists.txt ++++ b/startkde/CMakeLists.txt +@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig) + add_subdirectory(ksyncdbusenv) + add_subdirectory(waitforname) + +-#FIXME: reconsider, looks fishy +-if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") +- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") +-endif() +- + configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) + configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY) + configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY) +diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp +index c9927855..bd506ce2 100644 +--- a/startkde/kstartupconfig/kstartupconfig.cpp ++++ b/startkde/kstartupconfig/kstartupconfig.cpp +@@ -147,5 +147,5 @@ int main() + fclose( keys ); + fclose( config ); + doit: +- return system( "kdostartupconfig5" ); ++ return system( NIXPKGS_KDOSTARTUPCONFIG5 ); + } +diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake +index e9fa0bee..79e50a96 100644 +--- a/startkde/startkde.cmake ++++ b/startkde/startkde.cmake +@@ -1,22 +1,31 @@ + #!/bin/sh + # +-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) ++# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) + # + ++if test "x$1" = x--failsafe; then ++ KDE_FAILSAFE=1 # General failsafe flag ++ KWIN_COMPOSE=N # Disable KWin's compositing ++ QT_XCB_FORCE_SOFTWARE_OPENGL=1 ++ export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL ++fi ++ + # When the X server dies we get a HUP signal from xinit. We must ignore it + # because we still need to do some cleanup. + trap 'echo GOT SIGHUP' HUP + +-# Check if a Plasma session already is running and whether it's possible to connect to X +-kcheckrunning ++# we have to unset this for Darwin since it will screw up KDE's dynamic-loading ++unset DYLD_FORCE_FLAT_NAMESPACE ++ ++# Check if a KDE session already is running and whether it's possible to connect to X ++@CMAKE_INSTALL_FULL_BINDIR@/kcheckrunning + kcheckrunning_result=$? +-if test $kcheckrunning_result -eq 0 ; then +- echo "Plasma seems to be already running on this display." +- xmessage -geometry 500x100 "Plasma seems to be already running on this display." > /dev/null 2>/dev/null +- exit 1 +-elif test $kcheckrunning_result -eq 2 ; then +- echo "\$DISPLAY is not set or cannot connect to the X server." +- exit 1 ++if [ $kcheckrunning_result -eq 0 ]; then ++ echo "KDE seems to be already running on this display." ++ exit 1 ++elif [ $kcheckrunning_result -eq 2 ]; then ++ echo "\$DISPLAY is not set or cannot connect to the X server." ++ exit 1 + fi + + # Boot sequence: +@@ -33,59 +42,132 @@ fi + # + # * Then ksmserver is started which takes control of the rest of the startup sequence + +-# We need to create config folder so we can write startupconfigkeys +-if [ ${XDG_CONFIG_HOME} ]; then +- configDir=$XDG_CONFIG_HOME; +-else +- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html ++export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" ++@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME" ++ ++# The KDE icon cache is supposed to update itself ++# automatically, but it uses the timestamp on the icon ++# theme directory as a trigger. Since in Nix the ++# timestamp is always the same, this doesn't work. So as ++# a workaround, nuke the icon cache on login. This isn't ++# perfect, since it may require logging out after ++# installing new applications to update the cache. ++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html ++rm -fv $HOME/.cache/icon-cache.kcache ++ ++# Qt writes a weird ‘libraryPath’ line to ++# ~/.config/Trolltech.conf that causes the KDE plugin ++# paths of previous KDE invocations to be searched. ++# Obviously using mismatching KDE libraries is potentially ++# disastrous, so here we nuke references to the Nix store ++# in Trolltech.conf. A better solution would be to stop ++# Qt from doing this wackiness in the first place. ++if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then ++ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf + fi + +-mkdir -p $configDir ++@NIXPKGS_KBUILDSYCOCA5@ ++ ++# Set the default GTK 2 theme ++gtkrc2="$HOME/.gtkrc-2.0" ++breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" ++if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then ++ cat >"$gtkrc2" <<EOF ++# Default GTK+ 2 config for NixOS KDE 5 ++include "$breeze_gtkrc2" ++style "user-font" ++{ ++ font_name="Sans Serif Regular" ++} ++widget_class "*" style "user-font" ++gtk-font-name="Sans Serif Regular 10" ++gtk-theme-name="Breeze" ++gtk-icon-theme-name="breeze" ++gtk-fallback-icon-theme="hicolor" ++gtk-cursor-theme-name="breeze_cursors" ++gtk-toolbar-style=GTK_TOOLBAR_ICONS ++gtk-menu-images=1 ++gtk-button-images=1 ++EOF ++fi ++ ++# Set the default GTK 3 theme ++gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini" ++breeze_gtk3="/run/current-system/sw/share/themes/Breeze/gtk-3.0" ++if ! [ -e "$gtk3_settings" ] && [ -e "$breeze_gtk" ]; then ++ mkdir -p $(dirname "$gtk3_settings") ++ cat >"$gtk3_settings" <<EOF ++[Settings] ++gtk-font-name=Sans Serif Regular 10 ++gtk-theme-name=Breeze ++gtk-icon-theme-name=breeze ++gtk-fallback-icon-theme=hicolor ++gtk-cursor-theme-name=breeze_cursors ++gtk-toolbar-style=GTK_TOOLBAR_ICONS ++gtk-menu-images=1 ++gtk-button-images=1 ++EOF ++fi ++ ++kcminputrc="$XDG_CONFIG_HOME/kcminputrc" ++if ! [ -e "$kcminputrc" ]; then ++ cat >"$kcminputrc" <<EOF ++[Mouse] ++cursorTheme=breeze_cursors ++cursorSize=0 ++EOF ++fi + + #This is basically setting defaults so we can use them with kstartupconfig5 +-cat >$configDir/startupconfigkeys <<EOF ++cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF + kcminputrc Mouse cursorTheme 'breeze_cursors' + kcminputrc Mouse cursorSize '' +-ksplashrc KSplash Theme Breeze ++ksplashrc KSplash Theme org.kde.breeze.desktop + ksplashrc KSplash Engine KSplashQML + kdeglobals KScreen ScreenScaleFactors '' + kcmfonts General forceFontDPI 0 ++kcmfonts General dontChangeAASettings true + EOF + + # preload the user's locale on first start +-plasmalocalerc=$configDir/plasma-localerc +-test -f $plasmalocalerc || { +-cat >$plasmalocalerc <<EOF ++plasmalocalerc="$XDG_CONFIG_HOME/plasma-localerc" ++if ! [ -f "$plasmalocalerc" ]; then ++ cat >"$plasmalocalerc" <<EOF + [Formats] + LANG=$LANG + EOF +-} ++fi + + # export LC_* variables set by kcmshell5 formats into environment + # so it can be picked up by QLocale and friends. +-exportformatssettings=$configDir/plasma-locale-settings.sh +-test -f $exportformatssettings && { +- . $exportformatssettings +-} ++exportformatssettings="$XDG_CONFIG_HOME/plasma-locale-settings.sh" ++if [ -r "$exportformatssettings" ]; then ++ . "$exportformatssettings" ++fi + + # Write a default kdeglobals file to set up the font +-kdeglobalsfile=$configDir/kdeglobals +-test -f $kdeglobalsfile || { +-cat >$kdeglobalsfile <<EOF ++kdeglobalsfile="$XDG_CONFIG_HOME/kdeglobals" ++if ! [ -f "$kdeglobalsfile" ]; then ++ cat >"$kdeglobalsfile" <<EOF + [General] +-XftAntialias=true +-XftHintStyle=hintmedium +-XftSubPixel=none ++fixed=Monospace,10,-1,5,50,0,0,0,0,0,Regular ++font=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular ++menuFont=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular ++smallestReadableFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular ++toolBarFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular ++ ++[WM] ++activeFont=Noto Sans,12,-1,5,50,0,0,0,0,0,Bold + EOF +-} ++fi + +-kstartupconfig5 +-returncode=$? +-if test $returncode -ne 0; then +- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." ++if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then ++ echo "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." 1>&2 + exit 1 + fi +-[ -r $configDir/startupconfig ] && . $configDir/startupconfig ++if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then ++ . "$XDG_CONFIG_HOME/startupconfig" ++fi + + if [ "$kdeglobals_kscreen_screenscalefactors" ]; then + export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors" +@@ -94,26 +176,33 @@ fi + #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us + export QT_AUTO_SCREEN_SCALE_FACTOR=0 + ++#Set the QtQuickControls style to our own: for QtQuickControls1 ++#it will fall back to Desktop, while it will use our own org.kde.desktop ++#for QtQuickControlsStyle and Kirigami ++export QT_QUICK_CONTROLS_STYLE=org.kde.desktop ++ ++XCURSOR_PATH=~/.icons ++IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" ++for xdgDir in "${xdgDirs[@]}"; do ++ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" ++done ++export XCURSOR_PATH ++ + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver + if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then +- @EXPORT_XCURSOR_PATH@ +- + kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" +- if test $? -eq 10; then +- XCURSOR_THEME=breeze_cursors +- export XCURSOR_THEME +- elif test -n "$kcminputrc_mouse_cursortheme"; then +- XCURSOR_THEME="$kcminputrc_mouse_cursortheme" +- export XCURSOR_THEME ++ if [ $? -eq 10 ]; then ++ export XCURSOR_THEME=breeze_cursors ++ elif [ -n "$kcminputrc_mouse_cursortheme" ]; then ++ export XCURSOR_THEME="$kcminputrc_mouse_cursortheme" + fi +- if test -n "$kcminputrc_mouse_cursorsize"; then +- XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" +- export XCURSOR_SIZE ++ if [ -n "$kcminputrc_mouse_cursorsize" ]; then ++ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" + fi + fi + +-if test "$kcmfonts_general_forcefontdpi" -ne 0; then +- xrdb -quiet -merge -nocpp <<EOF ++if [ "${kcmfonts_general_forcefontdpi:-0}" -ne 0 ]; then ++ @NIXPKGS_XRDB@ -quiet -merge -nocpp <<EOF + Xft.dpi: $kcmfonts_general_forcefontdpi + EOF + fi +@@ -122,11 +211,11 @@ dl=$DESKTOP_LOCKED + unset DESKTOP_LOCKED # Don't want it in the environment + + ksplash_pid= +-if test -z "$dl"; then ++if [ -z "$dl" ]; then + # the splashscreen and progress indicator + case "$ksplashrc_ksplash_engine" in + KSplashQML) +- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` ++ ksplash_pid=$(@CMAKE_INSTALL_FULL_BINDIR@/ksplashqml "${ksplashrc_ksplash_theme}" --pid) + ;; + None) + ;; +@@ -135,71 +224,6 @@ if test -z "$dl"; then + esac + fi + +-# Source scripts found in <config locations>/plasma-workspace/env/*.sh +-# (where <config locations> correspond to the system and user's configuration +-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config +-# and /etc/xdg/ on Linux) +-# +-# This is where you can define environment variables that will be available to +-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` +-# or eval `gpg-agent --daemon`. +-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script +-# +-# (see end of this file). +-# For anything else (that doesn't set env vars, or that needs a window manager), +-# better use the Autostart folder. +- +-scriptpath=`qtpaths --locate-dirs GenericConfigLocation plasma-workspace | tr ':' '\n'` +- +-# Add /env/ to the directory to locate the scripts to be sourced +-for prefix in `echo $scriptpath`; do +- for file in "$prefix"/env/*.sh; do +- test -r "$file" && . "$file" || true +- done +-done +- +-# Activate the kde font directories. +-# +-# There are 4 directories that may be used for supplying fonts for KDE. +-# +-# There are two system directories. These belong to the administrator. +-# There are two user directories, where the user may add her own fonts. +-# +-# The 'override' versions are for fonts that should come first in the list, +-# i.e. if you have a font in your 'override' directory, it will be used in +-# preference to any other. +-# +-# The preference order looks like this: +-# user override, system override, X, user, system +-# +-# Where X is the original font database that was set up before this script +-# runs. +- +-usr_odir=$HOME/.fonts/kde-override +-usr_fdir=$HOME/.fonts +- +-if test -n "$KDEDIRS"; then +- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` +- sys_odir=$kdedirs_first/share/fonts/override +- sys_fdir=$kdedirs_first/share/fonts +-else +- sys_odir=$KDEDIR/share/fonts/override +- sys_fdir=$KDEDIR/share/fonts +-fi +- +-# We run mkfontdir on the user's font dirs (if we have permission) to pick +-# up any new fonts they may have installed. If mkfontdir fails, we still +-# add the user's dirs to the font path, as they might simply have been made +-# read-only by the administrator, for whatever reason. +- +-test -d "$sys_odir" && xset +fp "$sys_odir" +-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") +-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") +-test -d "$sys_fdir" && xset fp+ "$sys_fdir" +- +-# Ask X11 to rebuild its font list. +-xset fp rehash +- + # Set a left cursor instead of the standard X11 "X" cursor, since I've heard + # from some users that they're confused and don't know what to do. This is + # especially necessary on slow machines, where starting KDE takes one or two +@@ -208,28 +232,10 @@ xset fp rehash + # If the user has overwritten fonts, the cursor font may be different now + # so don't move this up. + # +-xsetroot -cursor_name left_ptr +- +-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap +-if test -n "$GS_LIB" ; then +- GS_LIB=$usr_fdir:$GS_LIB +- export GS_LIB +-else +- GS_LIB=$usr_fdir +- export GS_LIB +-fi ++@NIXPKGS_XSETROOT@ -cursor_name left_ptr + + echo 'startkde: Starting up...' 1>&2 + +-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. +-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend +-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or +-# /usr/local. +-if test -z "$XDG_DATA_DIRS"; then +- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" +-fi +-export XDG_DATA_DIRS +- + # Mark that full KDE session is running (e.g. Konqueror preloading works only + # with full KDE running). The KDE_FULL_SESSION property can be detected by + # any X client connected to the same X session, even if not launched +@@ -254,44 +260,65 @@ export XDG_DATA_DIRS + # + KDE_FULL_SESSION=true + export KDE_FULL_SESSION +-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true ++@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true + + KDE_SESSION_VERSION=5 + export KDE_SESSION_VERSION +-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 ++@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 + +-KDE_SESSION_UID=`id -ru` ++KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) + export KDE_SESSION_UID + + XDG_CURRENT_DESKTOP=KDE + export XDG_CURRENT_DESKTOP + ++# Enforce xcb QPA. Helps switching between Wayland and X sessions. ++export QT_QPA_PLATFORM=xcb ++ ++# Source scripts found in <config locations>/plasma-workspace/env/*.sh ++# (where <config locations> correspond to the system and user's configuration ++# directories, as identified by Qt's qtpaths, e.g. $HOME/.config ++# and /etc/xdg/ on Linux) ++# ++# This is where you can define environment variables that will be available to ++# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` ++# or eval `gpg-agent --daemon`. ++# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script ++# ++# (see end of this file). ++# For anything else (that doesn't set env vars, or that needs a window manager), ++# better use the Autostart folder. ++ ++IFS=":" read -r -a scriptpath <<< $(@NIXPKGS_QTPATHS@ --paths GenericConfigLocation) ++# Add /env/ to the directory to locate the scripts to be sourced ++for prefix in "${scriptpath[@]}"; do ++ for file in "$prefix"/plasma-workspace/env/*.sh; do ++ if [ -r "$file" ]; then ++ . "$file" ++ fi ++ done ++done ++ + # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment +-if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then +- dbus-update-activation-environment --systemd --all +-else +- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv +-fi +-if test $? -ne 0; then ++ ++if ! @NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT@ --systemd --all; then + # Startup error + echo 'startkde: Could not sync environment to dbus.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not sync environment to dbus." + exit 1 + fi + + # We set LD_BIND_NOW to increase the efficiency of kdeinit. + # kdeinit unsets this variable before loading applications. +-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup ++LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup + if test $? -ne 0; then + # Startup error + echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." + exit 1 + fi + +-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & ++@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & + + # finally, give the session control to the session manager + # see kdebase/ksmserver for the description of the rest of the startup sequence +@@ -303,34 +330,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & + # We only check for 255 which means that the ksmserver process could not be + # started, any problems thereafter, e.g. ksmserver failing to initialize, + # will remain undetected. +-test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" ++if [ -n "$KDEWM" ]; then ++ KDEWM="--windowmanager $KDEWM" ++fi + # If the session should be locked from the start (locked autologin), + # lock now and do the rest of the KDE startup underneath the locker. + KSMSERVEROPTIONS="" +-test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" +-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS ++if [ -n "$dl" ]; then ++ KSMSERVEROPTIONS=" --lockscreen" ++fi ++@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS + if test $? -eq 255; then + # Startup error + echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." + fi + + #Anything after here is logout/shutdown + +-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` ++wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) + +-if test x"$wait_drkonqi"x = x"true"x ; then ++if [ x"$wait_drkonqi"x = x"true"x ]; then + # wait for remaining drkonqi instances with timeout (in seconds) +- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` ++ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900) + wait_drkonqi_counter=0 +- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do ++ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do + sleep 5 + wait_drkonqi_counter=$((wait_drkonqi_counter+5)) +- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then ++ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then + # ask remaining drkonqis to die in a graceful way +- qdbus | grep 'org.kde.drkonqi-' | while read address ; do +- qdbus "$address" "/MainApplication" "quit" ++ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do ++ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit" + done + break + fi +@@ -339,15 +369,17 @@ fi + + echo 'startkde: Shutting down...' 1>&2 + # just in case +-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null ++if [ -n "$ksplash_pid" ]; then ++ kill "$ksplash_pid" 2>/dev/null ++fi + + # Clean up +-kdeinit5_shutdown ++@NIXPKGS_KDEINIT5_SHUTDOWN@ + + unset KDE_FULL_SESSION +-xprop -root -remove KDE_FULL_SESSION ++@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION +-xprop -root -remove KDE_SESSION_VERSION ++@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION + unset KDE_SESSION_UID + + echo 'startkde: Done.' 1>&2 +diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake +index fd232bdf..e1c8fff6 100644 +--- a/startkde/startplasma.cmake ++++ b/startkde/startplasma.cmake +@@ -1,6 +1,6 @@ + #!/bin/sh + # +-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) ++# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) + # + + # Boot sequence: +@@ -17,17 +17,13 @@ + # + # * Then ksmserver is started which takes control of the rest of the startup sequence + +-# We need to create config folder so we can write startupconfigkeys +-if [ ${XDG_CONFIG_HOME} ]; then +- configDir=$XDG_CONFIG_HOME; +-else +- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html ++export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" ++if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then ++ . "$XDG_CONFIG_HOME/startupconfig" + fi + +-[ -r $configDir/startupconfig ] && . $configDir/startupconfig +- +-if test "$kcmfonts_general_forcefontdpi" -ne 0; then +- xrdb -quiet -merge -nocpp <<EOF ++if [ "$kcmfonts_general_forcefontdpi" -ne 0 ]; then ++ @NIXPKGS_XRDB@ -quiet -merge -nocpp <<EOF + Xft.dpi: $kcmfonts_general_forcefontdpi + EOF + fi +@@ -36,11 +32,11 @@ dl=$DESKTOP_LOCKED + unset DESKTOP_LOCKED # Don't want it in the environment + + ksplash_pid= +-if test -z "$dl"; then ++if [ -z "$dl" ]; then + # the splashscreen and progress indicator + case "$ksplashrc_ksplash_engine" in + KSplashQML) +- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` ++ ksplash_pid=$(@CMAKE_INSTALL_FULL_BINDIR@/ksplashqml "${ksplashrc_ksplash_theme}" --pid) + ;; + None) + ;; +@@ -52,48 +48,6 @@ fi + #In wayland we want Plasma to use Qt's scaling + export PLASMA_USE_QT_SCALING=1 + +-# Activate the kde font directories. +-# +-# There are 4 directories that may be used for supplying fonts for KDE. +-# +-# There are two system directories. These belong to the administrator. +-# There are two user directories, where the user may add her own fonts. +-# +-# The 'override' versions are for fonts that should come first in the list, +-# i.e. if you have a font in your 'override' directory, it will be used in +-# preference to any other. +-# +-# The preference order looks like this: +-# user override, system override, X, user, system +-# +-# Where X is the original font database that was set up before this script +-# runs. +- +-usr_odir=$HOME/.fonts/kde-override +-usr_fdir=$HOME/.fonts +- +-if test -n "$KDEDIRS"; then +- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` +- sys_odir=$kdedirs_first/share/fonts/override +- sys_fdir=$kdedirs_first/share/fonts +-else +- sys_odir=$KDEDIR/share/fonts/override +- sys_fdir=$KDEDIR/share/fonts +-fi +- +-# We run mkfontdir on the user's font dirs (if we have permission) to pick +-# up any new fonts they may have installed. If mkfontdir fails, we still +-# add the user's dirs to the font path, as they might simply have been made +-# read-only by the administrator, for whatever reason. +- +-test -d "$sys_odir" && xset +fp "$sys_odir" +-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") +-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") +-test -d "$sys_fdir" && xset fp+ "$sys_fdir" +- +-# Ask X11 to rebuild its font list. +-xset fp rehash +- + # Set a left cursor instead of the standard X11 "X" cursor, since I've heard + # from some users that they're confused and don't know what to do. This is + # especially necessary on slow machines, where starting KDE takes one or two +@@ -102,35 +56,25 @@ xset fp rehash + # If the user has overwritten fonts, the cursor font may be different now + # so don't move this up. + # +-xsetroot -cursor_name left_ptr +- +-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap +-if test -n "$GS_LIB" ; then +- GS_LIB=$usr_fdir:$GS_LIB +- export GS_LIB +-else +- GS_LIB=$usr_fdir +- export GS_LIB +-fi ++@NIXPKGS_XSETROOT@ -cursor_name left_ptr + + echo 'startplasma: Starting up...' 1>&2 + + # export our session variables to the Xwayland server +-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 ++@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true ++@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 + + # We set LD_BIND_NOW to increase the efficiency of kdeinit. + # kdeinit unsets this variable before loading applications. +-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup ++LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup + if test $? -ne 0; then + # Startup error + echo 'startplasma: Could not start kdeinit5. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." + exit 1 + fi + +-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit ++@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit + + # finally, give the session control to the session manager + # see kdebase/ksmserver for the description of the rest of the startup sequence +@@ -145,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit + # If the session should be locked from the start (locked autologin), + # lock now and do the rest of the KDE startup underneath the locker. + KSMSERVEROPTIONS=" --no-lockscreen" +-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS ++@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS + if test $? -eq 255; then + # Startup error + echo 'startplasma: Could not start ksmserver. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." + fi + +-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` ++wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) + +-if test x"$wait_drkonqi"x = x"true"x ; then ++if [ x"$wait_drkonqi"x = x"true"x ]; then + # wait for remaining drkonqi instances with timeout (in seconds) +- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` ++ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900) + wait_drkonqi_counter=0 +- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do ++ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do + sleep 5 + wait_drkonqi_counter=$((wait_drkonqi_counter+5)) +- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then ++ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then + # ask remaining drkonqis to die in a graceful way +- qdbus | grep 'org.kde.drkonqi-' | while read address ; do +- qdbus "$address" "/MainApplication" "quit" ++ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do ++ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit" + done + break + fi +@@ -174,15 +117,17 @@ fi + + echo 'startplasma: Shutting down...' 1>&2 + # just in case +-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null ++if [ -n "$ksplash_pid" ]; then ++ kill "$ksplash_pid" 2>/dev/null ++fi + + # Clean up +-kdeinit5_shutdown ++@NIXPKGS_KDEINIT5_SHUTDOWN@ + + unset KDE_FULL_SESSION +-xprop -root -remove KDE_FULL_SESSION ++@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION +-xprop -root -remove KDE_SESSION_VERSION ++@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION + unset KDE_SESSION_UID + + echo 'startplasma: Done.' 1>&2 +diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake +index 417a87d4..3f62745a 100644 +--- a/startkde/startplasmacompositor.cmake ++++ b/startkde/startplasmacompositor.cmake +@@ -1,173 +1,171 @@ + #!/bin/sh + # +-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) ++# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) + # + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`qtpaths --binaries-dir` +- qdbus=$qbindir/qdbus +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-else +- qdbus=qdbus ++# we have to unset this for Darwin since it will screw up KDE's dynamic-loading ++unset DYLD_FORCE_FLAT_NAMESPACE ++ ++export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" ++@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME" ++ ++# The KDE icon cache is supposed to update itself ++# automatically, but it uses the timestamp on the icon ++# theme directory as a trigger. Since in Nix the ++# timestamp is always the same, this doesn't work. So as ++# a workaround, nuke the icon cache on login. This isn't ++# perfect, since it may require logging out after ++# installing new applications to update the cache. ++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html ++rm -fv $HOME/.cache/icon-cache.kcache ++ ++# Qt writes a weird ‘libraryPath’ line to ++# ~/.config/Trolltech.conf that causes the KDE plugin ++# paths of previous KDE invocations to be searched. ++# Obviously using mismatching KDE libraries is potentially ++# disastrous, so here we nuke references to the Nix store ++# in Trolltech.conf. A better solution would be to stop ++# Qt from doing this wackiness in the first place. ++if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then ++ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf + fi + +-# We need to create config folder so we can write startupconfigkeys +-if [ ${XDG_CONFIG_HOME} ]; then +- configDir=$XDG_CONFIG_HOME; +-else +- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html ++@NIXPKGS_KBUILDSYCOCA5@ ++ ++# Set the default GTK 2 theme ++gtkrc2="$HOME/.gtkrc-2.0" ++breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" ++if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then ++ cat >"$gtkrc2" <<EOF ++# Default GTK+ 2 config for NixOS KDE 5 ++include "$breeze_gtkrc2" ++style "user-font" ++{ ++ font_name="Sans Serif Regular" ++} ++widget_class "*" style "user-font" ++gtk-font-name="Sans Serif Regular 10" ++gtk-theme-name="Breeze" ++gtk-icon-theme-name="breeze" ++gtk-fallback-icon-theme="hicolor" ++gtk-cursor-theme-name="breeze_cursors" ++gtk-toolbar-style=GTK_TOOLBAR_ICONS ++gtk-menu-images=1 ++gtk-button-images=1 ++EOF + fi + +-mkdir -p $configDir ++# Set the default GTK 3 theme ++gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini" ++breeze_gtk3="/run/current-system/sw/share/themes/Breeze/gtk-3.0" ++if ! [ -e "$gtk3_settings" ] && [ -e "$breeze_gtk" ]; then ++ mkdir -p $(dirname "$gtk3_settings") ++ cat >"$gtk3_settings" <<EOF ++[Settings] ++gtk-font-name=Sans Serif Regular 10 ++gtk-theme-name=Breeze ++gtk-icon-theme-name=breeze ++gtk-fallback-icon-theme=hicolor ++gtk-cursor-theme-name=breeze_cursors ++gtk-toolbar-style=GTK_TOOLBAR_ICONS ++gtk-menu-images=1 ++gtk-button-images=1 ++EOF ++fi ++ ++kcminputrc="$XDG_CONFIG_HOME/kcminputrc" ++if ! [ -e "$kcminputrc" ]; then ++ cat >"$kcminputrc" <<EOF ++[Mouse] ++cursorTheme=breeze_cursors ++cursorSize=0 ++EOF ++fi + + #This is basically setting defaults so we can use them with kstartupconfig5 +-cat >$configDir/startupconfigkeys <<EOF ++cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF + kcminputrc Mouse cursorTheme 'breeze_cursors' + kcminputrc Mouse cursorSize '' +-ksplashrc KSplash Theme Breeze ++ksplashrc KSplash Theme org.kde.breeze.desktop + ksplashrc KSplash Engine KSplashQML +-kcmfonts General forceFontDPIWayland 0 ++kdeglobals KScreen ScreenScaleFactors '' ++kcmfonts General forceFontDPI 0 ++kcmfonts General dontChangeAASettings true + EOF + + # preload the user's locale on first start +-plasmalocalerc=$configDir/plasma-localerc +-test -f $plasmalocalerc || { +-cat >$plasmalocalerc <<EOF ++plasmalocalerc="$XDG_CONFIG_HOME/plasma-localerc" ++if ! [ -f "$plasmalocalerc" ]; then ++ cat >"$plasmalocalerc" <<EOF + [Formats] + LANG=$LANG + EOF +-} ++fi + + # export LC_* variables set by kcmshell5 formats into environment + # so it can be picked up by QLocale and friends. +-exportformatssettings=$configDir/plasma-locale-settings.sh +-test -f $exportformatssettings && { +- . $exportformatssettings +-} ++exportformatssettings="$XDG_CONFIG_HOME/plasma-locale-settings.sh" ++if [ -r "$exportformatssettings" ]; then ++ . "$exportformatssettings" ++fi + + # Write a default kdeglobals file to set up the font +-kdeglobalsfile=$configDir/kdeglobals +-test -f $kdeglobalsfile || { +-cat >$kdeglobalsfile <<EOF ++kdeglobalsfile="$XDG_CONFIG_HOME/kdeglobals" ++if ! [ -f "$kdeglobalsfile" ]; then ++ cat >"$kdeglobalsfile" <<EOF + [General] +-XftAntialias=true +-XftHintStyle=hintmedium +-XftSubPixel=none ++fixed=Monospace,10,-1,5,50,0,0,0,0,0,Regular ++font=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular ++menuFont=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular ++smallestReadableFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular ++toolBarFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular ++ ++[WM] ++activeFont=Noto Sans,12,-1,5,50,0,0,0,0,0,Bold + EOF +-} +- +-# Make sure the Oxygen font is installed +-# This is necessary for setups where CMAKE_INSTALL_PREFIX +-# is not in /usr. fontconfig looks in /usr, ~/.fonts and +-# $XDG_DATA_HOME for fonts. In this case, we symlink the +-# Oxygen font under ${XDG_DATA_HOME} and make it known to +-# fontconfig +- +-usr_share="/usr/share" +-install_share="@KDE_INSTALL_FULL_DATADIR@" +- +-if [ ! $install_share = $usr_share ]; then +- +- if [ ${XDG_DATA_HOME} ]; then +- fontsDir="${XDG_DATA_HOME}/fonts" +- else +- fontsDir="${HOME}/.fonts" +- fi +- +- test -d $fontsDir || { +- mkdir -p $fontsDir +- } +- +- oxygenDir=$fontsDir/truetype/oxygen +- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/truetype/oxygen" +- +- # if the oxygen dir doesn't exist, create a symlink to be sure that the +- # Oxygen font is available to the user +- test -d $oxygenDir || test -d $prefixDir && { +- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir +- } + fi + +-kstartupconfig5 +-returncode=$? +-if test $returncode -ne 0; then ++if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then + exit 1 + fi +-[ -r $configDir/startupconfig ] && . $configDir/startupconfig ++if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then ++ . "$XDG_CONFIG_HOME/startupconfig" ++fi + + #Manually disable auto scaling because we are scaling above + #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output + export QT_AUTO_SCREEN_SCALE_FACTOR=0 + ++XCURSOR_PATH=~/.icons ++IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" ++for xdgDir in "${xdgDirs[@]}"; do ++ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" ++done ++export XCURSOR_PATH ++ + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver +-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then +- @EXPORT_XCURSOR_PATH@ +- +- # TODO: is kapplymousetheme a core app? +- #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" +- if test $? -eq 10; then +- XCURSOR_THEME=breeze_cursors +- export XCURSOR_THEME +- elif test -n "$kcminputrc_mouse_cursortheme"; then +- XCURSOR_THEME="$kcminputrc_mouse_cursortheme" +- export XCURSOR_THEME ++if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then ++ kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" ++ if [ $? -eq 10 ]; then ++ export XCURSOR_THEME=breeze_cursors ++ elif [ -n "$kcminputrc_mouse_cursortheme" ]; then ++ export XCURSOR_THEME="$kcminputrc_mouse_cursortheme" + fi +- if test -n "$kcminputrc_mouse_cursorsize"; then +- XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" +- export XCURSOR_SIZE ++ if [ -n "$kcminputrc_mouse_cursorsize" ]; then ++ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" + fi + fi + +-if test "$kcmfonts_general_forcefontdpiwayland" -ne 0; then ++if [ "${kcmfonts_general_forcefontdpiwayland:-0}" -ne 0 ]; then + export QT_WAYLAND_FORCE_DPI=$kcmfonts_general_forcefontdpiwayland + else + export QT_WAYLAND_FORCE_DPI=96 + fi + +-# Source scripts found in <config locations>/plasma-workspace/env/*.sh +-# (where <config locations> correspond to the system and user's configuration +-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config +-# and /etc/xdg/ on Linux) +-# +-# This is where you can define environment variables that will be available to +-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` +-# or eval `gpg-agent --daemon`. +-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script +-# +-# (see end of this file). +-# For anything else (that doesn't set env vars, or that needs a window manager), +-# better use the Autostart folder. +- +-# TODO: Use GenericConfigLocation once we depend on Qt 5.4 +-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` +- +-# Add /env/ to the directory to locate the scripts to be sourced +-for prefix in `echo $scriptpath`; do +- for file in "$prefix"/env/*.sh; do +- test -r "$file" && . "$file" +- done +-done +- + echo 'startplasmacompositor: Starting up...' 1>&2 + +-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. +-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend +-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or +-# /usr/local. +-if test -z "$XDG_DATA_DIRS"; then +-XDG_DATA_DIRS="@KDE_INSTALL_FULL_DATADIR@:/usr/share:/usr/local/share" +-fi +-export XDG_DATA_DIRS +- + # Make sure that D-Bus is running +-if $qdbus >/dev/null 2>/dev/null; then +- : # ok +-else ++if ! @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then + echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + exit 1 +@@ -202,7 +200,7 @@ export KDE_FULL_SESSION + KDE_SESSION_VERSION=5 + export KDE_SESSION_VERSION + +-KDE_SESSION_UID=`id -ru` ++KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) + export KDE_SESSION_UID + + XDG_CURRENT_DESKTOP=KDE +@@ -212,26 +210,47 @@ export XDG_CURRENT_DESKTOP + QT_QPA_PLATFORM=wayland + export QT_QPA_PLATFORM + ++# Source scripts found in <config locations>/plasma-workspace/env/*.sh ++# (where <config locations> correspond to the system and user's configuration ++# directories, as identified by Qt's qtpaths, e.g. $HOME/.config ++# and /etc/xdg/ on Linux) ++# ++# This is where you can define environment variables that will be available to ++# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` ++# or eval `gpg-agent --daemon`. ++# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script ++# ++# (see end of this file). ++# For anything else (that doesn't set env vars, or that needs a window manager), ++# better use the Autostart folder. ++ ++IFS=":" read -r -a scriptpath <<< $(@NIXPKGS_QTPATHS@ --paths GenericConfigLocation) ++# Add /env/ to the directory to locate the scripts to be sourced ++for prefix in "${scriptpath[@]}"; do ++ for file in "$prefix"/plasma-workspace/env/*.sh; do ++ if [ -r "$file" ]; then ++ . "$file" ++ fi ++ done ++done ++ + # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment +-if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then +- dbus-update-activation-environment --systemd --all +-else +- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv +-fi +-if test $? -ne 0; then +- # Startup error +- echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2 +- exit 1 ++if ! @NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT@ --systemd --all; then ++ # Startup error ++ echo 'startkde: Could not sync environment to dbus.' 1>&2 ++ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null ++ echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2 ++ exit 1 + fi + +-@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma ++@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@ + + echo 'startplasmacompositor: Shutting down...' 1>&2 + + unset KDE_FULL_SESSION +-xprop -root -remove KDE_FULL_SESSION ++@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION +-xprop -root -remove KDE_SESSION_VERSION ++@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION + unset KDE_SESSION_UID + + echo 'startplasmacompositor: Done.' 1>&2 +diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in +index 0a51b84b..f48b5d8a 100644 +--- a/startkde/waitforname/org.kde.plasma.Notifications.service.in ++++ b/startkde/waitforname/org.kde.plasma.Notifications.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.freedesktop.Notifications +-Exec=@CMAKE_INSTALL_PREFIX@/bin/plasma_waitforname org.freedesktop.Notifications ++Exec=@CMAKE_INSTALL_FULL_BINDIR@/plasma_waitforname org.freedesktop.Notifications diff --git a/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch deleted file mode 100644 index 12eb65caa717..000000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch +++ /dev/null @@ -1,91 +0,0 @@ -Index: plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/analog-clock/contents/ui/analogclock.qml -+++ plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml -@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.1 - - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as PlasmaComponents --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: analogclock -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml -@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.plasma.workspace.components 2.0 - import org.kde.kcoreaddons 1.0 as KCoreAddons --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batteryItem -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.workspace.components 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - MouseArea { - id: root -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - FocusScope { - id: dialog -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.kcoreaddons 1.0 as KCoreAddons - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batterymonitor -Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/lock_logout/contents/ui/lockout.qml -+++ plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 - import org.kde.kquickcontrolsaddons 2.0 --import "data.js" as Data -+import "../code/data.js" as Data - - Flow { - id: lockout -Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml -+++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml -@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas - - import org.kde.plasma.private.notifications 1.0 - --import "uiproperties.js" as UiProperties -+import "../code/uiproperties.js" as UiProperties - - MouseEventListener { - id: notificationsApplet diff --git a/pkgs/desktops/plasma-5/plasma-workspace/series b/pkgs/desktops/plasma-5/plasma-workspace/series deleted file mode 100644 index b9081298bd69..000000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace/series +++ /dev/null @@ -1 +0,0 @@ -qml-import-path.patch diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 854b86c1640d..900c6c0b2c43 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,339 +3,355 @@ { bluedevil = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/bluedevil-5.10.5.tar.xz"; - sha256 = "01nhfggikkygfzyjbm7zqszhq2x1fhc619wskwjb7hm9p35laj9r"; - name = "bluedevil-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/bluedevil-5.11.1.tar.xz"; + sha256 = "0p1y3p87xg7rjj35n81jg4v4yr2k7bf80qzfnwslbvwrpnzs982q"; + name = "bluedevil-5.11.1.tar.xz"; }; }; breeze = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-5.10.5.tar.xz"; - sha256 = "0rmc3nn9b63jyij814hqx1zg38iphvd03pg7qybkp61zw40ng90v"; - name = "breeze-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-5.11.1.tar.xz"; + sha256 = "0yqbr7j0iqnmczbfv454f1l5x3787vzfchgkrd995d6za2d0w2lp"; + name = "breeze-5.11.1.tar.xz"; }; }; breeze-grub = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-grub-5.10.5.tar.xz"; - sha256 = "0am1hldqyrsryda907q2qwfc09xcsxrv7bq9v23ig0xmylcsq3if"; - name = "breeze-grub-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-grub-5.11.1.tar.xz"; + sha256 = "0pcri1z4min5m6wb6ncyjavwd9nszyis3cqdyw6mqb4av55z0xl0"; + name = "breeze-grub-5.11.1.tar.xz"; }; }; breeze-gtk = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-gtk-5.10.5.tar.xz"; - sha256 = "0i5ddrq9h1www5362qyfwpqpspn3brr43mbsv7ax7gk30san6w0a"; - name = "breeze-gtk-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-gtk-5.11.1.tar.xz"; + sha256 = "0qb3ykf1mdw1iparsaxnypc4z41lfal6idksz9va25p3vclh02gr"; + name = "breeze-gtk-5.11.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-plymouth-5.10.5.tar.xz"; - sha256 = "197g84mvh8s3f163zx24y1mmzk26fg3ni19pw21njdj2j813hd35"; - name = "breeze-plymouth-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-plymouth-5.11.1.tar.xz"; + sha256 = "1z175176583aqdvv6gwy7mdkndr50x1c8xdihrrcvdhvqy9qc7hr"; + name = "breeze-plymouth-5.11.1.tar.xz"; }; }; discover = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/discover-5.10.5.tar.xz"; - sha256 = "085lq0y9a6r12jbx2ik7zqp4r9bjw332ykfh2gbzzz4s7l7rj4xf"; - name = "discover-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/discover-5.11.1.tar.xz"; + sha256 = "0zr53nw9lix80wlf7wa7irng2vvy80wccjs439ib8r1yh3ggiq4c"; + name = "discover-5.11.1.tar.xz"; + }; + }; + drkonqi = { + version = "5.11.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.11.1/drkonqi-5.11.1.tar.xz"; + sha256 = "0kq06sz39m8qg19b4cjqfwnx19j3s29hddhls8wywswwxlz4aq35"; + name = "drkonqi-5.11.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kactivitymanagerd-5.10.5.tar.xz"; - sha256 = "19c297iyaq54vxc6xmvqsa1qlj5vr8071ydmkkfx3fa3lijp34v7"; - name = "kactivitymanagerd-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kactivitymanagerd-5.11.1.tar.xz"; + sha256 = "1j36mbngga492xxhm1ndw1bnq1qn480qpvzi94wyax9y3r4szmhg"; + name = "kactivitymanagerd-5.11.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kde-cli-tools-5.10.5.tar.xz"; - sha256 = "1i2frbxvzlqlv210w50ccxn8ksqxranc93v0wfjvnhd7f8p9c7vk"; - name = "kde-cli-tools-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kde-cli-tools-5.11.1.tar.xz"; + sha256 = "0di7ypyhda4gpadhi0lbji4nyi9xk1y844kxfb586wpzkim5w82c"; + name = "kde-cli-tools-5.11.1.tar.xz"; }; }; kdecoration = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kdecoration-5.10.5.tar.xz"; - sha256 = "0g24gisbnp92niff36bcnjk5pp84qc8cwmx283b887fzcn8v4mf3"; - name = "kdecoration-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kdecoration-5.11.1.tar.xz"; + sha256 = "1jpvdscmy5ymyvj22784swvf6181f7ggr875djhx57c7i4shb3ph"; + name = "kdecoration-5.11.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kde-gtk-config-5.10.5.tar.xz"; - sha256 = "1a5q8skykhvr5mixi59db2w1qsh8nj2dqncw4nmsh5nlh2ldmgm5"; - name = "kde-gtk-config-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kde-gtk-config-5.11.1.tar.xz"; + sha256 = "1afbwdrjdv9a2qwyxysgnslavan20cmhrz88kmnf9imxlll0i7al"; + name = "kde-gtk-config-5.11.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kdeplasma-addons-5.10.5.tar.xz"; - sha256 = "1xdsa38i60x24p6xiv4x1cqd7f2xijs15c19qsjv594lnmbizbr5"; - name = "kdeplasma-addons-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kdeplasma-addons-5.11.1.tar.xz"; + sha256 = "09dwmd1aiiivkvdbyv97fili067sd8mw9dpknawair4mh7qb0zln"; + name = "kdeplasma-addons-5.11.1.tar.xz"; }; }; kgamma5 = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kgamma5-5.10.5.tar.xz"; - sha256 = "0rci4v5amhfiwawf2sj5f6cmcyq3lrx68mn8id279bpq35mr23v1"; - name = "kgamma5-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kgamma5-5.11.1.tar.xz"; + sha256 = "1m9maxzn5y3zijmj2fkwsfwhinprhz97v9fi312dmwyvfhq3qvyd"; + name = "kgamma5-5.11.1.tar.xz"; }; }; khotkeys = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/khotkeys-5.10.5.tar.xz"; - sha256 = "1ixxb18nz3f4i2qqr1lvss7b662sgj78kzqjs0gd9mf5ylhqj5is"; - name = "khotkeys-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/khotkeys-5.11.1.tar.xz"; + sha256 = "0d1p1sia9qvdls38m29jijsf1ya8zvza557flmhcajb5ldn243l5"; + name = "khotkeys-5.11.1.tar.xz"; }; }; kinfocenter = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kinfocenter-5.10.5.tar.xz"; - sha256 = "0flfjypp6v2k99h11srigyc0ahy23869wz3ljbqbm3b0pgqs69sm"; - name = "kinfocenter-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kinfocenter-5.11.1.tar.xz"; + sha256 = "0ivhf460y83qv4qdphdvskx2nlfqzy453xfnq7ldyzp2yacdmcc8"; + name = "kinfocenter-5.11.1.tar.xz"; }; }; kmenuedit = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kmenuedit-5.10.5.tar.xz"; - sha256 = "0b786l5gm093dq1hvxcn97yg9fr0jmjhfl7sfd0cdn4pkg6almam"; - name = "kmenuedit-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kmenuedit-5.11.1.tar.xz"; + sha256 = "081lqh5ck854pha1f99w6w4j032spl3v28ild61fmhvhzkvx48a6"; + name = "kmenuedit-5.11.1.tar.xz"; }; }; kscreen = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kscreen-5.10.5.tar.xz"; - sha256 = "1a8bqa4wqnjav2w0s39dh7hmb3mqxjnhqwsw6mycgaxicl0h37vf"; - name = "kscreen-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kscreen-5.11.1.tar.xz"; + sha256 = "1skdg59qacxxkiyz3gc1nn4y4lflbynpcb4mpsliqb2n2xdhvg8r"; + name = "kscreen-5.11.1.tar.xz"; }; }; kscreenlocker = { - version = "5.10.5.1"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.1.tar.xz"; - sha256 = "03ih0dyyjljv40wl7mpbssfirkkljw8mnpjjhzk357lzadkplzvp"; - name = "kscreenlocker-5.10.5.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kscreenlocker-5.11.1.tar.xz"; + sha256 = "0jgq2w7zi1i4wdlfmfz1jh1kbkcn2lxkdg9ds5brisc3f6r4n3vg"; + name = "kscreenlocker-5.11.1.tar.xz"; }; }; ksshaskpass = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/ksshaskpass-5.10.5.tar.xz"; - sha256 = "194ca18kclwmg7j9kcl02hm01cidy0hh2r68j6gxkafnlmn1cjjw"; - name = "ksshaskpass-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/ksshaskpass-5.11.1.tar.xz"; + sha256 = "00ghycjmagc8mjwsgny9bkr45ppnad6aay44ha6fn5gyx973xcmx"; + name = "ksshaskpass-5.11.1.tar.xz"; }; }; ksysguard = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/ksysguard-5.10.5.tar.xz"; - sha256 = "0ywz0ax29y0gm7c3lxwdkn5xvzpkd82a313wb3cz4iphqqga3jqn"; - name = "ksysguard-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/ksysguard-5.11.1.tar.xz"; + sha256 = "11z29w95ji815gwaggs0n9bw8f040z4fd87ci2wmqcpyrjs7a6z1"; + name = "ksysguard-5.11.1.tar.xz"; }; }; kwallet-pam = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwallet-pam-5.10.5.tar.xz"; - sha256 = "0ws0835a0j3wqia85hcdsgfn48d71v96dmmvc2y5pp45ki648bn4"; - name = "kwallet-pam-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwallet-pam-5.11.1.tar.xz"; + sha256 = "0zipldqjg3mazm2j7vrxkc0pqp7x7mmdq7cg1vlb1xlj8ld2vl7y"; + name = "kwallet-pam-5.11.1.tar.xz"; }; }; kwayland-integration = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwayland-integration-5.10.5.tar.xz"; - sha256 = "0s1yhrvjgn455ayi368fkmdpmpyxl97c2pxy8rchfnk3g1ffhmdy"; - name = "kwayland-integration-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwayland-integration-5.11.1.tar.xz"; + sha256 = "1h1lcvzbcf628hs5hj3ykpzy086ylvf5bz63gr0clhyckjxrbbkh"; + name = "kwayland-integration-5.11.1.tar.xz"; }; }; kwin = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwin-5.10.5.tar.xz"; - sha256 = "1nxyn31a00r9kh0aw5fmvxklw21b2l07y267m0q0n9w6bmn6nzyc"; - name = "kwin-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwin-5.11.1.tar.xz"; + sha256 = "1anc8pblpsb8g7lvnq43ji6fgpwxsnmypc3gkip26lb4j7gqfhqm"; + name = "kwin-5.11.1.tar.xz"; }; }; kwrited = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwrited-5.10.5.tar.xz"; - sha256 = "0wphhb4l6qb7lbklgxh2sc6wgqij4n3iwnhaarv2d17864r7ykc9"; - name = "kwrited-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwrited-5.11.1.tar.xz"; + sha256 = "11y2dpjs0g01nah1924dzf39y1smzlswc6nx1cwgfky3raaz3cj0"; + name = "kwrited-5.11.1.tar.xz"; }; }; libkscreen = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/libkscreen-5.10.5.tar.xz"; - sha256 = "0a2lrrp8wp7ndgdvnh48781isin868ndsqw0xr21rn78n90580n6"; - name = "libkscreen-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/libkscreen-5.11.1.tar.xz"; + sha256 = "0drv6f8gzilirwp7p31qrng7cdp7b23ar5v1d5bkdrr1q29z8wdv"; + name = "libkscreen-5.11.1.tar.xz"; }; }; libksysguard = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/libksysguard-5.10.5.tar.xz"; - sha256 = "0ldcpjxy10cnwwc82ihy8xqjkavycrmv6wlbn0rwhnfs04n2rryn"; - name = "libksysguard-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/libksysguard-5.11.1.tar.xz"; + sha256 = "1m8514jv2487fbypxys65qb0a55psqvyzkw5l81ka4ydnrhl2hhm"; + name = "libksysguard-5.11.1.tar.xz"; }; }; milou = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/milou-5.10.5.tar.xz"; - sha256 = "06kq9s9lij66vy5024aps03pzpcz1ixf0b79a7ii1px2h1s7z4gz"; - name = "milou-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/milou-5.11.1.tar.xz"; + sha256 = "1v7rbjw8i1pdvl60xh8s0srrp17jks360zk42rp3hq9srsffd8cp"; + name = "milou-5.11.1.tar.xz"; }; }; oxygen = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/oxygen-5.10.5.tar.xz"; - sha256 = "0p1isrb8v0dkd27jnz6nbq44py7y3zzsjljn9xbv3d02vg802ym9"; - name = "oxygen-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/oxygen-5.11.1.tar.xz"; + sha256 = "0b3yl4q5cbcj6d07xrmifpvwysaa870gf56a7l38zjba6z04819z"; + name = "oxygen-5.11.1.tar.xz"; }; }; plasma-desktop = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-desktop-5.10.5.tar.xz"; - sha256 = "1sxy2k2p15ag5pcy36lpn83nz8d1jb1iyq2nihf4yrc9jlxx9gqm"; - name = "plasma-desktop-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-desktop-5.11.1.tar.xz"; + sha256 = "1r7chviykyq2650k513qcp665pv8vpdczvbrvqfhbpn4yy47crps"; + name = "plasma-desktop-5.11.1.tar.xz"; }; }; plasma-integration = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-integration-5.10.5.tar.xz"; - sha256 = "15cxwsdp78kx55py0wkwqpv4w8cf130hadmdvdw64lwr4gssvhjn"; - name = "plasma-integration-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-integration-5.11.1.tar.xz"; + sha256 = "0jpshilcpklyx7cbpn0cf96md2h6pwd86bk8lphzm64zv3c655ly"; + name = "plasma-integration-5.11.1.tar.xz"; }; }; plasma-nm = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-nm-5.10.5.tar.xz"; - sha256 = "004nmkfy74qaba6hslv2cyb52l7q6ihpavi5j5ax8k66n5zx00bi"; - name = "plasma-nm-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-nm-5.11.1.tar.xz"; + sha256 = "0479cqy7503krish11djg7rc4g7kdlbj3gapsbgvlq9x6j7ixz1p"; + name = "plasma-nm-5.11.1.tar.xz"; }; }; plasma-pa = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-pa-5.10.5.tar.xz"; - sha256 = "0300x3w7mhyb5wpsj47qsfm73fc90iw1vxrgzl9014pxc3h14np1"; - name = "plasma-pa-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-pa-5.11.1.tar.xz"; + sha256 = "0g565v4dwcn6jppn1p2dvljg5r39xmgjzgf8rcipw70kcwc1nx4c"; + name = "plasma-pa-5.11.1.tar.xz"; }; }; plasma-sdk = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-sdk-5.10.5.tar.xz"; - sha256 = "0mjndw132rn46sqjw5jdin8hn6lbrx5955h05jawk95sncr3d0yb"; - name = "plasma-sdk-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-sdk-5.11.1.tar.xz"; + sha256 = "0ss148yig5zzprkk2ydq3np34gr0bnbh1gn18hgb5z33iglbdl3n"; + name = "plasma-sdk-5.11.1.tar.xz"; }; }; plasma-tests = { - version = "5.10.5"; + version = "5.11.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.11.1/plasma-tests-5.11.1.tar.xz"; + sha256 = "03r5dczb9iqigg2s7h0k6zgb616358lqvl2h0k0bg2hxggnh8lpk"; + name = "plasma-tests-5.11.1.tar.xz"; + }; + }; + plasma-vault = { + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-tests-5.10.5.tar.xz"; - sha256 = "0mfh35zdc4n52q01jbagxgr51hsvjlyfmnj6x4l2zpif0fpqpxh8"; - name = "plasma-tests-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-vault-5.11.1.tar.xz"; + sha256 = "09wbjk0bsbjyh5n1d5gywdvaimajqr50sd23dbfdbnpi3br0gk10"; + name = "plasma-vault-5.11.1.tar.xz"; }; }; plasma-workspace = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-5.10.5.tar.xz"; - sha256 = "1n12vzjnrhndkzki7dh9kzrwrvll5xqq0y02srb9bg3gyjbp54jl"; - name = "plasma-workspace-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-5.11.1.tar.xz"; + sha256 = "1fy4bdxrz8mn29nc2qjxjnpxzjy9mynwwdjxj0jr61w0ljd40wiy"; + name = "plasma-workspace-5.11.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-wallpapers-5.10.5.tar.xz"; - sha256 = "1z7mqk9nxh232dxl5jg20zbc5nkq5srks4f8b02va6wzfjhwhc88"; - name = "plasma-workspace-wallpapers-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-wallpapers-5.11.1.tar.xz"; + sha256 = "0dcfrad2543fxapizmlikv52m9nmdg45gddvh9chc83kangsydlc"; + name = "plasma-workspace-wallpapers-5.11.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plymouth-kcm-5.10.5.tar.xz"; - sha256 = "11vfaaqd3mxbnq16rv7xsmfcj33i2cmdljdxib1sg5minybd072y"; - name = "plymouth-kcm-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plymouth-kcm-5.11.1.tar.xz"; + sha256 = "0w3yhazbx79s9k1yc3lj16hanc3wrqphhk9zjl9q1vxsn2rzas8h"; + name = "plymouth-kcm-5.11.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.10.5"; + version = "1-5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/polkit-kde-agent-1-5.10.5.tar.xz"; - sha256 = "158lkf76fz65nr0lx14skkcsk2p3xw98nh43z00wvm2c5qqzmnp2"; - name = "polkit-kde-agent-1-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/polkit-kde-agent-1-5.11.1.tar.xz"; + sha256 = "04ycjqx9hnk3ab8qxk5gqz7b4r7im3bwap613qcgxjqr5cagp66w"; + name = "polkit-kde-agent-1-5.11.1.tar.xz"; }; }; powerdevil = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/powerdevil-5.10.5.tar.xz"; - sha256 = "0dghlgva8fybvhc09y1avzhgak246n4ad2njjvfnxpazpi2laxv7"; - name = "powerdevil-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/powerdevil-5.11.1.tar.xz"; + sha256 = "02rf8iz2spcc78xs88dknl6a7slwgfgh4ra8lhwk69d210cxgahq"; + name = "powerdevil-5.11.1.tar.xz"; }; }; sddm-kcm = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/sddm-kcm-5.10.5.tar.xz"; - sha256 = "13hld5bndxhs6j3lja08zrc6czvpl4k385i8lb3g9zvn9vrk29sw"; - name = "sddm-kcm-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/sddm-kcm-5.11.1.tar.xz"; + sha256 = "0sac2cknq7m26v8a59q1aakn6xjzmspnslfs6k633a8yz8w4lh19"; + name = "sddm-kcm-5.11.1.tar.xz"; }; }; systemsettings = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/systemsettings-5.10.5.tar.xz"; - sha256 = "0b3wpmfjj2zmi7ickppz32i63dpn4jja3nnjrxn912yw47z4bri2"; - name = "systemsettings-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/systemsettings-5.11.1.tar.xz"; + sha256 = "0bnygmb3g573b7a8g0qg3ddj65miw29v3p25sh0ic9ij5bx6f4rw"; + name = "systemsettings-5.11.1.tar.xz"; }; }; user-manager = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/user-manager-5.10.5.tar.xz"; - sha256 = "1fiih72jafshxgwfq4q9csv1i62mgj35qr87lh6lyady6aghajnq"; - name = "user-manager-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/user-manager-5.11.1.tar.xz"; + sha256 = "1iz5wm8d3ljn97msbh1bc7v8zmmgxrfr5mwfzh0ssdldba4wqlpm"; + name = "user-manager-5.11.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/xdg-desktop-portal-kde-5.10.5.tar.xz"; - sha256 = "0rgv4nqkrwjzvhg8cmkin348n0i6sd4v444bk6j83y4m0lxdi1ba"; - name = "xdg-desktop-portal-kde-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/xdg-desktop-portal-kde-5.11.1.tar.xz"; + sha256 = "0w822jlg0h7qim70zamm7q5x2b614qmiggz9wr8yxq80lajizxnf"; + name = "xdg-desktop-portal-kde-5.11.1.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix deleted file mode 100644 index 3b04c037073d..000000000000 --- a/pkgs/desktops/plasma-5/startkde/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, lib, runCommand, substituteAll, dbus, gnugrep, gnused, kconfig, - kinit, kservice, plasma-desktop, plasma-workspace, xmessage, xprop, xrdb, - xsetroot, qttools, -}: - -let - - inherit (lib) getBin getLib; - - script = substituteAll { - src = ./startkde.sh; - inherit (stdenv) shell; - kbuildsycoca5 = "${getBin kservice}/bin/kbuildsycoca5"; - sed = "${getBin gnused}/bin/sed"; - kcheckrunning = "${getBin plasma-workspace}/bin/kcheckrunning"; - xmessage = "${getBin xmessage}/bin/xmessage"; - kstartupconfig5 = "${getBin plasma-workspace}/bin/kstartupconfig5"; - kapplymousetheme = "${getBin plasma-desktop}/bin/kapplymousetheme"; - xsetroot = "${getBin xsetroot}/bin/xsetroot"; - xrdb = "${getBin xrdb}/bin/xrdb"; - ksplashqml = "${getBin plasma-workspace}/bin/ksplashqml"; - qdbus = "${getBin qttools}/bin/qdbus"; - xprop = "${getBin xprop}/bin/xprop"; - qtpaths = "${getBin qttools}/bin/qtpaths"; - dbus_update_activation_environment = "${getBin dbus}/bin/dbus-update-activation-environment"; - start_kdeinit_wrapper = "${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper"; - kwrapper5 = "${getBin kinit}/bin/kwrapper5"; - ksmserver = "${getBin plasma-workspace}/bin/ksmserver"; - kreadconfig5 = "${getBin kconfig}/bin/kreadconfig5"; - kdeinit5_shutdown = "${getBin kinit}/bin/kdeinit5_shutdown"; - }; - -in - -runCommand "startkde.sh" -{ preferLocalBuild = true; allowSubstitutes = false; } -'' - cp ${script} $out - chmod +x $out -'' diff --git a/pkgs/desktops/plasma-5/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh deleted file mode 100755 index f8b4f4844e23..000000000000 --- a/pkgs/desktops/plasma-5/startkde/startkde.sh +++ /dev/null @@ -1,384 +0,0 @@ -#!@shell@ - -@kbuildsycoca5@ - -# Set the default GTK 2 theme -if ! [ -e $HOME/.gtkrc-2.0 ] \ - && [ -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then - cat >$HOME/.gtkrc-2.0 <<EOF -# Default GTK+ 2 config for NixOS KDE 5 -include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" -style "user-font" -{ - font_name="Sans Serif Regular" -} -widget_class "*" style "user-font" -gtk-font-name="Sans Serif Regular 10" -gtk-theme-name="Breeze" -gtk-icon-theme-name="breeze" -gtk-fallback-icon-theme="hicolor" -gtk-cursor-theme-name="breeze_cursors" -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-menu-images=1 -gtk-button-images=1 -EOF -fi - -if ! [ -e $HOME/.config/gtk-3.0/settings.ini ] \ - && [ -e /run/current-system/sw/share/themes/Breeze/gtk-3.0 ]; then - mkdir -p $HOME/.config/gtk-3.0 - cat >$HOME/.config/gtk-3.0/settings.ini <<EOF -[Settings] -gtk-font-name=Sans Serif Regular 10 -gtk-theme-name=Breeze -gtk-icon-theme-name=breeze -gtk-fallback-icon-theme=hicolor -gtk-cursor-theme-name=breeze_cursors -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-menu-images=1 -gtk-button-images=1 -EOF -fi - -# The KDE icon cache is supposed to update itself -# automatically, but it uses the timestamp on the icon -# theme directory as a trigger. Since in Nix the -# timestamp is always the same, this doesn't work. So as -# a workaround, nuke the icon cache on login. This isn't -# perfect, since it may require logging out after -# installing new applications to update the cache. -# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html -rm -fv $HOME/.cache/icon-cache.kcache - -# Qt writes a weird ‘libraryPath’ line to -# ~/.config/Trolltech.conf that causes the KDE plugin -# paths of previous KDE invocations to be searched. -# Obviously using mismatching KDE libraries is potentially -# disastrous, so here we nuke references to the Nix store -# in Trolltech.conf. A better solution would be to stop -# Qt from doing this wackiness in the first place. -if [ -e $HOME/.config/Trolltech.conf ]; then - @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf -fi - -if test "x$1" = x--failsafe; then - KDE_FAILSAFE=1 # General failsafe flag - KWIN_COMPOSE=N # Disable KWin's compositing - QT_XCB_FORCE_SOFTWARE_OPENGL=1 - export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL -fi - -# When the X server dies we get a HUP signal from xinit. We must ignore it -# because we still need to do some cleanup. -trap 'echo GOT SIGHUP' HUP - -# we have to unset this for Darwin since it will screw up KDE's dynamic-loading -unset DYLD_FORCE_FLAT_NAMESPACE - -# Check if a KDE session already is running and whether it's possible to connect to X -@kcheckrunning@ -kcheckrunning_result=$? -if test $kcheckrunning_result -eq 0 ; then - echo "KDE seems to be already running on this display." - @xmessage@ -geometry 500x100 "KDE seems to be already running on this display." - exit 1 -elif test $kcheckrunning_result -eq 2 ; then - echo "\$DISPLAY is not set or cannot connect to the X server." - exit 1 -fi - -# Boot sequence: -# -# kdeinit is used to fork off processes which improves memory usage -# and startup time. -# -# * kdeinit starts klauncher first. -# * Then kded is started. kded is responsible for keeping the sycoca -# database up to date. When an up to date database is present it goes -# into the background and the startup continues. -# * Then kdeinit starts kcminit. kcminit performs initialisation of -# certain devices according to the user's settings -# -# * Then ksmserver is started which takes control of the rest of the startup sequence - -# We need to create config folder so we can write startupconfigkeys -configDir=$(@qtpaths@ --writable-path GenericConfigLocation) -mkdir -p "$configDir" - -if ! [ -e $configDir/kcminputrc ]; then - cat >$configDir/kcminputrc <<EOF -[Mouse] -cursorTheme=breeze_cursors -cursorSize=0 -EOF -fi - -THEME=org.kde.breeze -#This is basically setting defaults so we can use them with kstartupconfig5 -#We cannot set the equivilant of THEME here as it will generate an -#invalid variable name (with dots) -cat >$configDir/startupconfigkeys <<EOF -kcminputrc Mouse cursorTheme 'breeze_cursors' -kcminputrc Mouse cursorSize '' -ksplashrc KSplash Theme ${THEME}.desktop -ksplashrc KSplash Engine KSplashQML -kdeglobals KScreen ScreenScaleFactors '' -kcmfonts General forceFontDPI 0 -kcmfonts General dontChangeAASettings true -EOF - -# preload the user's locale on first start -plasmalocalerc=$configDir/plasma-localerc -test -f $plasmalocalerc || { -cat >$plasmalocalerc <<EOF -[Formats] -LANG=$LANG -EOF -} - -# export LC_* variables set by kcmshell5 formats into environment -# so it can be picked up by QLocale and friends. -exportformatssettings=$configDir/plasma-locale-settings.sh -test -f $exportformatssettings && { - . $exportformatssettings -} - -# Write a default kdeglobals file to set up the font -kdeglobalsfile=$configDir/kdeglobals -test -f $kdeglobalsfile || { -cat >$kdeglobalsfile <<EOF -[General] -fixed=Monospace,10,-1,5,50,0,0,0,0,0,Regular -font=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular -menuFont=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular -smallestReadableFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular -toolBarFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular - -[WM] -activeFont=Noto Sans,12,-1,5,50,0,0,0,0,0,Bold -EOF -} - -@kstartupconfig5@ -returncode=$? -if test $returncode -ne 0; then - @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." - exit 1 -fi -[ -r $configDir/startupconfig ] && . $configDir/startupconfig - -if [ "$kdeglobals_kscreen_screenscalefactors" ]; then - export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors" -fi -#Manually disable auto scaling because we are scaling above -#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us -export QT_AUTO_SCREEN_SCALE_FACTOR=0 - -XCURSOR_PATH=~/.icons -IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" -for xdgDir in "${xdgDirs[@]}"; do - XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" -done -export XCURSOR_PATH - -# XCursor mouse theme needs to be applied here to work even for kded or ksmserver -if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then - - @kapplymousetheme@ "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" - if test $? -eq 10; then - XCURSOR_THEME=breeze_cursors - export XCURSOR_THEME - elif test -n "$kcminputrc_mouse_cursortheme"; then - XCURSOR_THEME="$kcminputrc_mouse_cursortheme" - export XCURSOR_THEME - fi - if test -n "$kcminputrc_mouse_cursorsize"; then - XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" - export XCURSOR_SIZE - fi -fi - -unset THEME - -# Set a left cursor instead of the standard X11 "X" cursor, since I've heard -# from some users that they're confused and don't know what to do. This is -# especially necessary on slow machines, where starting KDE takes one or two -# minutes until anything appears on the screen. -# -# If the user has overwritten fonts, the cursor font may be different now -# so don't move this up. -# -@xsetroot@ -cursor_name left_ptr - -if test "$kcmfonts_general_forcefontdpi" -ne 0; then - @xrdb@ -quiet -merge -nocpp <<EOF -Xft.dpi: $kcmfonts_general_forcefontdpi -EOF -fi - -dl=$DESKTOP_LOCKED -unset DESKTOP_LOCKED # Don't want it in the environment - -ksplash_pid= -if test -z "$dl"; then - # the splashscreen and progress indicator - case "$ksplashrc_ksplash_engine" in - KSplashQML) - ksplash_pid=$(@ksplashqml@ "${ksplashrc_ksplash_theme}" --pid) - ;; - None) - ;; - *) - ;; - esac -fi - -echo 'startkde: Starting up...' 1>&2 - -# Make sure that D-Bus is running -if @qdbus@ >/dev/null 2>/dev/null; then - : # ok -else - echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" - exit 1 -fi - -# Mark that full KDE session is running (e.g. Konqueror preloading works only -# with full KDE running). The KDE_FULL_SESSION property can be detected by -# any X client connected to the same X session, even if not launched -# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION -# however guarantees that the application is launched in the same environment -# like the KDE session and that e.g. KDE utilities/libraries are available. -# KDE_FULL_SESSION property is also only available since KDE 3.5.5. -# The matching tests are: -# For $KDE_FULL_SESSION: -# if test -n "$KDE_FULL_SESSION"; then ... whatever -# For KDE_FULL_SESSION property: -# xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null -# if test $? -eq 0; then ... whatever -# -# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid -# of the user running the KDE session. It should be rarely needed (e.g. -# after sudo to prevent desktop-wide functionality in the new user's kded). -# -# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number. -# Note that this didn't exist in KDE3, which can be detected by its absense and -# the presence of KDE_FULL_SESSION. -# -KDE_FULL_SESSION=true -export KDE_FULL_SESSION -@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - -KDE_SESSION_VERSION=5 -export KDE_SESSION_VERSION -@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - -KDE_SESSION_UID=$(id -ru) -export KDE_SESSION_UID - -XDG_CURRENT_DESKTOP=KDE -export XDG_CURRENT_DESKTOP - -# Source scripts found in <config locations>/plasma-workspace/env/*.sh -# (where <config locations> correspond to the system and user's configuration -# directories, as identified by Qt's qtpaths, e.g. $HOME/.config -# and /etc/xdg/ on Linux) -# -# This is where you can define environment variables that will be available to -# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` -# or eval `gpg-agent --daemon`. -# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script -# -# (see end of this file). -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - -IFS=":" read -r -a scriptpath <<< $(@qtpaths@ --paths GenericConfigLocation) -# Add /env/ to the directory to locate the scripts to be sourced -for prefix in "${scriptpath[@]}"; do - for file in "$prefix"/plasma-workspace/env/*.sh; do - test -r "$file" && . "$file" || true - done -done - -# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@dbus_update_activation_environment@ --systemd --all -if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@ -geometry 500x100 "Could not sync environment to dbus." - exit 1 -fi - -# We set LD_BIND_NOW to increase the efficiency of kdeinit. -# kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup -if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation." - exit 1 -fi - -@qdbus@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit - -# finally, give the session control to the session manager -# see kdebase/ksmserver for the description of the rest of the startup sequence -# if the KDEWM environment variable has been set, then it will be used as KDE's -# window manager instead of kwin. -# if KDEWM is not set, ksmserver will ensure kwin is started. -# kwrapper5 is used to reduce startup time and memory usage -# kwrapper5 does not return useful error codes such as the exit code of ksmserver. -# We only check for 255 which means that the ksmserver process could not be -# started, any problems thereafter, e.g. ksmserver failing to initialize, -# will remain undetected. -test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" -# If the session should be locked from the start (locked autologin), -# lock now and do the rest of the KDE startup underneath the locker. -KSMSERVEROPTIONS="" -test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" -@kwrapper5@ @ksmserver@ $KDEWM $KSMSERVEROPTIONS -if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation." -fi - -wait_drkonqi=$(@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - -if test x"$wait_drkonqi"x = x"true"x ; then - # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900) - wait_drkonqi_counter=0 - while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way - @qdbus@ | grep 'org.kde.drkonqi-' | while read address ; do - @qdbus@ "$address" "/MainApplication" "quit" - done - break - fi - done -fi - -echo 'startkde: Shutting down...' 1>&2 -# just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - -# Clean up -@kdeinit5_shutdown@ - -unset KDE_FULL_SESSION -@xprop@ -root -remove KDE_FULL_SESSION -unset KDE_SESSION_VERSION -@xprop@ -root -remove KDE_SESSION_VERSION -unset KDE_SESSION_UID - -echo 'startkde: Done.' 1>&2 diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index a24eabc39f31..954a8f9f45ba 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -1,7 +1,8 @@ { mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2 + kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, + kactivities, kactivities-stats, kirigami2 }: mkDerivation { @@ -10,6 +11,7 @@ mkDerivation { buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 + kactivities kactivities-stats kirigami2 ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 0a0f8bbf0824..17f068c1c6f4 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8"; }; + enableParallelBuilding = true; makeFlags = - [ "DESTDIR=$(out)" "ICEBOX=${icestorm}/share/icebox" + [ "PREFIX=$(out)" "ICEBOX=${icestorm}/share/icebox" ]; meta = { diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index f6e52a59fe59..62b2e7c18508 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,30 +1,44 @@ -{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python27, zlib +{ lib, stdenv, makeWrapper, fetchurl, requireFile, patchelf, perl, ncurses, expat, python27, zlib +, gcc48, gcc49, gcc5, gcc6 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: let common = - { version, url, sha256 + args@{ gcc, version, sha256 + , url ? "" + , name ? "" + , developerProgram ? false , python ? python27 }: stdenv.mkDerivation rec { name = "cudatoolkit-${version}"; + inherit (args) version; dontPatchELF = true; dontStrip = true; src = - if stdenv.system == "x86_64-linux" then - fetchurl { - inherit url sha256; + if developerProgram then + requireFile { + message = '' + This nix expression requires that ${args.name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit + at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory: + nix-prefetch-url file://${args.name} + ''; + inherit (args) name sha256; } - else throw "cudatoolkit does not support platform ${stdenv.system}"; + else + fetchurl { + inherit (args) url sha256; + }; outputs = [ "out" "lib" "doc" ]; - buildInputs = [ perl ]; + nativeBuildInputs = [ perl makeWrapper ]; runtimeDependencies = [ ncurses expat python zlib glibc @@ -37,8 +51,8 @@ let unpackPhase = '' sh $src --keep --noexec cd pkg/run_files - sh cuda-linux64-rel-${version}-*.run --keep --noexec - sh cuda-samples-linux-${version}-*.run --keep --noexec + sh cuda-linux*.run --keep --noexec + sh cuda-samples*.run --keep --noexec cd pkg ''; @@ -92,15 +106,25 @@ let # Remove OpenCL libraries as they are provided by ocl-icd and driver. rm -f $out/lib64/libOpenCL* + # Set compiler for NVCC. + wrapProgram $out/bin/nvcc \ + --prefix PATH : ${gcc}/bin '' + lib.optionalString (lib.versionOlder version "8.0") '' # Hack to fix building against recent Glibc/GCC. echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook ''; + passthru = { + cc = gcc; + majorVersion = + let versionParts = lib.splitString "." version; + in "${lib.elemAt versionParts 0}.${lib.elemAt versionParts 1}"; + }; + meta = with stdenv.lib; { description = "A compiler for NVIDIA GPUs, math libraries, and tools"; - homepage = https://developer.nvidia.com/cuda-toolkit; - platforms = platforms.linux; + homepage = "https://developer.nvidia.com/cuda-toolkit"; + platforms = [ "x86_64-linux" ]; license = licenses.unfree; }; }; @@ -109,32 +133,44 @@ in { cudatoolkit6 = common { version = "6.0.37"; - url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run; + url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run"; sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40"; + gcc = gcc48; }; cudatoolkit65 = common { version = "6.5.19"; - url = http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run; + url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run"; sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj"; + gcc = gcc48; }; cudatoolkit7 = common { version = "7.0.28"; - url = http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run; + url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run"; sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi"; + gcc = gcc49; }; cudatoolkit75 = common { version = "7.5.18"; - url = http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run; + url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run"; sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88"; + gcc = gcc49; }; cudatoolkit8 = common { version = "8.0.61"; - url = https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run; + url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; + gcc = gcc5; + }; + + cudatoolkit9 = common { + version = "9.0.176"; + url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; + sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + gcc = gcc6; }; } diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index aff9cd9711b8..ff989ea22c40 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -2,5 +2,4 @@ bootPkgs.callPackage ./base.nix { inherit bootPkgs; - broken = true; # https://hydra.nixos.org/build/62184741 } diff --git a/pkgs/development/compilers/ghcjs/ghcjs-head.patch b/pkgs/development/compilers/ghcjs/ghcjs-head.patch new file mode 100644 index 000000000000..bbb5b30468cb --- /dev/null +++ b/pkgs/development/compilers/ghcjs/ghcjs-head.patch @@ -0,0 +1,86 @@ +diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs +index db8b12e..7b815c5 100644 +--- a/src-bin/Boot.hs ++++ b/src-bin/Boot.hs +@@ -540,9 +540,7 @@ initPackageDB :: B () + initPackageDB = do + msg info "creating package databases" + initDB "--global" <^> beLocations . blGlobalDB +- traverseOf_ _Just initUser <^> beLocations . blUserDBDir + where +- initUser dir = rm_f (dir </> "package.conf") >> initDB "--user" (dir </> "package.conf.d") + initDB dbName db = do + rm_rf db >> mkdir_p db + ghcjs_pkg_ ["init", toTextI db] `catchAny_` return () +@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do + msgD info $ "preparing development boot tree" + checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do + testGit "ghcjs-boot" >>= \case +- Just False -> failWith "ghcjs-boot already exists and is not a git repository" +- Just True -> do +- msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning" +- rm_rf "ghcjs-boot" ++ Just _ -> do ++ msg info "ghcjs-boot repository already exists; initializing ghcjs-boot" + initGhcjsBoot + Nothing -> do + msgD info "cloning ghcjs-boot git repository" + initGhcjsBoot + checkpoint' "shims-git" "shims repository already cloned" $ do + testGit "shims" >>= \case +- Just False -> failWith "shims already exists and is not a git repository" +- Just True -> do +- msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning" +- rm_rf "shims" +- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev ++ Just _ -> do ++ msgD info "shims repository already exists; moving on" + Nothing -> do + msgD info "cloning shims git repository" + cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev + where + initGhcjsBoot = sub $ do +- cloneGit bootDescr "ghcjs-boot" bsrcBootDevBranch bsrcBootDev + cd "ghcjs-boot" +- git_ ["submodule", "update", "--init", "--recursive"] + mapM_ patchPackage =<< allPackages + preparePrimops + buildGenPrim +@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do + , "--avoid-reinstalls" + , "--builddir", "dist" + , "--with-compiler", ghcjs ^. pgmLocText ++ , "--with-gcc", "@CC@" + , "--with-hc-pkg", ghcjsPkg ^. pgmLocText +- , "--prefix", toTextI instDir ++ , "--prefix", "@PREFIX@" ++ , "--libdir", "$prefix/lib/$compiler" ++ , "--libsubdir", "$pkgid" + , bool haddock "--enable-documentation" "--disable-documentation" + , "--haddock-html" +--- workaround for hoogle support being broken in haddock for GHC 7.10RC1 +-#if !(__GLASGOW_HASKELL__ >= 709) + , "--haddock-hoogle" +-#endif + , "--haddock-hyperlink-source" + -- don't slow down Windows builds too much, on other platforms we get this more + -- or less for free, thanks to dynamic-too +diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs +index 33a401f..e2405a7 100644 +--- a/src/Compiler/Info.hs ++++ b/src/Compiler/Info.hs +@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do + + -- | the directory to use if started without -B flag + getDefaultTopDir :: IO FilePath +-getDefaultTopDir = do +- appdir <- getAppUserDataDirectory "ghcjs" +- return (appdir </> subdir </> "ghcjs") +- where +- targetARCH = arch +- targetOS = os +- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion ++getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@" + + getDefaultLibDir :: IO FilePath + getDefaultLibDir = getDefaultTopDir diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch index bbb5b30468cb..9f4fa3a8b7ae 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/ghcjs.patch @@ -46,6 +46,24 @@ index db8b12e..7b815c5 100644 mapM_ patchPackage =<< allPackages preparePrimops buildGenPrim +@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do + globalFlags <- cabalGlobalFlags + flags <- cabalInstallFlags (length pkgs == 1) + let args = globalFlags ++ ("install" : pkgs) ++ +- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages ++ [ "--allow-boot-library-installs" + ] ++ map ("--configure-option="<>) configureOpts ++ flags + checkInstallPlan pkgs args + cabal_ args +@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do + -- uses somewhat fragile parsing of --dry-run output, find a better way + checkInstallPlan :: [Package] -> [Text] -> B () + checkInstallPlan pkgs opts = do +- plan <- cabal (opts ++ ["-v2", "--dry-run"]) ++ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"]) + when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan) + where + hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls @@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do , "--avoid-reinstalls" , "--builddir", "dist" diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 7f725a3a9adf..2cf6c8b39c24 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -45,4 +45,6 @@ bootPkgs.callPackage ./base.nix { "unix" ]; stage2 = import ./head_stage2.nix; + + patches = [ ./ghcjs-head.patch ]; } diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index fef41d33d080..4499a9126a0c 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,42 +21,42 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "144"; - build = "01"; + update = "152"; + build = "16"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "08b7ia2ifvcl8xnpflf019ak3xcbdjnxcy1mhfp3nbfsbk2sia45"; + sha256 = "12r5v6srwbm5hcfwz5kib7419a72cppls1d1xkrh5pjlina74zpf"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0g7q6ljvn79psrcak3l4imd27w047ngavn9jcn3xwivg5wppsfks"; + sha256 = "002f0nfw2g3q41iy8cvaqyiglcy1fx9dglgik8gv067c2zslwwqm"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "1hbbzf0m2a78dm8pyvc11jwfpj7q67pvjrp3hf0cnc38k9mzrn8q"; + sha256 = "0mnck2c3ky4hbcjfy6p3z831dxm1y2fkxq5k94zbswm4wcvlkzia"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1znc0prsb814ggm6qjgbsykm864mwypnxgi9w9f9riq8gs0578gh"; + sha256 = "1xl3mc3hd5lwh1bxzck4hw60d678h3mjh144kq90iz8kfi197hpj"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0gx5md1v1jmqhdwcc7smpf46sgp4alvb6jz3n6yjlcyfzk92yi78"; + sha256 = "1hsfgjhp5nrsy4v6c282wq6cv37hgpm8l51cls0rnpbfqvd2cw16"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0ad9w7gnwlpdssw2p3kfny02mmvzc6z8i2n7qq0177ml48c88iji"; + sha256 = "07ispgrzcf39nxs7a9yn6gkbq0ygdzlzyq32sfk57w6vy1mrgwjh"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "14yzbbishsyrzmymws6mnndqj6hvs69ivfdbjhgwi0wl23g9siym"; + sha256 = "1kj5w6gk579wh1iszq2bn6k1ib7kjpjf1lp46p5rqkx0qin79sn9"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "175q29n4bfmm1cyyga7x58zhh6ann9rm3wibw0scrhgy23lx052x"; + sha256 = "1j9r5r8rihp02n0ciwqr01c07d91z1hs0069rd8hk6i03dkkhk84"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 0d12b3ac89b0..f8f37160a26f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "144"; + patchVersion = "151"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32"; - sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8"; + sha256_i686 = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0"; + sha256_x86_64 = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7"; sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 0d12b3ac89b0..863621bf6b07 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "144"; + patchVersion = "152"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32"; - sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8"; + sha256_i686 = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w"; + sha256_x86_64 = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1"; sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix index 7f0a5750c0e8..fbda96e14258 100644 --- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix @@ -30,7 +30,7 @@ assert stdenv.system == "x86_64-linux"; assert swingSupport -> xorg != null; let - version = "9"; + version = "9.0.1"; downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; @@ -63,19 +63,19 @@ let result = stdenv.mkDerivation rec { requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jdk9-downloads-3848520.html"; - sha256 = "0vbgy7h9h089l3xh6sl57v57g28x1djyiigqs4z6gh7wahx7hv8w"; + sha256 = "0560dc3icrwb0ifykshvzkr04b1jr153m26x1r8rp0nhjbzz1nic"; } else if packageType == "JRE" then requireFile { name = "jre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jre9-downloads-3848532.html"; - sha256 = "18i4jjb6sby67xg5ql6dkk3ja1nackbb23g1bnp522450nclpxdb"; + sha256 = "11pfcck8am48yv7riaj10g6h79xdiy8lm5a9wjqbm3g9cls9ar1w"; } else if packageType == "ServerJRE" then requireFile { name = "serverjre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/server-jre9-downloads-3848530.html"; - sha256 = "01bxi7lx13lhlpbifw93b6r7a9bayiykw8kzwlyyqi8pz3pw8c5h"; + sha256 = "1biyks6jy0a2kksaj9qbsjifv34ym5mdw8akibmkwr1xh0wavygc"; } else abort "unknown package Type ${packageType}"; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 63c1d97006f3..8c744e7038e8 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.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0aishczaasp877z1a17iq0vk6pp369bv7yz5mvinr7wm44930qr3"; + sha256 = "0shln9v0bp0q9qfipm3834vl284q5vwz9333yzgx46d0l2ivggyi"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index d4d4a0f31bc5..7622fbb9d18d 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.3"; + name = "scala-2.12.4"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "133w4r2214ci7r4sg2yyk9lhn62ldm4ad0d89drwrvgvffvnly9b"; + sha256 = "089a54qj8psh4jxqbrrwk5zahw13fyqq24l87s3031xa675a0m4m"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 217b2aecd334..c56ea8cc6495 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; - enableParallelBuilding = true; + # in 1.0.0: parser.hh:40:0: error: unterminated #ifndef + enableParallelBuilding = false; # See https://github.com/souffle-lang/souffle/issues/176 hardeningDisable = [ "fortify" ]; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 4d6555213345..e88246ecb939 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,9 +2,9 @@ with stdenv.lib; let - date = "20170924"; - rev = "1443039416dd02750765efde1af35e31c8d41be3"; - sha256 = "060l0f77hirq3i5bg294gxcszlvyn89ds2q21jwgy3ryrapfbl8i"; + date = "20171016"; + rev = "da8c62f75d893449e232944fc62566c020b4d010"; + sha256 = "0pdvyhrx7g9imxpc7gr75116imi6ifn0ihsl4fbffsji2dpi61y2"; version = "0.9.27pre-${date}"; in diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix new file mode 100644 index 000000000000..6f0c6d19e450 --- /dev/null +++ b/pkgs/development/compilers/zig/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, llvmPackages_5, llvm_5 }: + +stdenv.mkDerivation rec { + version = "0.1.1"; + name = "zig-${version}"; + + src = fetchFromGitHub { + owner = "zig-lang"; + repo = "zig"; + rev = "${version}"; + sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; + }; + + buildInputs = [ cmake llvmPackages_5.clang-unwrapped llvm_5 ]; + + cmakeFlags = [ + "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" + "-DZIG_LIBC_LIB_DIR=${stdenv.cc.libc}/lib" + "-DCMAKE_BUILD_TYPE=Release" + "-DZIG_EACH_LIB_RPATH=On" + ]; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) -DZIG_DYNAMIC_LINKER=$(cc -print-file-name=ld-linux-x86-64.so.2)" + ''; + + meta = with stdenv.lib; { + description = "Programming languaged designed for robustness, optimality, and clarity"; + homepage = http://ziglang.org/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.andrewrk ]; + }; +} diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 30ec69ba6537..092337125a4d 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "coq${coq.coq-version}-flocq-${version}"; - version = "2.5.2"; + version = "2.6.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36199/flocq-2.5.2.tar.gz; - sha256 = "0h5mlasirfzc0wwn2isg4kahk384n73145akkpinrxq5jsn5d22h"; + url = https://gforge.inria.fr/frs/download.php/file/37054/flocq-2.6.0.tar.gz; + sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3"; }; buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 28743ca9481e..a439edecf0d6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -891,9 +891,8 @@ self: super: { # https://github.com/danidiaz/tailfile-hinotify/issues/2 tailfile-hinotify = dontCheck super.tailfile-hinotify; - # build liquidhaskell with the proper (old) aeson version - liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; }; - aeson_0_11_3_0 = super.aeson_0_11_3_0.override { base-orphans = self.base-orphans_0_5_4; }; + # build liquidhaskell with the proper (new) aeson version + liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_2_0; }; # Test suite fails: https://github.com/lymar/hastache/issues/46. # Don't install internal mkReadme tool. @@ -967,4 +966,11 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/15 json-autotype = doJailbreak super.json-autotype; + # Depends on broken fluid. + fluid-idl-http-client = markBroken super.fluid-idl-http-client; + + # depends on amqp >= 0.17 + amqp-utils = super.amqp-utils.override { + amqp = dontCheck super.amqp_0_18_1; + }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 482d75796150..7e286926af0e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.8 + # LTS Haskell 9.9 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -191,7 +191,7 @@ default-package-overrides: - async-dejafu ==0.1.3.0 - async-extra ==0.2.0.0 - async-refresh ==0.2.0.2 - - async-refresh-tokens ==0.3.0.0 + - async-refresh-tokens ==0.3.0.1 - async-timer ==0.1.4.0 - atom-basic ==0.2.5 - atom-conduit ==0.4.0.3 @@ -225,7 +225,7 @@ default-package-overrides: - base64-bytestring ==1.0.0.1 - base64-string ==0.2 - base-compat ==0.9.3 - - basement ==0.0.2 + - basement ==0.0.3 - base-noprelude ==4.9.1.0 - base-orphans ==0.6 - base-prelude ==1.2.0.1 @@ -730,7 +730,7 @@ default-package-overrides: - forma ==0.2.0 - format-numbers ==0.1.0.0 - formatting ==6.2.5 - - foundation ==0.0.15 + - foundation ==0.0.16 - Frames ==0.1.9 - free ==4.12.4 - freenect ==1.2.1 @@ -773,7 +773,7 @@ default-package-overrides: - ghc-tcplugins-extra ==0.2.1 - ghc-typelits-extra ==0.2.3 - ghc-typelits-knownnat ==0.3.1 - - ghc-typelits-natnormalise ==0.5.3 + - ghc-typelits-natnormalise ==0.5.4 - gi-atk ==2.0.14 - gi-cairo ==1.0.14 - gi-gdk ==3.0.14 @@ -962,7 +962,7 @@ default-package-overrides: - happstack-jmacro ==7.0.12 - happstack-server ==7.4.6.4 - happstack-server-tls ==7.1.6.4 - - happy ==1.19.7 + - happy ==1.19.8 - harp ==0.4.3 - hasbolt ==0.1.3.0 - hashable ==1.2.6.1 @@ -995,11 +995,11 @@ default-package-overrides: - haskell-tools-refactor ==0.8.1.0 - haskell-tools-rewrite ==0.8.1.0 - haskintex ==0.7.0.1 - - hasmin ==0.3.2.4 + - hasmin ==0.3.3 - hasql ==0.19.18.2 - hasql-migration ==0.1.3 - hasql-pool ==0.4.1 - - hasql-transaction ==0.5 + - hasql-transaction ==0.5.1 - hastache ==0.6.1 - hasty-hamiltonian ==1.3.0 - HaTeX ==3.17.3.1 @@ -1692,7 +1692,7 @@ default-package-overrides: - postgresql-simple ==0.5.3.0 - postgresql-simple-migration ==0.1.11.0 - postgresql-simple-opts ==0.2.0.2 - - postgresql-simple-queue ==0.5.0.1 + - postgresql-simple-queue ==0.5.1.1 - postgresql-simple-url ==0.2.0.0 - postgresql-transactional ==1.1.1 - postgresql-typed ==0.5.1 @@ -1851,7 +1851,7 @@ default-package-overrides: - rest-wai ==0.2.0.1 - result ==0.2.6.0 - rethinkdb ==2.2.0.10 - - rethinkdb-client-driver ==0.0.24 + - rethinkdb-client-driver ==0.0.25 - retry ==0.7.4.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 @@ -2326,7 +2326,7 @@ default-package-overrides: - versions ==3.1.1 - vhd ==0.2.2 - ViennaRNAParser ==1.3.2 - - viewprof ==0.0.0.9 + - viewprof ==0.0.0.10 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - void ==0.7.2 @@ -2517,10 +2517,8 @@ default-package-overrides: extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier - - aeson < 1 # required by liquidhaskell-0.8.0.0 - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - - base-orphans < 0.6 # required by liquidhaskell-0.8.0.0 - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - Cabal == 1.18.* # required for cabal-install et al on old GHC versions @@ -2852,7 +2850,6 @@ dont-distribute-packages: AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - amqp-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ] anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3497,6 +3494,9 @@ dont-distribute-packages: collections: [ i686-linux, x86_64-linux, x86_64-darwin ] colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] + colorless-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + colorless-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + colorless: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3940,6 +3940,7 @@ dont-distribute-packages: docker: [ i686-linux, x86_64-linux, x86_64-darwin ] dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] + doctest-driver-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] docvim: [ i686-linux, x86_64-linux, x86_64-darwin ] DOH: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4295,6 +4296,7 @@ dont-distribute-packages: fordo: [ i686-linux, x86_64-linux, x86_64-darwin ] forecast-io: [ i686-linux, x86_64-linux, x86_64-darwin ] foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ] + forest-fire: [ i686-linux, x86_64-linux, x86_64-darwin ] forger: [ i686-linux, x86_64-linux, x86_64-darwin ] forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] ForkableT: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4553,7 +4555,9 @@ dont-distribute-packages: goatee: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-games: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-youtube: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4603,6 +4607,7 @@ dont-distribute-packages: graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] graphite: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphql-api: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4655,7 +4660,8 @@ dont-distribute-packages: GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview3: [ "x86_64-darwin" ] + gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtksourceview3: [ i686-linux, x86_64-linux, x86_64-darwin ] guarded-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] guid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4724,6 +4730,7 @@ dont-distribute-packages: hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-shortcode: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5018,6 +5025,7 @@ dont-distribute-packages: herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ] hesh: [ i686-linux, x86_64-linux, x86_64-darwin ] hesql: [ i686-linux, x86_64-linux, x86_64-darwin ] + heterolist: [ i686-linux, x86_64-linux, x86_64-darwin ] hetris: [ i686-linux, x86_64-linux, x86_64-darwin ] heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6019,6 +6027,7 @@ dont-distribute-packages: log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-warper: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6073,6 +6082,7 @@ dont-distribute-packages: lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] + lxd-client-config: [ i686-linux, x86_64-linux, x86_64-darwin ] lxd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6195,6 +6205,7 @@ dont-distribute-packages: Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] metronome: [ i686-linux, x86_64-linux, x86_64-darwin ] + mezzo: [ i686-linux, x86_64-linux, x86_64-darwin ] mezzolens: [ i686-linux, x86_64-linux, x86_64-darwin ] mgeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6425,6 +6436,7 @@ dont-distribute-packages: neet: [ i686-linux, x86_64-linux, x86_64-darwin ] nehe-tuts: [ i686-linux, x86_64-linux, x86_64-darwin ] neither: [ i686-linux, x86_64-linux, x86_64-darwin ] + neko-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Neks: [ i686-linux, x86_64-linux, x86_64-darwin ] nemesis-titan: [ i686-linux, x86_64-linux, x86_64-darwin ] nerf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6855,6 +6867,7 @@ dont-distribute-packages: posix-timer: [ "x86_64-darwin" ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgres-embedded: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7036,6 +7049,7 @@ dont-distribute-packages: rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] + rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] raml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7109,6 +7123,7 @@ dont-distribute-packages: record: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] + recursion-schemes-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] recursors: [ i686-linux, x86_64-linux, x86_64-darwin ] reddit: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7252,6 +7267,7 @@ dont-distribute-packages: robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] roc-cluster-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] roc-cluster: [ i686-linux, x86_64-linux, x86_64-darwin ] + rocksdb-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7410,6 +7426,7 @@ dont-distribute-packages: seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] + serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] serpentine: [ i686-linux, x86_64-linux, x86_64-darwin ] serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7422,6 +7439,7 @@ dont-distribute-packages: servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7436,6 +7454,7 @@ dont-distribute-packages: servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-rawm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7671,6 +7690,7 @@ dont-distribute-packages: spata: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + species: [ i686-linux, x86_64-linux, x86_64-darwin ] speculate: [ "x86_64-darwin" ] spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ] sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7957,6 +7977,7 @@ dont-distribute-packages: tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] texbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8142,6 +8163,7 @@ dont-distribute-packages: tx: [ i686-linux, x86_64-linux, x86_64-darwin ] txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] + tyfam-witnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8615,6 +8637,7 @@ dont-distribute-packages: yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-dynamic-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-frontend-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1051c4e416f1..8146674a9435 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -503,4 +503,8 @@ self: super: builtins.intersectAttrs super { # Written against the 6.X series of megaparsec htoml-megaparsec = super.htoml-megaparsec.override { megaparsec = self.megaparsec_6_2_0; }; + + # Break cyclic reference that results in an infinite recursion. + partial-semigroup = dontCheck super.partial-semigroup; + } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f0fcff013a28..a59b296b8f37 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -20049,10 +20049,8 @@ self: { }: mkDerivation { pname = "accelerate-io"; - version = "1.0.0.0"; - sha256 = "0h5nr0n1cdch20ld7s7mchr7wciasac4rmf4w2z61a48nj2knayi"; - revision = "1"; - editedCabalFile = "0k8zwri66bsjiarmp0s4lvv67ja8ip8qg5kzhzw17n22m21ww0dq"; + version = "1.0.0.1"; + sha256 = "1q3l4k4h6p8y9w6qzxjanm5ww3ncz236fna2kqdqndyv18b8v9pm"; libraryHaskellDepends = [ accelerate array base bmp bytestring repa vector ]; @@ -20072,6 +20070,8 @@ self: { pname = "accelerate-llvm"; version = "1.1.0.0"; sha256 = "1x42gaafdm998k3x9qfpv8qb5jn7mh5h8rim3ywaj5cm9fk280qw"; + revision = "1"; + editedCabalFile = "1h26kcajp26w72fhl31i3bagdyn20za4qpb26fb90v15iygq9q46"; libraryHaskellDepends = [ abstract-deque accelerate base bytestring chaselev-deque containers data-default-class deepseq directory dlist exceptions fclabels @@ -20093,6 +20093,8 @@ self: { pname = "accelerate-llvm-native"; version = "1.1.0.1"; sha256 = "0hxws9lsmcsrhj0gxwnl86mcsg8x7wyv13lbb2lrglkychqkkv5l"; + revision = "1"; + editedCabalFile = "1kqv7bpa3mm4qzc141z5kqq934930b1cv2djr9m2ycwvb3y8ysfl"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring Cabal cereal containers directory dlist fclabels filepath ghc ghc-prim hashable libffi @@ -20114,6 +20116,8 @@ self: { pname = "accelerate-llvm-ptx"; version = "1.1.0.0"; sha256 = "1av0s4wgq7l2jhkmg7cmr1fivwqankqgyjikpwg1q569dapfrasw"; + revision = "1"; + editedCabalFile = "1zap2f9xalxqgc3pkzmq7ykpiini1q4d02kyxibnwbh9cyk1kkvp"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring containers cuda deepseq directory dlist fclabels file-embed filepath hashable llvm-hs @@ -21251,35 +21255,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson_0_11_3_0" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring - , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl - , QuickCheck, quickcheck-instances, scientific, syb, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson"; - version = "0.11.3.0"; - sha256 = "1sgcjmf945hazdfx7iyr60w0x9l3y292q2k13zcjihl1g32zl9pk"; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq dlist fail ghc-prim - hashable mtl scientific syb tagged template-haskell text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base base-orphans bytestring containers ghc-prim - hashable HUnit QuickCheck quickcheck-instances tagged - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aeson" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory @@ -25992,8 +25967,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.2.4.2"; - sha256 = "1llbwhws24k8ca22v3zfpz8jzbr1wj92vvwqypqv1iig03bgbbvh"; + version = "0.2.4.3"; + sha256 = "01l9q8wbxiad3r1k2s8y3r08aq12148wr84y565s8i3y3w8ff8fp"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -28274,29 +28249,6 @@ self: { }: mkDerivation { pname = "async-refresh-tokens"; - version = "0.3.0.0"; - sha256 = "11kwkqxxqipfl193wk1a441r8jr6h1lj50xrzmpjhqmacwr212nm"; - libraryHaskellDepends = [ - async-refresh base bytestring formatting lifted-async microlens - microlens-th monad-control monad-logger safe-exceptions stm text - ]; - testHaskellDepends = [ - base criterion HUnit monad-logger stm test-framework - test-framework-hunit - ]; - homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; - description = "Package implementing core logic for refreshing of expiring access tokens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "async-refresh-tokens_0_3_0_1" = callPackage - ({ mkDerivation, async-refresh, base, bytestring, criterion - , formatting, HUnit, lifted-async, microlens, microlens-th - , monad-control, monad-logger, safe-exceptions, stm, test-framework - , test-framework-hunit, text - }: - mkDerivation { - pname = "async-refresh-tokens"; version = "0.3.0.1"; sha256 = "15m7zrdnla5rjrm33zp1054virx9v58sz8zi89ja7iza8hfwdvdx"; libraryHaskellDepends = [ @@ -28310,7 +28262,6 @@ self: { homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; description = "Package implementing core logic for refreshing of expiring access tokens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-timer" = callPackage @@ -30459,8 +30410,8 @@ self: { }: mkDerivation { pname = "azubi"; - version = "0.2.0.2"; - sha256 = "00jnj7wfb588q6pll8l39prmn335cfcd5j1wwlcfanbznpz02nav"; + version = "0.2.0.3"; + sha256 = "00w3bbm2li3hdjqqww7m1chq3cpbqly3gl8y7sx469356rzils52"; libraryHaskellDepends = [ base Diff directory filepath options process unix ]; @@ -31218,20 +31169,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base-orphans_0_5_4" = callPackage - ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: - mkDerivation { - pname = "base-orphans"; - version = "0.5.4"; - sha256 = "0qv20n4yabg7sc3rs2dd46a53c7idnd88by7n3s36dkbc21m41q4"; - libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/haskell-compat/base-orphans#readme"; - description = "Backwards-compatible orphan instances for base"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "base-orphans" = callPackage ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { @@ -31442,8 +31379,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; - version = "0.0.2"; - sha256 = "01jvdi7xb61jgrq64ll325mvhibmm2q8nllq7aicy13mwxqgcyac"; + version = "0.0.3"; + sha256 = "06jwanjdd3dw2n6i1c77513abin113f90nsj9vals8krgvq8jnr7"; libraryHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell-foundation/foundation"; description = "Foundation scrap box of array & string"; @@ -36180,6 +36117,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bool8" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "bool8"; + version = "0.0.1.1"; + sha256 = "0hrh3sh19hjdjjm5g1xwvhkf8l13qdrdrxvnylh8sn3d54krhixw"; + libraryHaskellDepends = [ base ]; + description = "Alternative Bool type stored as byte"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "boolean-like" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , semigroups, text, vector @@ -38490,8 +38438,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.35.9"; - sha256 = "1d7xd9v8gc0ahyx557470dw01s3zs6vz594a4hy95bgx5d45s357"; + version = "4.36"; + sha256 = "0kwn0drd57wkpz2xl4n8104zc8zjf32gab6sks9vg03zhy4hjvwq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43398,6 +43346,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clang-compilation-database" = callPackage + ({ mkDerivation, aeson, base, bytestring, text }: + mkDerivation { + pname = "clang-compilation-database"; + version = "0.1.0.0"; + sha256 = "1nnbcx9450kppm1qsqspdj4ywjgcmfg2zicgs309hdb7kvszpdla"; + libraryHaskellDepends = [ aeson base bytestring text ]; + homepage = "https://github.com/lambdageek/clang-compilation-database"; + description = "JSON Compilation Database Format encoding and decoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "clang-pure" = callPackage ({ mkDerivation, base, bytestring, clang, containers, contravariant , hashable, inline-c, lens, microlens, microlens-contra, singletons @@ -45405,16 +45365,18 @@ self: { "codec-rpm" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring - , conduit, conduit-combinators, conduit-extra, hspec - , hspec-attoparsec, HUnit, mtl, parsec, pretty, resourcet, text + , conduit, conduit-combinators, conduit-extra, cpio-conduit, hspec + , hspec-attoparsec, HUnit, lzma-conduit, mtl, parsec, pretty + , resourcet, text }: mkDerivation { pname = "codec-rpm"; - version = "0.1.3"; - sha256 = "18f7rn2k33v5k2g3gbfd6rmpq81gm02aj5xwdy1c8fxsf67fnn00"; + version = "0.2.0"; + sha256 = "1n977xndg2ii866a868rvbi581p0gbz5zpy1glrg6n9znm6y9l4h"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring conduit - conduit-combinators conduit-extra mtl parsec pretty resourcet text + conduit-combinators conduit-extra cpio-conduit lzma-conduit mtl + parsec pretty resourcet text ]; testHaskellDepends = [ attoparsec base bytestring hspec hspec-attoparsec HUnit text @@ -45931,8 +45893,8 @@ self: { }: mkDerivation { pname = "colorless"; - version = "2.2.17"; - sha256 = "1l771glmnbgnwkjg0ijg70i0apj66b4n19v1glx6jzdp98z4kgl3"; + version = "2.2.20"; + sha256 = "1wg0p06bvp6zvnc8qi9k942l1ijzcnksmd6jxnk0c7v9f2kdnib2"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async monad-control monad-logger mtl random safe-exceptions scientific @@ -45943,6 +45905,7 @@ self: { ]; description = "Colorless | The Programmatic IDL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colorless-http-client" = callPackage @@ -45959,6 +45922,7 @@ self: { ]; description = "Http Client addon for Colorless"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colorless-scotty" = callPackage @@ -45972,6 +45936,7 @@ self: { ]; description = "Scotty server add-on for Colorless"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colors" = callPackage @@ -47176,6 +47141,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "computational-geometry" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, lens-family-core + , linear, protolude, vector + }: + mkDerivation { + pname = "computational-geometry"; + version = "0.1.0.3"; + sha256 = "0hslx5g5qzkrxx79f12x82b9jfn0kxvwb7y8whiq85887p4w7zxh"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers lens-family-core linear protolude + vector + ]; + description = "Collection of algorithms in Computational Geometry"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "computations" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47426,14 +47407,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_2_1_1" = callPackage + "concurrency_1_2_1_2" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.2.1.1"; - sha256 = "1zr59s73a0iy27qh1m41lizjy55bgrnkb8zh8s3xp15sqhq9yvgv"; + version = "1.2.1.2"; + sha256 = "110666c1ms104byr2shcjj1dlq1rixppsskfjzm3iyjp24diwyq6"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -48722,8 +48703,8 @@ self: { ({ mkDerivation, base, indextype }: mkDerivation { pname = "constraint-manip"; - version = "0.1.0.0"; - sha256 = "1janlm8nicnj11yy35b8n73dik6bib5aqphgl248c2kn2lgs7fj8"; + version = "0.1.1.0"; + sha256 = "1kxg2iid906rw53r12rha8q3031ixdi3wlviprswig911x9c0zbk"; libraryHaskellDepends = [ base indextype ]; description = "Some conviencience type functions for manipulating constraints"; license = stdenv.lib.licenses.mit; @@ -54137,14 +54118,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_0_11_0_0" = callPackage + "data-diverse_1_2_0_2" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "0.11.0.0"; - sha256 = "0vbhp2gnmg6nlha4jly6yjpvky2dhk2x099r58r7gdrr5prh1lpi"; + version = "1.2.0.2"; + sha256 = "0h0wifwckybn0py6xndaj1fp0sld28aca4qgclw07qsyfd9rnc9x"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54169,12 +54150,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_0_4_0_0" = callPackage + "data-diverse-lens_0_5_0_0" = callPackage ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "0.4.0.0"; - sha256 = "0jwq45b9s2v539lkav84vrjcqznlb2yvprhaflshaz5gsw04dfyc"; + version = "0.5.0.0"; + sha256 = "1can16ndkff8c3dfn585hdbg8zw805icax01hfm0ys3rvypwn4vq"; libraryHaskellDepends = [ base data-diverse lens tagged ]; testHaskellDepends = [ base data-diverse hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; @@ -55892,8 +55873,8 @@ self: { }: mkDerivation { pname = "dbus-th-introspection"; - version = "0.1.0.0"; - sha256 = "10c4fvnw20xvlm4pqqw5vcw5gw9519g4ksawidrrr7bq25gy1ia2"; + version = "0.1.0.2"; + sha256 = "1f6lv7jag9mbl8lkk9m4fnggfhbc301g142adk533sx6pwm6zn8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60795,8 +60776,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.4.1.0"; - sha256 = "1ywqi7mcyb39fir040gfnk8cb57ysa8mnhcss5x2jvhgqfg3vffw"; + version = "0.4.1.1"; + sha256 = "103j8hcabfwrzjmjzxw3ks7b90nnanznck941v956q1h3240npka"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -61043,6 +61024,7 @@ self: { homepage = "https://github.com/Hexirp/doctest-driver-gen#readme"; description = "Generate doctest-driver.hs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-prop" = callPackage @@ -62239,8 +62221,8 @@ self: { }: mkDerivation { pname = "duckling"; - version = "0.1.2.0"; - sha256 = "1sqkygqx28srbpvnq05fyzqs9c9ixsfdfgivvzqr8yqkwvbxajxr"; + version = "0.1.3.0"; + sha256 = "1nk9rdfd4kcim5i9p891cic562g2wda0l6d1xvkkl4hh4b8bym7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63853,19 +63835,21 @@ self: { }) {}; "ekg-cloudwatch" = callPackage - ({ mkDerivation, amazonka, amazonka-cloudwatch, base, ekg-core - , hspec, lens, text, time, unordered-containers + ({ mkDerivation, aeson, amazonka, amazonka-cloudwatch + , amazonka-core, base, bytestring, ekg-core, hspec, lens, resourcet + , semigroups, text, time, unordered-containers }: mkDerivation { pname = "ekg-cloudwatch"; - version = "0.0.1.4"; - sha256 = "0076rc1b6y3yqs7l45q00vbax17miqavjjk92mgkbrc9d376n23y"; + version = "0.0.1.5"; + sha256 = "1k3g6rq0kpslyqajcmw7cymd0pq89kfklpfs59kc4ksv27569zfm"; libraryHaskellDepends = [ - amazonka amazonka-cloudwatch base ekg-core lens text time - unordered-containers + aeson amazonka amazonka-cloudwatch amazonka-core base bytestring + ekg-core lens resourcet semigroups text time unordered-containers ]; testHaskellDepends = [ - amazonka amazonka-cloudwatch base ekg-core hspec lens text time + aeson amazonka amazonka-cloudwatch amazonka-core base bytestring + ekg-core hspec lens resourcet semigroups text time unordered-containers ]; homepage = "https://github.com/sellerlabs/ekg-cloudwatch#readme"; @@ -66142,8 +66126,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer"; - version = "2.0.2"; - sha256 = "05pmgkm2cy60b6lx39ly03i7h3yjh4zy2zzxbk5i68w9xkjcvbxq"; + version = "3.0.0"; + sha256 = "008y4r5xfw8sd3s1lq39clb9sbzhph4xjdw34875hg1shny3n902"; libraryHaskellDepends = [ aeson base bimap bytestring containers ethereum-analyzer-deps extra fgl GenericPretty graphviz hexstring hoopl pretty protolude split @@ -66153,7 +66137,7 @@ self: { base bytestring ethereum-analyzer-deps extra GenericPretty hoopl hspec protolude text wl-pprint-text ]; - homepage = "https://github.com/ethereumK/ethereum-analyzer"; + homepage = "https://github.com/zchn/ethereum-analyzer"; description = "A Ethereum contract analyzer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -66168,8 +66152,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-cli"; - version = "2.0.2"; - sha256 = "03kbdddp1kk48a64mq5xzhiqwkznmf58qyyqwlk7fv4614awlvx6"; + version = "3.0.0"; + sha256 = "1fsvslfa94v9yfy94l5qwgn7gl96f6k8826rmdllbzsq8q6wgrzz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66182,7 +66166,7 @@ self: { base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger optparse-applicative optparse-text protolude text ]; - homepage = "https://github.com/ethereumK/ethereum-analyzer"; + homepage = "https://github.com/zchn/ethereum-analyzer"; description = "A CLI frontend for ethereum-analyzer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -66195,8 +66179,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-deps"; - version = "2.0.2"; - sha256 = "1fpr6jl2qd1amdfrabzhyyvd8izmm1dcjg7rvpzc5l3j4sw5hxc8"; + version = "3.0.0"; + sha256 = "0d23sa2zva6bzzg7369g770azvx9xhbvc61kafa6gk1wcfb6y7qz"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base16-bytestring binary bytestring containers deepseq fast-logger global-lock monad-logger split text @@ -66216,8 +66200,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-webui"; - version = "2.0.2"; - sha256 = "04l1f7ijjbb5czcfz0n8v8v7w6zf6rrw8ds8ayjfxzw4yr4d2zvc"; + version = "3.0.0"; + sha256 = "1nf134v74spqbwjk5b0hb3f298ps4h6073nmwxhadhm886sif8k5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66230,7 +66214,7 @@ self: { executableHaskellDepends = [ base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger ]; - homepage = "https://github.com/ethereumK/ethereum-analyzer"; + homepage = "https://github.com/zchn/ethereum-analyzer"; description = "A web frontend for ethereum-analyzer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -71729,6 +71713,45 @@ self: { license = "unknown"; }) {}; + "fluid-idl" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, errors + , exceptions, fluid, hspec, lifted-async, monad-control + , monad-logger, mtl, random, safe-exceptions, scientific, text + , text-conversions, tuple, unordered-containers, vector + }: + mkDerivation { + pname = "fluid-idl"; + version = "0.0.0"; + sha256 = "1j1j0sr9sw0ksdjcpcyf6w89drszqd3848lv7hb5rjp59aapnpv8"; + libraryHaskellDepends = [ + aeson base bytestring containers errors exceptions lifted-async + monad-control monad-logger mtl random safe-exceptions scientific + text text-conversions unordered-containers vector + ]; + testHaskellDepends = [ + aeson base containers fluid hspec scientific text tuple vector + ]; + description = "Fluid | The Programmatic IDL"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {fluid = null;}; + + "fluid-idl-http-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, fluid-idl, http-client + , http-types, text-conversions + }: + mkDerivation { + pname = "fluid-idl-http-client"; + version = "0.0.0"; + sha256 = "0ah4sfybkwzr1z8gvl3zdh2001a84b3rwgd47nqbn6crks3yvdz8"; + libraryHaskellDepends = [ + aeson base bytestring fluid-idl http-client http-types + text-conversions + ]; + description = "Http Client addon for Fluid"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fluidsynth" = callPackage ({ mkDerivation, base, bindings-DSL, containers, directory , fluidsynth @@ -71930,6 +71953,8 @@ self: { pname = "foldl"; version = "1.2.5"; sha256 = "0jzc00dqwkr3kvy40f8f9klh24s8zvhfk2flrlyichc6zcy5qbda"; + revision = "1"; + editedCabalFile = "02lk5838594mi15bylz2kpcm1c4akbsswj73i7k8xw4ns66iaq04"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors text transformers @@ -72109,6 +72134,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "follow-file" = callPackage + ({ mkDerivation, attoparsec, attoparsec-path, base, bytestring + , conduit, conduit-combinators, directory, exceptions, hinotify + , monad-control, mtl, path, text, unix, utf8-string + }: + mkDerivation { + pname = "follow-file"; + version = "0.0.2"; + sha256 = "0661fp7gf5gyb4w06qm7lfaclzp0zk96gkhcx3pallckfr3214hk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec attoparsec-path base bytestring conduit directory + exceptions hinotify monad-control mtl path text unix utf8-string + ]; + executableHaskellDepends = [ + attoparsec attoparsec-path base bytestring conduit + conduit-combinators directory hinotify path text + ]; + description = "Be notified when a file gets appended, solely with what was added"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "follower" = callPackage ({ mkDerivation, ansi-wl-pprint, base, cmdargs, directory, filepath , hs-twitter, old-locale, strict, time @@ -72345,8 +72393,8 @@ self: { }: mkDerivation { pname = "forest-fire"; - version = "0.2"; - sha256 = "1y50nlj2k2glzypr3nvwcx7pdf7bwn0n4d4vks5n8balvx6yaniq"; + version = "0.2.1"; + sha256 = "007jx5iylhfxjdq7x3ffn1cx27wy7201wvxw23w5nds48vfna6ia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72359,6 +72407,7 @@ self: { homepage = "https://github.com/toothbrush/forest-fire#readme"; description = "Recursively delete CloudFormation stacks and their dependants"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forger" = callPackage @@ -72723,8 +72772,8 @@ self: { ({ mkDerivation, base, basement, criterion, ghc-prim }: mkDerivation { pname = "foundation"; - version = "0.0.15"; - sha256 = "05xl96lc7qi2sdkfc0s5rcrp84cbsyz0r0v3dffmgnv4n1f06cdh"; + version = "0.0.16"; + sha256 = "1kyczi9lfiwbib9irgz4dzy1h60hv6irxyqba6x48bp6vzylfscr"; libraryHaskellDepends = [ base basement ghc-prim ]; testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement criterion ]; @@ -74803,6 +74852,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gargoyle" = callPackage + ({ mkDerivation, base, directory, filelock, filepath, network + , process + }: + mkDerivation { + pname = "gargoyle"; + version = "0.1"; + sha256 = "1yjvn1bfjnr8prs6inz5nhmywszwp8f38iz6v6i3lfazcck8qb43"; + libraryHaskellDepends = [ + base directory filelock filepath network process + ]; + description = "Automatically spin up and spin down local daemons"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gargoyle-postgresql" = callPackage + ({ mkDerivation, base, bytestring, directory, gargoyle, process + , stringsearch, text, unix + }: + mkDerivation { + pname = "gargoyle-postgresql"; + version = "0.1"; + sha256 = "13s2r5kxqkpq4g13dpqig7y2ya0n19xw5ng1sw093kp2kmfjs4h4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory gargoyle process stringsearch text unix + ]; + executableHaskellDepends = [ + base bytestring gargoyle process text unix + ]; + description = "Manage PostgreSQL servers with gargoyle"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "garsia-wachs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -77408,8 +77492,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.3"; - sha256 = "07vdqa2zcivayk1zbj86ab25vawsgywpjng8ixxlsxzdf9arwhhi"; + version = "0.5.4"; + sha256 = "1qi4nwjkymjgag8m1yf04hddqzcj3iq1xllfffwwdp7g57b4p917"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -81769,6 +81853,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-games-configuration" = callPackage @@ -82418,6 +82503,7 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube-analytics" = callPackage @@ -83189,8 +83275,8 @@ self: { }: mkDerivation { pname = "grammatical-parsers"; - version = "0.2"; - sha256 = "0vn6qfzwhgvn59z6wfj0k19g5g2sxcgkm7jn3qlzhmpzw0016f47"; + version = "0.2.1"; + sha256 = "0225lgg44plnz1140fj91rc45x59a7920hw494qavn968cldkv17"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83691,16 +83777,16 @@ self: { "graphite" = callPackage ({ mkDerivation, base, bytestring, cassava, containers, criterion - , deepseq, dequeue, graphviz, hashable, hspec, process, QuickCheck - , random, unordered-containers, vector + , deepseq, graphviz, hashable, hspec, process, QuickCheck, random + , unordered-containers, vector }: mkDerivation { pname = "graphite"; - version = "0.7.0.0"; - sha256 = "0bapl5hvv3dqfrpx9jx70s6akas11xpvfm1zzdkp02w3i106dchj"; + version = "0.9.0.0"; + sha256 = "0s252k5syfkvrvg7amabkzmlvcr4ms2cv1ykli55gfslyzi7809n"; libraryHaskellDepends = [ - base bytestring cassava containers deepseq dequeue graphviz - hashable process QuickCheck random unordered-containers vector + base bytestring cassava containers deepseq graphviz hashable + process QuickCheck random unordered-containers vector ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -83744,17 +83830,17 @@ self: { "graphql-api" = callPackage ({ mkDerivation, aeson, attoparsec, base, containers, criterion - , directory, doctest, exceptions, hspec, protolude, QuickCheck - , raw-strings-qq, scientific, tasty, tasty-hspec, text + , directory, doctest, exceptions, ghc-prim, hspec, protolude + , QuickCheck, raw-strings-qq, scientific, tasty, tasty-hspec, text , transformers }: mkDerivation { pname = "graphql-api"; - version = "0.1.2"; - sha256 = "04wc5sg6x75xw0y37is2y0yiyn179sknpziy7l0bdcsh8ydxy846"; + version = "0.2.0"; + sha256 = "08hsrqh4v7fmkmilwnmxpii8iqkhc0affcv3mmjmp3my0qi79xrl"; libraryHaskellDepends = [ - aeson attoparsec base containers exceptions protolude QuickCheck - scientific text transformers + aeson attoparsec base containers exceptions ghc-prim protolude + QuickCheck scientific text transformers ]; testHaskellDepends = [ aeson attoparsec base containers directory doctest exceptions hspec @@ -83766,6 +83852,7 @@ self: { homepage = "https://github.com/jml/graphql-api#readme"; description = "Sketch of GraphQL stuff"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphs" = callPackage @@ -85122,6 +85209,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) gtksourceview;}; "gtksourceview3" = callPackage @@ -85141,7 +85229,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "guarded-rewriting" = callPackage @@ -87752,6 +87840,7 @@ self: { ]; description = "A shortcode extension module for Hakyll"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halberd" = callPackage @@ -89143,26 +89232,6 @@ self: { }: mkDerivation { pname = "happy"; - version = "1.19.7"; - sha256 = "16vg292pp12wnkny7znsv7bichh9ghny7swl7v55qafmcfg2lcdv"; - revision = "1"; - editedCabalFile = "1w0sm3qn1icxiiif6355pr6cwd9bqfh56g8qc5hycagcnms8hip1"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ array base containers mtl ]; - testHaskellDepends = [ base process ]; - homepage = "https://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "happy_1_19_8" = callPackage - ({ mkDerivation, array, base, Cabal, containers, directory - , filepath, mtl, process - }: - mkDerivation { - pname = "happy"; version = "1.19.8"; sha256 = "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd"; isLibrary = false; @@ -89173,7 +89242,6 @@ self: { homepage = "https://www.haskell.org/happy/"; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happy-meta" = callPackage @@ -93138,8 +93206,8 @@ self: { }: mkDerivation { pname = "hasmin"; - version = "0.3.2.4"; - sha256 = "0xbc5pihr9izms94idc3bmapfs58pg2smn3ym3wnsxs69bah8xfi"; + version = "0.3.3"; + sha256 = "0xpy48vhrjy8lckyym76888r8byyipcq27qcml04j3fvk5gw0cf0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93215,6 +93283,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_1" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, dlist, either, hashable + , hashtables, loch-th, mtl, placeholders, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rebase, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1"; + sha256 = "0zhk9vwlmjc1cwbqx1l9nns155a5f2zbb8k1240wqcylignfqi2b"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist either + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors semigroups text transformers vector + ]; + testHaskellDepends = [ + bug data-default-class QuickCheck quickcheck-instances rebase + rerebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -93266,8 +93364,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.2"; - sha256 = "0mkmn2myga4r0fanb3mh3dwdlhv0mjfqqv4wk1fbx7zncgmciwlw"; + version = "0.4.3.1"; + sha256 = "0m9lr2n5ac0n9gslj2v24jmm68b1aq29zb9ca5wszfs16x6v92ci"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors @@ -93289,8 +93387,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6.1"; - sha256 = "1gw5dfg2qh38sbi2n4bhf3vhyh9rynj3gq02vv5i49r10kqdfs2g"; + version = "0.6.2.1"; + sha256 = "113fkkkdh2ar431b9l3jbqabymmas2r0fwc7icfys3ayh8r50fg7"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql hasql-transaction transformers @@ -93349,8 +93447,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.2.2"; - sha256 = "1ymx36v267ypjx76n9pp8rpmb99z0llpajs0i2z4fkziz7dvjjbf"; + version = "0.2.3"; + sha256 = "0ph2dzfl12bcdcd4xqw5kg1sdyd36ajz3n3ha27rnvv0l8slld6i"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -93371,6 +93469,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-pool_0_4_2_1" = callPackage + ({ mkDerivation, base-prelude, hasql, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.4.2.1"; + sha256 = "0gr7cml6qzj4936yaf4wn4y9ss3vklndlnxfg10lgm8f85sgg40m"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + homepage = "https://github.com/nikita-volkov/hasql-pool"; + description = "A pool of connections for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , criterion-plus, deepseq, directory, doctest, either, filepath @@ -93463,8 +93574,8 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "0.5"; - sha256 = "0hdkw0rrma0cys1gd4phw9ajrimgbaabmsyp533fm6x5fznk7m0w"; + version = "0.5.1"; + sha256 = "0iy114xfkqxpqya13wb5h238wk8gqf4hhh2k5mcqrjxp24cmwl78"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers @@ -95068,6 +95179,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heavy-logger" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, fast-logger, hsyslog + , monad-control, monad-logger, mtl, template-haskell, text + , text-format-heavy, transformers-base + }: + mkDerivation { + pname = "heavy-logger"; + version = "0.1.0.0"; + sha256 = "0wnvgjbhwscmq0wm7arlwpqj5dsrshaqhnx5nvlcvjkzrhcpxlpp"; + libraryHaskellDepends = [ + attoparsec base bytestring fast-logger hsyslog monad-control + monad-logger mtl template-haskell text text-format-heavy + transformers-base + ]; + description = "Full-weight logging based on fast-logger"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hebrew-time" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, time @@ -96146,6 +96275,7 @@ self: { ]; description = "A heterogeneous list type"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hetris" = callPackage @@ -99492,18 +99622,18 @@ self: { "hmep" = callPackage ({ mkDerivation, base, HUnit, mwc-random, primitive, probable - , statistics, vector + , vector }: mkDerivation { pname = "hmep"; - version = "0.1.0"; - sha256 = "1106lkaac4z33r0q17dpxyk5zajg0xnycszgvijmsr2bym0qzb8k"; + version = "0.1.1"; + sha256 = "1q8ns90mrww27pz90c0q3hr817s61rr0yvpksamkq8g75ywy5qma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base mwc-random primitive probable statistics vector + base mwc-random primitive probable vector ]; - executableHaskellDepends = [ base probable statistics vector ]; + executableHaskellDepends = [ base probable vector ]; testHaskellDepends = [ base HUnit vector ]; homepage = "https://github.com/masterdezign/hmep#readme"; description = "HMEP Multi Expression Programming – a genetic programming variant"; @@ -99769,35 +99899,36 @@ self: { ({ mkDerivation, aeson, aeson-pretty, attoparsec , attoparsec-iso8601, base, bytestring, conduit , conduit-combinators, conduit-extra, containers, criterion - , deepseq, directory, hspec, hspec-attoparsec, hspec-core + , directory, hspec, hspec-attoparsec, hspec-core , hspec-expectations, ip, lifted-base, monad-control, monad-loops - , mtl, optparse-applicative, permute, random, resourcet, text, time - , transformers-base, unix, unordered-containers, word8, yaml - , zeromq4-conduit, zeromq4-haskell + , monad-par, mtl, optparse-applicative, permute, random, resourcet + , text, time, transformers-base, unix, unordered-containers, word8 + , yaml, zeromq4-conduit, zeromq4-haskell }: mkDerivation { pname = "hnormalise"; - version = "0.4.7.0"; - sha256 = "0ag600ms1kay8hg2axv65d4nr699c6fq7p2gdjzjjr2cvs6l06ws"; + version = "0.4.8.0"; + sha256 = "1s4ilaw574xhvfhsl9afvb7khz50sg7bag6hckbfadf1h4mhblal"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring - containers directory ip permute text time unordered-containers yaml + containers directory ip permute resourcet text time + unordered-containers yaml ]; executableHaskellDepends = [ aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring conduit conduit-combinators conduit-extra containers directory ip - lifted-base monad-control monad-loops mtl optparse-applicative - resourcet text time transformers-base unix word8 yaml - zeromq4-conduit zeromq4-haskell + lifted-base monad-control monad-loops monad-par mtl + optparse-applicative resourcet text time transformers-base unix + word8 yaml zeromq4-conduit zeromq4-haskell ]; testHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base conduit-extra hspec hspec-attoparsec hspec-core hspec-expectations ip text time ]; benchmarkHaskellDepends = [ - aeson attoparsec base criterion deepseq random text + aeson attoparsec base criterion random text ]; homepage = "https://github.com/itkovian/hnormalise#readme"; description = "Log message normalisation tool producing structured JSON messages"; @@ -101404,8 +101535,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.19.2"; - sha256 = "0kwsy3qwhvc55czszddbq16nz2wniwx7m04i9fkywxcrifjkk7n4"; + version = "0.19.3"; + sha256 = "16czxklzgxv36s30zaqym80wb3jc40nnd32r8gswb1xi85y97fgr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104313,15 +104444,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; - "hslua_0_9_0" = callPackage + "hslua_0_9_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, fail , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.9.0"; - sha256 = "1ka6vacjrs4y7c83ay7zpvw3kgv19snb50jmfb8j00dprap5wwgq"; + version = "0.9.1"; + sha256 = "037w7s0fjji54wa5hl8rarf4c655ybzw4p1jzfy41k6qhwnk4i5i"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text @@ -106611,20 +106742,20 @@ self: { "htoml-megaparsec" = callPackage ({ mkDerivation, aeson, base, bytestring, composition-prelude - , containers, criterion, deepseq, file-embed, megaparsec, mtl - , old-locale, tasty, tasty-hspec, tasty-hunit, text, time + , containers, criterion, deepseq, file-embed, hspec, megaparsec + , mtl, old-locale, tasty, tasty-hspec, tasty-hunit, text, time , unordered-containers, vector }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.0.1.1"; - sha256 = "02zrqdpry6hggd1q71dh85j9g3chzcln904ag507rihilxv90s45"; + version = "1.0.1.11"; + sha256 = "09810a4s0gfza0sh4ldh355sbp3810qy8gkcpvq2048h6ajh2kz5"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl old-locale text time unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers file-embed megaparsec tasty + aeson base bytestring containers file-embed hspec megaparsec tasty tasty-hspec tasty-hunit text time unordered-containers vector ]; benchmarkHaskellDepends = [ @@ -112138,12 +112269,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "indextype"; - version = "0.2.0.0"; - sha256 = "1fwpygmnlwm4h2mp7vwv1kwsbl5agzlc1cq0icijjm5jgw50ns4v"; + version = "0.3.0.0"; + sha256 = "06z4976dy45xyg511bw3nfsfa2lb7m0b081lqpw8q3gmfgrwm66f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A series of type families and constraints for \"indexable\" types"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; }) {}; "indian-language-font-converter" = callPackage @@ -115654,6 +115785,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "javascript-extras_0_3_2_0" = callPackage + ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }: + mkDerivation { + pname = "javascript-extras"; + version = "0.3.2.0"; + sha256 = "0y8cckckg5709in084vyxaad15w6pl1rvmin505s321znfifh838"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq ghcjs-base-stub parallel text + ]; + executableHaskellDepends = [ base ghcjs-base-stub ]; + homepage = "https://github.com/louispan/javascript-extras#readme"; + description = "Extra javascript functions when using GHCJS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "javasf" = callPackage ({ mkDerivation, base, binary, bytestring, directory, doctest , filepath, language-java-classfile, QuickCheck @@ -117386,12 +117535,17 @@ self: { }) {}; "justified-containers" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, ghc-prim, hspec, QuickCheck + , roles, should-not-typecheck + }: mkDerivation { pname = "justified-containers"; - version = "0.1.2.0"; - sha256 = "1rzphablg1wpx2b33zgdyslb9ch436g0wi59vy6gk06572najvz4"; - libraryHaskellDepends = [ base containers ]; + version = "0.2.0.0"; + sha256 = "0fsr9j4qnlffhkgbz50lwy3f18d619risxfl44wgfgr9b722xj8r"; + libraryHaskellDepends = [ base containers roles ]; + testHaskellDepends = [ + base containers ghc-prim hspec QuickCheck should-not-typecheck + ]; homepage = "https://github.com/matt-noonan/justified-containers"; description = "Keyed container types with type-checked proofs of key presence"; license = stdenv.lib.licenses.bsd2; @@ -117994,6 +118148,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "katip_0_5_0_4" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , filepath, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , safe-exceptions, scientific, semigroups, stm, string-conv, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.5.0.4"; + sha256 = "1plxvljhcpdws78fx36v2wn2s7vzbmf1h7rq00yf9680fvcyaq8y"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions scientific semigroups stm string-conv + template-haskell text time transformers transformers-base + transformers-compat unix unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory microlens + quickcheck-instances regex-tdfa safe-exceptions stm tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq directory filepath + safe-exceptions text time transformers unix + ]; + homepage = "https://github.com/Soostone/katip"; + description = "A structured logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, bytestring , containers, criterion, deepseq, enclosed-exceptions, exceptions @@ -125110,8 +125301,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.0.5"; - sha256 = "02iixi1ika6rjdf8qzf404prvjl2l0qhq7rgyzbkrfvk7k4x1mbv"; + version = "0.8.2.0"; + sha256 = "17fm1jn00wns6nkwvxm96j85jwiiaqmw3s7w4ilkslzgr9wslp8f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -126595,8 +126786,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.3.1"; - sha256 = "0hagc9yxb8dmc2qxjzdddvynx7pygr02alf99dvhnc4p5v2yx4z7"; + version = "1.3.3"; + sha256 = "1r7x9fsnaqzs7d3a5kvbaqyhvha8yddb6z5856bqcfk3wflqpcas"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126614,6 +126805,7 @@ self: { homepage = "https://github.com/serokell/log-warper"; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log2json" = callPackage @@ -128056,6 +128248,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lxd-client-config" = callPackage + ({ mkDerivation, aeson, base, containers, directory, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, yaml + }: + mkDerivation { + pname = "lxd-client-config"; + version = "0.1.0.0"; + sha256 = "0cvjfdi2dkysprqy4975x6nxpmk6ppwr8i345hqjwrcahz7hv6i8"; + revision = "1"; + editedCabalFile = "0i2fpnvdnld5qpybf7szcanvrla917rfak0r7fk1wk4yk09lsyl4"; + libraryHaskellDepends = [ + aeson base containers directory filepath text yaml + ]; + testHaskellDepends = [ + base containers HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text yaml + ]; + homepage = "https://github.com/hverr/haskell-lxd-client-config#readme"; + description = "Read the configuration file of the standard LXD client"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lye" = callPackage ({ mkDerivation, base, containers, free, HCodecs, lens, parsers , transformers, trifecta @@ -128540,29 +128756,27 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal - , composition-prelude, containers, criterion, directory, file-embed - , hspec, hspec-megaparsec, http-client, megaparsec, MonadRandom - , mtl, optparse-applicative, process, random-shuffle - , recursion-schemes, tar, template-haskell, text, zip-archive, zlib + ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude + , containers, criterion, directory, file-embed, hspec + , hspec-megaparsec, http-client, megaparsec, MonadRandom, mtl + , optparse-applicative, process, random-shuffle, recursion-schemes + , tar, template-haskell, text, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "2.4.2.14"; - sha256 = "1nimlz7bcn90hzrnb5v26gn8c4jp17ac4i8hl902h0k8ba9rr7i7"; + version = "2.4.2.22"; + sha256 = "1wg2lph25s0lz4ac1jvzy8vsizkyr7pcdq2cc8wxjj2z7f5k2yia"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory file-embed process ]; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring composition-prelude containers - directory file-embed http-client megaparsec MonadRandom mtl + ansi-wl-pprint base composition-prelude containers directory + file-embed http-client megaparsec MonadRandom mtl optparse-applicative random-shuffle recursion-schemes tar template-haskell text zip-archive zlib ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base hspec hspec-megaparsec megaparsec mtl text - ]; + testHaskellDepends = [ base hspec hspec-megaparsec text ]; benchmarkHaskellDepends = [ base criterion megaparsec text ]; homepage = "https://hub.darcs.net/vmchale/madlang"; description = "Randomized templating language DSL"; @@ -130195,6 +130409,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "matplotlib_0_6_0" = callPackage + ({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq + , filepath, process, random, raw-strings-qq, split, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit, temporary + }: + mkDerivation { + pname = "matplotlib"; + version = "0.6.0"; + sha256 = "105rqbqpqgnsgqxvzqgp203bp4bckf35z7cncqg7nwypgf10ipvd"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq filepath process split + temporary + ]; + testHaskellDepends = [ + ad base bytestring process random raw-strings-qq split tasty + tasty-expected-failure tasty-golden tasty-hunit temporary + ]; + homepage = "https://github.com/abarbu/matplotlib-haskell"; + description = "Bindings to Matplotlib; a Python plotting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "matrices" = callPackage ({ mkDerivation, base, criterion, deepseq, primitive, tasty , tasty-hunit, tasty-quickcheck, vector @@ -131884,6 +132121,7 @@ self: { homepage = "https://github.com/DimaSamoz/mezzo"; description = "Typesafe music composition"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mezzolens" = callPackage @@ -138924,6 +139162,7 @@ self: { homepage = "http://github.com/ppenzin/neko-lib-hs/"; description = "Neko VM code generation and disassembly library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "neko-obfs" = callPackage @@ -147588,6 +147827,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "partial-semigroup" = callPackage + ({ mkDerivation, base, doctest, hedgehog, partial-semigroup-test }: + mkDerivation { + pname = "partial-semigroup"; + version = "0.1.0.1"; + sha256 = "1bkm2hsngw8z77zsgxlrqdfzh8hk0hbsr42cjc4c8v84npr1lh7f"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hedgehog partial-semigroup-test + ]; + homepage = "https://github.com/chris-martin/partial-semigroup#readme"; + description = "A partial binary associative operator"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "partial-semigroup-test" = callPackage + ({ mkDerivation, base, hedgehog, partial-semigroup }: + mkDerivation { + pname = "partial-semigroup-test"; + version = "0.1.0.1"; + sha256 = "1346056kzswfa3bakhfh24y07a2sj2qa5cq5npzf01n99x08jvgz"; + libraryHaskellDepends = [ base hedgehog partial-semigroup ]; + homepage = "https://github.com/chris-martin/partial-semigroup#readme"; + description = "Testing utilities for the partial-semigroup package"; + license = stdenv.lib.licenses.asl20; + }) {}; + "partial-uri" = callPackage ({ mkDerivation, base, network-uri }: mkDerivation { @@ -147887,6 +148153,20 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "path-text-utf8" = callPackage + ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: + mkDerivation { + pname = "path-text-utf8"; + version = "0.0.0.2"; + sha256 = "0m1rmzyjsiwb1k1rpj7mwjmbg6y9rmbv69bxqm0pbc6ylkh678ja"; + libraryHaskellDepends = [ + base bytestring path safe-exceptions text + ]; + homepage = "https://github.com/chris-martin/path-text-utf8#readme"; + description = "Read and write UTF-8 text files"; + license = stdenv.lib.licenses.asl20; + }) {}; + "pathfinding" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -149384,7 +149664,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql-haskell_0_3_3" = callPackage + "persistent-mysql-haskell_0_3_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-control, monad-logger, mysql-haskell, network , persistent, persistent-template, resource-pool, resourcet, text @@ -149392,8 +149672,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.3"; - sha256 = "1dvdz1l5kpliy9h3l11vlrx9yis7a1a54fnj2c764pg6s5kp8rjq"; + version = "0.3.4"; + sha256 = "1g1i71zpnwbngw56fn7in06k79v4pa5lcq4vk606p8aqyhf4xgfp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149612,6 +149892,31 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_5_3" = callPackage + ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers + , ghc-prim, hspec, http-api-data, monad-control, monad-logger + , path-pieces, persistent, QuickCheck, tagged, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.5.3"; + sha256 = "1b8n99l2dh4ng1pf86541q5s2is30scnsx3p3vzh0kif9myrk5cy"; + libraryHaskellDepends = [ + aeson aeson-compat base bytestring containers ghc-prim + http-api-data monad-control monad-logger path-pieces persistent + tagged template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-vector" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -149921,8 +150226,8 @@ self: { pname = "pgdl"; version = "10.9"; sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "5"; - editedCabalFile = "1asqw4k0v57ysi7yqlk506vnkb162swfv2230s8q43r6kvj7171k"; + revision = "6"; + editedCabalFile = "193ndd6awakj53h027p11cjj6j3lcqrrzrbvav94ccx40b72k3xd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -152978,19 +153283,35 @@ self: { }) {}; "polydata" = callPackage - ({ mkDerivation, base, constraint-manip, hspec, indextype }: + ({ mkDerivation, base, constraint-manip, hspec, indextype + , polydata-core + }: mkDerivation { pname = "polydata"; - version = "0.1.0.0"; - sha256 = "1fxp5m54nqxvyg4qljhdrykm3i6fckjl053p37dnib4g3nrqa5qy"; - revision = "1"; - editedCabalFile = "104rx39v78nnpl8w350fxdkx6zzv1kwql7f21xz62256ybwza4ra"; - libraryHaskellDepends = [ base constraint-manip indextype ]; - testHaskellDepends = [ base constraint-manip hspec indextype ]; - description = "Wrap together data and its constraints"; + version = "0.3.0.0"; + sha256 = "13rn72baypvnyvcf0dc51dliq467fqh47g4kpyc7c8jlhbs0p4fi"; + libraryHaskellDepends = [ + base constraint-manip indextype polydata-core + ]; + testHaskellDepends = [ + base constraint-manip hspec indextype polydata-core + ]; + description = "Wrap together data and it's constraints"; license = stdenv.lib.licenses.mit; }) {}; + "polydata-core" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "polydata-core"; + version = "0.1.0.0"; + sha256 = "1wdi8a1s235knb98bmhfqvy7qbqvj804dx6rn846x8aj50drjjqv"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/clintonmead/polydata-core#readme"; + description = "Core data definitions for the \"polydata\" package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "polymap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -153727,18 +154048,23 @@ self: { }) {}; "postgres-embedded" = callPackage - ({ mkDerivation, base, directory, filepath, network, shell-conduit + ({ mkDerivation, base, bytestring, directory, filepath, network + , postgresql-simple, shell-conduit }: mkDerivation { pname = "postgres-embedded"; - version = "0.1.5"; - sha256 = "0g7nvszas7zmx9wh8cdpc5wx5nkv710n7fzipsgbk2qlzj0j7f08"; + version = "0.1.7"; + sha256 = "19jwgrqx8sycfy9lrz9qgz0hqksfh4z0a44ij7xsm8jvbmaqfqhy"; libraryHaskellDepends = [ base directory filepath network shell-conduit ]; - testHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring filepath postgresql-simple shell-conduit + ]; homepage = "https://github.com/ilya-murzinov/postgres-embedded"; + description = "Library for easily running embedded PostgreSQL server for tests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgres-tmp" = callPackage @@ -154089,8 +154415,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-queue"; - version = "0.5.0.1"; - sha256 = "0nzl7yknva09gwrmnvk4swlkgdksbcxw83bk4cacnmm2n42y3h8a"; + version = "0.5.1.1"; + sha256 = "05bzpfawf5pllmlqhsypp69rjrhady9vdql0khi9k75kk4ndl9r3"; libraryHaskellDepends = [ aeson base bytestring exceptions monad-control pg-transact postgresql-simple random text time transformers @@ -158186,8 +158512,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.1.0.4"; - sha256 = "1mrlr7x6njb1n21185wn81fybyg89c4jyph8sabf20gg7qng893s"; + version = "0.1.0.5"; + sha256 = "1gxna2ikq6q1gnarqwsy1xcbqz19j5015girn4mc52sai852ny5z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160363,6 +160689,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rakuten" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, constraints + , data-default-class, extensible, hspec, http-api-data, http-client + , http-client-tls, http-types, lens, req, servant-server, text + , unordered-containers, warp + }: + mkDerivation { + pname = "rakuten"; + version = "0.1.0.0"; + sha256 = "18gasv78zq8l51kpwvx6gc089day6pmlz2f43vrfichqbivahmhf"; + libraryHaskellDepends = [ + aeson base bytestring connection constraints data-default-class + extensible http-api-data http-client http-client-tls http-types + lens req text unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring connection constraints data-default-class + extensible hspec http-api-data http-client http-client-tls + http-types lens req servant-server text unordered-containers warp + ]; + homepage = "https://github.com/matsubara0507/rakuten#readme"; + description = "The Rakuten API in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ralist" = callPackage ({ mkDerivation, base, criterion, deepseq, hspec }: mkDerivation { @@ -162528,6 +162880,7 @@ self: { homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme"; description = "Amateur addenda to recursion-schemes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "recursive-line-count" = callPackage @@ -166008,34 +166361,6 @@ self: { }: mkDerivation { pname = "rethinkdb-client-driver"; - version = "0.0.24"; - sha256 = "06fhrip547mgv0nqjsiilbdhc0nphqqwy3qacxw36macvg6mhsbb"; - libraryHaskellDepends = [ - aeson base binary bytestring containers hashable mtl network - old-locale scientific stm template-haskell text time - unordered-containers vector - ]; - testHaskellDepends = [ - base hspec hspec-smallcheck smallcheck text time - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion text time unordered-containers vector - ]; - homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; - description = "Client driver for RethinkDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "rethinkdb-client-driver_0_0_25" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , criterion, hashable, hspec, hspec-smallcheck, mtl, network - , old-locale, scientific, smallcheck, stm, template-haskell, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "rethinkdb-client-driver"; version = "0.0.25"; sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g"; libraryHaskellDepends = [ @@ -166326,6 +166651,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rhine" = callPackage + ({ mkDerivation, base, containers, dunai, free, time, transformers + }: + mkDerivation { + pname = "rhine"; + version = "0.1.0.0"; + sha256 = "1gjz5i7a00kq48fkg7ms3qr04jzg8mw5vb3lgn1pflp45m4p95vi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers dunai free time transformers + ]; + executableHaskellDepends = [ base ]; + description = "Functional Reactive Programming with type-level clocks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rhythm-game-tutorial" = callPackage ({ mkDerivation, base, call, containers, lens, mtl, objective , split @@ -166984,6 +167326,7 @@ self: { homepage = "http://github.com/serokell/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -167060,6 +167403,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "roles" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "roles"; + version = "0.2.0.0"; + sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2"; + libraryHaskellDepends = [ base containers ]; + homepage = "http://github.com/matt-noonan/roles/"; + description = "Composable class-based roles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rollbar" = callPackage ({ mkDerivation, aeson, base, basic-prelude, http-conduit , monad-control, network, resourcet, text, vector @@ -169649,21 +170004,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "schematic_0_3_2_0" = callPackage + "schematic_0_4_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific - , singletons, smallcheck, tagged, text, unordered-containers - , validationt, vector, vinyl + , singletons, smallcheck, tagged, template-haskell, text, union + , unordered-containers, validationt, vector, vinyl }: mkDerivation { pname = "schematic"; - version = "0.3.2.0"; - sha256 = "0bzxab3ijnc5qxglcw4kbcznv22r8n11h5qrsgwlyh3r4qa0by72"; + version = "0.4.0.0"; + sha256 = "1n0i7irbf4flnhybhvl5kqkcyz673nyv7bl8z14yxi152a7kjkqi"; libraryHaskellDepends = [ aeson base bytestring containers hjsonschema mtl profunctors regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged - text unordered-containers validationt vector vinyl + template-haskell text union unordered-containers validationt vector + vinyl ]; testHaskellDepends = [ aeson base bytestring containers hjsonschema hspec hspec-core @@ -171393,18 +171749,18 @@ self: { }) {}; "semiring-num" = callPackage - ({ mkDerivation, base, containers, criterion, doctest, hashable - , log-domain, nat-sized-numbers, QuickCheck, random, scientific - , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, containers, criterion, deepseq, doctest + , hashable, log-domain, nat-sized-numbers, QuickCheck, random + , scientific, smallcheck, tasty, tasty-quickcheck, tasty-smallcheck , template-haskell, time, unordered-containers, vector }: mkDerivation { pname = "semiring-num"; - version = "1.5.0.0"; - sha256 = "15gn11razis9fzm58dfk4j2bk41lmnzngi3s4izydzsavzm4qyjx"; + version = "1.6.0.0"; + sha256 = "0c12pg87y0ndpkmfpvl921495920fv4gx8i23hmvcq6nim9yy1ir"; libraryHaskellDepends = [ - base containers hashable log-domain scientific template-haskell - time unordered-containers vector + base containers deepseq hashable log-domain scientific + template-haskell time unordered-containers vector ]; testHaskellDepends = [ base containers doctest log-domain nat-sized-numbers QuickCheck @@ -172005,6 +172361,7 @@ self: { homepage = "https://github.com/serokell/serokell-util"; description = "General-purpose functions by Serokell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serpentine" = callPackage @@ -172461,6 +172818,7 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "RocksDB backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-blaze" = callPackage @@ -173199,8 +173557,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.2.4"; - sha256 = "1jf7r9wa9b2afj573knafpgp49xf6mslq0qifw7cdww5j57993b2"; + version = "0.0.3.0"; + sha256 = "1spqwfg1y0qajs5nl92gxif1qicgr4s8y0knkp9q76gvag1dyfng"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -173208,9 +173566,9 @@ self: { split string-conversions temporary text time warp ]; testHaskellDepends = [ - base base-compat bytestring hspec hspec-core http-client QuickCheck - quickcheck-io servant servant-client servant-server transformers - warp + aeson base base-compat bytestring hspec hspec-core http-client + QuickCheck quickcheck-io servant servant-client servant-server + transformers warp ]; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; @@ -173218,30 +173576,37 @@ self: { }) {}; "servant-rawm" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath - , http-client, http-media, http-types, lens, resourcet, servant - , servant-client, servant-docs, servant-server, text, transformers - , wai, wai-app-static, warp + ({ mkDerivation, base, bytestring, doctest, filepath, Glob + , hspec-wai, http-client, http-media, http-types, lens, resourcet + , servant, servant-client, servant-docs, servant-server, tasty + , tasty-hspec, tasty-hunit, text, transformers, wai, wai-app-static + , warp }: mkDerivation { pname = "servant-rawm"; - version = "0.2.0.0"; - sha256 = "029lwzy0r28l1axpmrlcazsqa38q7a6fbq1vzh484dhfy9j2j5wj"; + version = "0.2.0.1"; + sha256 = "1cd94qyv8qbsl6nab0nv7j10wjqa1q1fpsm7pxlp15wzvkp60kk2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers filepath http-client http-media - http-types lens resourcet servant servant-client servant-docs - servant-server wai wai-app-static + base bytestring filepath http-client http-media http-types lens + resourcet servant-client servant-docs servant-server wai + wai-app-static ]; executableHaskellDepends = [ base bytestring http-client http-media http-types servant servant-client servant-docs servant-server text transformers wai warp ]; + testHaskellDepends = [ + base bytestring doctest Glob hspec-wai http-client http-media + http-types servant servant-client servant-server tasty tasty-hspec + tasty-hunit transformers wai warp + ]; homepage = "https://github.com/cdepillabout/servant-rawm"; description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-response" = callPackage @@ -180834,12 +181199,15 @@ self: { pname = "species"; version = "0.4"; sha256 = "04n9lrh058n66175drw3vsn57fd64j8wmn9wdchfb0557yqcjcmn"; + revision = "1"; + editedCabalFile = "0j69s6gpq0bzv42hkalz3nw35q07m5agdcs8kxv11s62jcm6idrs"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell ]; description = "Computational combinatorial species"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculate" = callPackage @@ -183014,8 +183382,8 @@ self: { }: mkDerivation { pname = "state-codes"; - version = "0.1.2"; - sha256 = "08i4ly81yr8sxjhjl6y2kk58ya597q0rcyw3dr50gfxrg20p36dj"; + version = "0.1.3"; + sha256 = "18gls0gyk3iz9i03zw31x3xhi5m1y2r98qkkrah8kz07fsbxqrqn"; libraryHaskellDepends = [ aeson base shakespeare text ]; testHaskellDepends = [ aeson base hspec QuickCheck text ]; homepage = "https://github.com/acamino/state-codes#README"; @@ -186743,6 +187111,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_2" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob + , hashable, hspec, http-media, HUnit, insert-ordered-containers + , lens, mtl, network, QuickCheck, scientific, template-haskell + , text, time, transformers, transformers-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.2"; + sha256 = "0byzfz52mbnxcmspmk4s43bhprfwrjnh2mkpyfrdir64axqx7yf6"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers generics-sop hashable + http-media insert-ordered-containers lens mtl network scientific + template-haskell text time transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + text time unordered-containers vector + ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -191792,6 +192190,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "text-containers" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , hashable, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, text, text-short, vector + }: + mkDerivation { + pname = "text-containers"; + version = "0.1.0.0"; + sha256 = "0dsaqzh2hy6w9mzpsk22vmgmhx54l12il21n49f9g3cbr9kc9cv1"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable text-short + ]; + testHaskellDepends = [ + base bytestring containers QuickCheck quickcheck-instances tasty + tasty-quickcheck text text-short vector + ]; + description = "Memory-efficient string-indexed container types"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-conversions" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, errors, hspec, hspec-discover, text @@ -191844,14 +192263,15 @@ self: { }) {}; "text-format-heavy" = callPackage - ({ mkDerivation, base, containers, data-default, parsec, text, time + ({ mkDerivation, base, bytestring, containers, data-default, parsec + , text, time }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.1.0"; - sha256 = "082j0dzmy5d8lpjxhg9k7qhnjykg851a0yllszf43kx09hk0kmb1"; + version = "0.1.3.0"; + sha256 = "1cv6j0g3x7xw6ivfs9x2hdv063jsa2739zc6x8fya9540l8d4hys"; libraryHaskellDepends = [ - base containers data-default parsec text time + base bytestring containers data-default parsec text time ]; description = "Full-weight string formatting library, analog of Python's string.format"; license = stdenv.lib.licenses.bsd3; @@ -193479,8 +193899,8 @@ self: { }: mkDerivation { pname = "thread-hierarchy"; - version = "0.1.0.1"; - sha256 = "05qpm77711r9viwij5vznrmk8ij89lxhpwxdk8dpk0rq2ll5iyyq"; + version = "0.1.0.2"; + sha256 = "1fhbwzx8shf2ph9l5mkrlz40dxdzn02rvjgz9l2kvjmi8v5rclxk"; libraryHaskellDepends = [ base containers lifted-base monad-control transformers-base ]; @@ -195828,8 +196248,8 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.2"; - sha256 = "144hqyx13x9gg2xznrh41h9wi7ha70rxr93dpb020qv0af3cknqc"; + version = "0.1.0.14"; + sha256 = "1zms4vigyy29c3wmjh6zmhjlmvj3x98dx99mdpxws6sxl0wibfcv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -196692,6 +197112,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "translate-cli" = callPackage + ({ mkDerivation, aeson, aeson-lens, base, HUnit, lens, text, turtle + , wreq + }: + mkDerivation { + pname = "translate-cli"; + version = "1.0.0.0"; + sha256 = "0kksrdmx2vx24j84nwz106bkc4h353bwybwz7zb5mi0pwkcawfa2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson aeson-lens base lens text wreq ]; + executableHaskellDepends = [ base text turtle ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/andys8/translate-cli#readme"; + description = "Translation cli tool"; + license = stdenv.lib.licenses.mit; + }) {}; + "trasa" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, hashable , http-media, http-types, tasty, tasty-hunit, tasty-quickcheck @@ -198574,11 +199012,12 @@ self: { ({ mkDerivation, base, containers, template-haskell }: mkDerivation { pname = "tyfam-witnesses"; - version = "0.1"; - sha256 = "1sy0ffd0i1s20xw2x1vf8a9ydbrzb9klin7j564hncsjf9bzdc1a"; + version = "0.1.1.1"; + sha256 = "1rnmnj2dlzbzj12fddv73mg0p0qgvn5blknb7d9ayns6pxc57aap"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Provide proof witnesses for closed type family evaluation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typalyze" = callPackage @@ -201239,6 +201678,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio_0_1_1_0" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath + , monad-logger, resourcet, transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.1.1.0"; + sha256 = "1hhqcxvfh906xl9qhqk6wrsd2xc6rkwh5lqgwfizlb2wns7irkkd"; + libraryHaskellDepends = [ + async base deepseq directory filepath monad-logger resourcet + transformers unix unliftio-core + ]; + homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -204377,25 +204834,6 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.9"; - sha256 = "15mvbgf5apb9ysiynv5xc8zynkz8shwbfq16rdfac5bbnl07m97p"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick containers ghc-prof lens scientific text vector - vector-algorithms vty - ]; - homepage = "https://github.com/maoe/viewprof"; - description = "Text-based interactive GHC .prof viewer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "viewprof_0_0_0_10" = callPackage - ({ mkDerivation, base, brick, containers, ghc-prof, lens - , scientific, text, vector, vector-algorithms, vty - }: - mkDerivation { - pname = "viewprof"; version = "0.0.0.10"; sha256 = "000x7xlais9r2f42nbd2cbp6h07d6p31nn16vvbvyg5a12pw44vh"; isLibrary = false; @@ -204407,7 +204845,6 @@ self: { homepage = "https://github.com/maoe/viewprof"; description = "Text-based interactive GHC .prof viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "views" = callPackage @@ -208872,6 +209309,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "with-index" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "with-index"; + version = "0.1.0.0"; + sha256 = "0dv81mp66l0j0dfa0mm9vqmdfxvhfg5py1gxqwh1jvpr8iks1q8q"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/paf31/with-index"; + description = "A tiny library for composing indexed traversals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "with-location" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -215293,6 +215742,7 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Pango frontend for Yi editor"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-frontend-vty" = callPackage diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix index 11afd4ebe76d..27828e6f41f6 100644 --- a/pkgs/development/idris-modules/lightyear.nix +++ b/pkgs/development/idris-modules/lightyear.nix @@ -8,7 +8,7 @@ }: let - date = "2016-08-01"; + date = "2017-09-10"; in build-idris-package { name = "lightyear-${date}"; @@ -16,8 +16,8 @@ build-idris-package { src = fetchFromGitHub { owner = "ziman"; repo = "lightyear"; - rev = "9420f9e892e23a7016dea1a61d8ce43a6d4ecf15"; - sha256 = "0xbjwq7sk4x78mi2zcqxbx7wziijlr1ayxihb1vml33lqmsgl1dn"; + rev = "f737e25a09c1fe7c5fff063c53bd7458be232cc8"; + sha256 = "05x66abhpbdm6yr0afbwfk6w04ysdk78gylj5alhgwhy4jqakv29"; }; propagatedBuildInputs = [ prelude base effects ]; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix new file mode 100644 index 000000000000..4ab09f5bb1d5 --- /dev/null +++ b/pkgs/development/libraries/alembic/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5 }: + +stdenv.mkDerivation rec +{ + name = "alembic-${version}"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "alembic"; + repo = "alembic"; + rev = "${version}"; + sha256 = "00r6d8xk2sq5hdl5lp14nhyh1b2d68fxpzbm69fk6iq2f2gv0iqv"; + }; + + outputs = [ "bin" "dev" "out" "lib" ]; + + buildInputs = [ unzip cmake openexr hdf5 ]; + + sourceRoot = "${name}-src"; + + enableParallelBuilding = true; + + buildPhase = '' + cmake -DUSE_HDF5=ON -DCMAKE_INSTALL_PREFIX=$out/ -DUSE_TESTS=OFF . + + mkdir $out + mkdir -p $bin/bin + mkdir -p $dev/include + mkdir -p $lib/lib + ''; + + installPhase = '' + make install + + mv $out/bin $bin/ + mv $out/lib $lib/ + mv $out/include $dev/ + ''; + + meta = with stdenv.lib; { + description = "An open framework for storing and sharing scene data"; + homepage = "http://alembic.io/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix new file mode 100644 index 000000000000..9837e1c69193 --- /dev/null +++ b/pkgs/development/libraries/boost/1.65.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.65.1"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_65_1.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_65_1.html + sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; + }; + +}) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 22ef02023f88..3f9ae113f849 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -9,6 +9,8 @@ , enableStatic ? !enableShared , enablePIC ? false , enableExceptions ? false +, enablePython ? hostPlatform == buildPlatform +, enableNumpy ? false, numpy ? null , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? null , mpi ? null @@ -21,6 +23,9 @@ # We must build at least one type of libraries assert !enableShared -> enableStatic; +assert enablePython -> hostPlatform == buildPlatform; +assert enableNumpy -> enablePython; + with stdenv.lib; let @@ -62,7 +67,8 @@ let ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [ "link=${link}" "${cflags}" - ] ++ optional (variant == "release") "debug-symbols=off"; + ] ++ optional (variant == "release") "debug-symbols=off" + ++ optional (!enablePython) "--without-python"; nativeB2Flags = [ "-sEXPAT_INCLUDE=${expat.dev}/include" @@ -76,7 +82,6 @@ let "-sEXPAT_LIBPATH=${expat.crossDrv}/lib" "--user-config=user-config.jam" "toolset=gcc-cross" - "--without-python" ] ++ optionals (hostPlatform.libc == "msvcrt") [ "target-os=windows" "threadapi=win32" @@ -148,8 +153,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = [ expat zlib bzip2 libiconv ] - ++ stdenv.lib.optionals (hostPlatform == buildPlatform) [ python icu ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ optional (hostPlatform == buildPlatform) icu + ++ optional stdenv.isDarwin fixDarwinDylibNames + ++ optional enablePython python + ++ optional enableNumpy numpy; configureScript = "./bootstrap.sh"; configureFlags = commonConfigureFlags diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index d1d3c953fc9f..066eca4e63d8 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,6 +3,5 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - license = stdenv.lib.licenses.agpl3; extraPatches = [ ./clang-5.3.patch ]; }) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index e3b345b31ee9..6691928c021e 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnu-efi-${version}"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; - sha256 = "08hb2gpzcj5p743wcagm0j2m4gh100xv12llpbjc13zi2icwv3xx"; + sha256 = "149cyadpn2jm4zxfn1qmpm520iqssp9p07d650rs5ghgv015jl91"; }; buildInputs = [ pciutils ]; diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 6fae90a8d890..3eed4f0c2e29 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -21,8 +21,12 @@ mkDerivation rec { postFixup = # Disabuse CMake of the notion that libraries are in $dev '' - sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \ - -e "s|\''${_IMPORT_PREFIX}|$out|" + for way in release debug; do + cmake="$dev/lib/cmake/Grantlee5/GrantleeTargets-$way.cmake" + if [ -f "$cmake" ]; then + sed -i "$cmake" -e "s|\''${_IMPORT_PREFIX}|$out|" + fi + done ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 256d7cbdc878..a09bcd6f039c 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: let inherit (stdenv.lib) optional; -in -stdenv.mkDerivation rec{ - name = "iniparser-3.1"; - src = fetchurl { - url = "${meta.homepage}/iniparser-3.1.tar.gz"; - sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; +in stdenv.mkDerivation rec { + name = "iniparser-${version}"; + version = "4.0"; + + src = fetchFromGitHub { + owner = "ndevilla"; + repo = "iniparser"; + rev = "v${version}"; + sha256 = "0339qa0qxa5z02xjcs5my8v91v0r9jm4piswrl1sa29kwyxgv5nb"; }; patches = ./no-usr.patch; + doCheck = true; + preCheck = "patchShebangs test/make-tests.sh"; + # TODO: Build dylib on Darwin buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) ++ [ "CC=cc" ]; @@ -23,7 +29,7 @@ stdenv.mkDerivation rec{ cp src/*.h $out/include mkdir -p $out/share/doc/${name} - for i in AUTHORS INSTALL LICENSE README; do + for i in AUTHORS INSTALL LICENSE README.md; do bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; done; cp -r html $out/share/doc/${name} @@ -36,7 +42,7 @@ stdenv.mkDerivation rec{ ''); meta = { - homepage = http://ndevilla.free.fr/iniparser; + inherit (src.meta) homepage; description = "Free standalone ini file parsing library"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/iniparser/no-usr.patch b/pkgs/development/libraries/iniparser/no-usr.patch index 28be099b8eec..a3c568cdde43 100644 --- a/pkgs/development/libraries/iniparser/no-usr.patch +++ b/pkgs/development/libraries/iniparser/no-usr.patch @@ -1,14 +1,13 @@ -diff -urN iniparser3.0b.orig/Makefile iniparser3.0b/Makefile ---- iniparser3.0b.orig/Makefile 2008-01-16 19:56:08.000000000 +0100 -+++ iniparser3.0b/Makefile 2008-01-16 19:56:49.000000000 +0100 -@@ -11,8 +11,8 @@ +--- a/Makefile 2017-10-20 20:30:41.494608284 +0200 ++++ b/Makefile 2017-10-20 20:33:22.279212026 +0200 +@@ -20,8 +20,8 @@ ARFLAGS = rcv SHLD = ${CC} ${CFLAGS} --LDSHFLAGS = -shared -Wl,-Bsymbolic -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib --LDFLAGS = -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib +-LDSHFLAGS = -shared -Wl,-Bsymbolic +-LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib +LDSHFLAGS = -shared +LDFLAGS = - # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX) - # RANLIB = ranlib + # .so.0 is for version 3.x, .so.1 is 4.x + SO_TARGET ?= libiniparser.so.1 diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index d5995459fd4f..de99503131c1 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -132,6 +132,7 @@ let sonnet = callPackage ./sonnet.nix {}; syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; + kirigami2 = callPackage ./kirigami2.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix new file mode 100644 index 000000000000..f4fc40f6d31d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -0,0 +1,11 @@ +{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations }: + +mkDerivation { + name = "kirigami2"; + meta = { + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase qtquickcontrols2 qttranslations ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 5e906c7ac5de..c73096d1eeb5 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libbsd-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0a2vq0xdhs3yyj91b0612f19fakg7a9xlqy2f993128kyhjd0ivn"; + sha256 = "11wnkzims5grprvhb1ssmq9pc2lcgh2r2rk8gwgz36ply6fvyzs6"; }; # darwin changes configure.ac which means we need to regenerate diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4903d8e66dfe..992b1ea70dca 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.83"; + name = "libdrm-2.4.84"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983"; + sha256 = "7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index a79e6d903842..93d8ced49cea 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -9,13 +9,10 @@ with lib; mkDerivation rec { name = "libqtav-${version}"; - - # Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the - # the reason behind taking an unstable git rev. - version = "unstable-2017-03-30"; + version = "1.12.0"; nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ + buildInputs = [ qtbase qtmultimedia qtquick1 mesa libX11 libass openal ffmpeg libuchardet @@ -23,18 +20,13 @@ mkDerivation rec { ]; src = fetchFromGitHub { - sha256 = "1xw0ynm9w501651rna3ppf8p336ag1p60i9dxhghzm543l7as93v"; - rev = "4b4ae3b470b2fcbbcf1b541c2537fb270ee0bcfa"; + sha256 = "03ii9l38l3fsr27g42fx4151ipzkip2kr4akdr8x28sx5r9rr5m2"; + rev = "v${version}"; repo = "QtAV"; owner = "wang-bin"; fetchSubmodules = true; }; - patchPhase = '' - sed -i -e 's#CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT#TRUE#g' ./CMakeLists.txt - sed -i -e 's#DESTINATION ''${QT_INSTALL_LIBS}/cmake#DESTINATION ''${QTAV_INSTALL_LIBS}/cmake#g' ./CMakeLists.txt - ''; - # Make sure libqtav finds its libGL dependancy at both link and run time # by adding mesa to rpath. Not sure why it wasn't done automatically like # the other libraries as `mesa` is part of our `buildInputs`. diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix index 877d8ed434c6..fbd30ac04f76 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix @@ -1,6 +1,13 @@ -{ callPackage, ... } @ args: +args@{ callPackage, fetchpatch, ... }: -callPackage ./generic.nix (args // { +callPackage (import ./generic.nix { version = "1.0.11"; sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i"; -}) + patches = [ + # Compatibility with new Boost + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/7eb3cf6bc6dbada3fa7bb7ff4d5981182813a0e2.patch"; + sha256 = "07agbrii6i8q4wmgpqbln7ldhhadaf5npcinvi6hnyipsr48jbj5"; + }) + ]; +}) args diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index ed52902938db..ff5027fd472e 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ -{ callPackage, ... } @ args: +args@{ callPackage, ... }: -callPackage ./generic.nix (args // { - version = "1.1.4"; - sha256 = "1rrp4b7zfz0fnjvax2r9r5rrh6z1s4xqb9dx20gzr4gs8x5v5jws"; -}) +callPackage (import ./generic.nix { + version = "1.1.5"; + sha256 = "1ifpcqw5mj2dwk23lhc2vpb47mg3j573v5z4zp8dkczpz7wg5jxq"; +}) args diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index 351ec3e77331..315385cba6c8 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip # Version specific options -, version, sha256 -, ... }: +{ version, sha256, patches ? [] }: + +{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: let formattedVersion = lib.replaceChars ["."] ["_"] version; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { inherit sha256; }; + inherit patches; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boost openssl zlib python libiconv geoip ]; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 8596ab6de88f..ecb7bf78b206 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -16,7 +16,7 @@ , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , enableOpenblas ? true, openblas -, enableCuda ? false, cudatoolkit, gcc5 +, enableCuda ? false, cudatoolkit , enableTesseract ? false, tesseract, leptonica , AVFoundation, Cocoa, QTKit }: @@ -145,7 +145,7 @@ stdenv.mkDerivation rec { # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] - ++ lib.optionals enableCuda [ cudatoolkit gcc5 ] + ++ lib.optional enableCuda cudatoolkit ++ lib.optional buildContrib protobuf ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; @@ -165,8 +165,10 @@ stdenv.mkDerivation rec { (opencvFlag "OPENEXR" enableEXR) (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) - ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ] - ++ lib.optional buildContrib "-DBUILD_PROTOBUF=off" + ] ++ lib.optionals enableCuda [ + "-DCUDA_FAST_MATH=ON" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" + ] ++ lib.optional buildContrib "-DBUILD_PROTOBUF=off" ++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix new file mode 100644 index 000000000000..fcf4c2c2468f --- /dev/null +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, mesa, openexr }: + +stdenv.mkDerivation rec +{ + name = "openexrid-unstable-${version}"; + version = "2017-09-17"; + + src = fetchFromGitHub { + owner = "MercenariesEngineering"; + repo = "openexrid"; + rev = "bec0081548a096f9bcdd1504970c96264b0fc050"; + sha256 = "0h4b74lv59p4hhrvrqdmlnchn2i0v5id4kl8xc7j26l9884q0383"; + }; + + outputs = [ "dev" "out" "lib" ]; + + patches = [ ./openexrid.patch ]; + + NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR + -I${openexr.dev}/include/OpenEXR + -I${openfx.dev}/include/OpenFX + ''; + + buildInputs = [ unzip re2 openfx zlib ilmbase mesa openexr ]; + + enableParallelBuilding = true; + + buildPhase = '' + mkdir openexrid/release + + PREFIX=$out make -C openexrid install + + mkdir $dev; + mkdir $lib; + ''; + + installPhase = '' + find $out + mv $out/include $dev/ + mv $out/lib $lib/ + ''; + + meta = with stdenv.lib; { + description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; + homepage = "https://github.com/MercenariesEngineering/openexrid"; + maintainers = [ maintainers.guibou ]; + platforms = platforms.all; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/openexrid-unstable/openexrid.patch b/pkgs/development/libraries/openexrid-unstable/openexrid.patch new file mode 100644 index 000000000000..bbbf75b575dc --- /dev/null +++ b/pkgs/development/libraries/openexrid-unstable/openexrid.patch @@ -0,0 +1,35 @@ +diff --git a/makefile b/makefile +index 7a92771..31ef664 100644 +--- a/makefile ++++ b/makefile +@@ -8,8 +8,8 @@ _openexrid: + _openfx: + make -C openfx + +-_test: _openexrid +- make -C test ++#_test: _openexrid ++# make -C test + + clean: + make -C openfx clean +diff --git a/makefile.config b/makefile.config +index 0c6cdfa..0166c4c 100644 +--- a/makefile.config ++++ b/makefile.config +@@ -4,7 +4,7 @@ + + PREFIX ?= ~/openexrid + +-OFX_INCLUDE ?= /usr/include/openfx ++OFX_INCLUDE ?= /usr/include/OpenFX + EXR_INCLUDE ?= /usr/include/OpenEXR + EXR_LIB ?= /usr/lib + RE2_INCLUDE ?= /usr/include +@@ -13,5 +13,5 @@ RE2_LIB ?= /usr/lib + VERSION ?= release + CPPFLAGS += -O3 -Wall -DNDEBUG -fPIC -I $(EXR_INCLUDE) -I $(OFX_INCLUDE) -I $(RE2_INCLUDE) -Dlinux + LDFLAGS += -L$(EXR_LIB) -L$(RE2_LIB) -L../openexrid/$(VERSION) -lpthread +-LDFLAGS += -Wl,-Bstatic -lopenexrid -lIlmImf -lIlmThread -lIex -lImath -lHalf -lz -lre2 -Wl,-Bdynamic ++LDFLAGS += -lopenexrid -lIlmImf -lIlmThread -lIex -lImath -lHalf -lz -lre2 -Wl,-Bdynamic + diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix new file mode 100644 index 000000000000..42edb1958ce0 --- /dev/null +++ b/pkgs/development/libraries/openfx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, unzip }: + +stdenv.mkDerivation rec +{ + name = "openfx-${version}"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "ofxa"; + repo = "openfx"; + rev = "OFX_Release_1_4_TAG"; + sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; + }; + + buildInputs = [ unzip ]; + + outputs = [ "dev" "out" ]; + + enableParallelBuilding = true; + + buildPhase = '' + mkdir $dev + mkdir $out + ''; + + installPhase = '' + mkdir -p $dev/include/OpenFX/ + cp -r include/* $dev/include/OpenFX/ + ''; + + meta = with stdenv.lib; { + description = "Image processing plug-in standard"; + homepage = "http://openeffects.org/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index ef979996a475..91899ad8da43 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, stdenv_gcc5, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu , mesa_noglu, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit }: -(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec { +stdenv.mkDerivation rec { name = "opensubdiv-${version}"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "0wk12n1s8za3sz8d6bmfm3rfjyx20j48gy1xp57dvbnjvlvzqy3w"; + sha256 = "0wpjwfik4q9s4r30hndhzmfyzv968mmg5lgng0123l07mn47d2yl"; }; outputs = [ "out" "dev" ]; @@ -28,9 +28,9 @@ [ "-DNO_TUTORIALS=1" "-DNO_REGRESSION=1" "-DNO_EXAMPLES=1" - "-DGLEW_INCLUDE_DIR=${glew}/include" - "-DGLEW_LIBRARY=${glew}/lib" - ]; + "-DGLEW_INCLUDE_DIR=${glew.dev}/include" + "-DGLEW_LIBRARY=${glew.dev}/lib" + ] ++ lib.optional cudaSupport "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix new file mode 100644 index 000000000000..b172b82a295c --- /dev/null +++ b/pkgs/development/libraries/openvdb/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: + +stdenv.mkDerivation rec +{ + name = "openvdb-${version}"; + version = "4.0.2"; + + src = fetchFromGitHub { + owner = "dreamworksanimation"; + repo = "openvdb"; + rev = "v${version}"; + sha256 = "0kqlsfa9rdpxpw7v61vfknvs11axh196ilqk6bnyyfkslmmcak45"; + }; + + outputs = [ "out" ]; + + buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; + + sourceRoot = "openvdb-v${version}-src/openvdb"; + + installTargets = "install_lib"; + + enableParallelBuilding = true; + + buildFlags = ''lib + DESTDIR=$(out) + HALF_LIB=-lHalf + TBB_LIB=-ltbb + BLOSC_LIB=-lblosc + LOG4CPLUS_LIB= + BLOSC_INCLUDE_DIR=${c-blosc}/include/ + BLOSC_LIB_DIR=${c-blosc}/lib/ + ''; + + installFlags = ''DESTDIR=$(out)''; + + NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; + NIX_LDFLAGS="-lboost_iostreams"; + + meta = with stdenv.lib; { + description = "An open framework for voxel"; + homepage = "http://www.openvdb.org"; + maintainers = [ maintainers.guibou ]; + platforms = platforms.all; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix new file mode 100644 index 000000000000..ed0f38f8538b --- /dev/null +++ b/pkgs/development/libraries/partio/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, mesa, zlib, swig, python, doxygen, xorg }: + +stdenv.mkDerivation rec +{ + name = "partio-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "wdas"; + repo = "partio"; + rev = "v${version}"; + sha256 = "0z7n5ay21ca7g7xb80v6jmr96x9k7vm7zawawvmx71yj32rg1n34"; + }; + + outputs = [ "dev" "out" "lib" ]; + + buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; + + sourceRoot = "partio-v${version}-src"; + + enableParallelBuilding = true; + + buildPhase = '' + sed 's/ADD_LIBRARY (partio /ADD_LIBRARY (partio SHARED /' -i ../src/lib/CMakeLists.txt + CXXFLAGS="-std=c++11" cmake . + make partio + + mkdir $dev + mkdir -p $lib/lib + mkdir $out + ''; + + # TODO: + # Sexpr support + + installPhase = '' + mkdir $dev/lib + mkdir -p $dev/include/partio + + mv lib/libpartio.so $lib/lib + + mv ../src/lib/* $dev/include/partio + ''; + + meta = with stdenv.lib; { + description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; + homepage = "https://www.disneyanimation.com/technology/partio.html"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix new file mode 100644 index 000000000000..7774cdbcb888 --- /dev/null +++ b/pkgs/development/libraries/ptex/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, zlib, python, cmake }: + +stdenv.mkDerivation rec +{ + name = "ptex-${version}"; + version = "2.1.28"; + + src = fetchFromGitHub { + owner = "wdas"; + repo = "ptex"; + rev = "v${version}"; + sha256 = "1h6gb3mpis4m6ph7h9q764w50f9jrar3jz2ja76rn5czy6wn318x"; + }; + + outputs = [ "bin" "dev" "out" "lib" ]; + + buildInputs = [ zlib python cmake ]; + + sourceRoot = "ptex-v${version}-src"; + + enableParallelBuilding = true; + + buildPhase = '' + mkdir -p $out + + make prefix=$out + + mkdir -p $bin/bin + mkdir -p $dev/include + mkdir -p $lib/lib + ''; + + installPhase = '' + make install + mv $out/bin $bin/ + ''; + + meta = with stdenv.lib; { + description = "Per-Face Texture Mapping for Production Rendering"; + homepage = "http://ptex.us/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.guibou ]; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index fc5e5d39c63c..b7f9b3eb42e8 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { '' substituteInPlace configure --replace /bin/pwd pwd substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i mkspecs/*/*.conf sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5Config.cmake.in sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake @@ -105,6 +105,7 @@ stdenv.mkDerivation { -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \ + -e 's|sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)|sysroot=/nonsense|' \ -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ @@ -155,6 +156,7 @@ stdenv.mkDerivation { ++ lib.optionals stdenv.isDarwin [ + "-Wno-missing-sysroot" "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090" "-D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))" # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is @@ -252,6 +254,9 @@ stdenv.mkDerivation { "-inotify" "-system-libjpeg" "-system-libpng" + # gold linker of binutils 2.28 generates duplicate symbols + # TODO: remove for newer version of binutils + "-no-use-gold-linker" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch index 6f7baa558db3..46d950a767bb 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch @@ -1,7 +1,7 @@ -diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf ---- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf 2017-09-16 16:40:30.000000000 +0800 -+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf 2017-09-16 16:41:03.000000000 +0800 -@@ -24,165 +24,3 @@ +diff -u -r qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/default_post.prf qtbase-opensource-src-5.9.2/mkspecs/features/mac/default_post.prf +--- qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/default_post.prf 2017-10-14 12:31:04.000000000 +0800 ++++ qtbase-opensource-src-5.9.2/mkspecs/features/mac/default_post.prf 2017-10-14 12:42:02.000000000 +0800 +@@ -24,166 +24,3 @@ } } } @@ -164,13 +164,14 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf q -} - -cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --cache(QMAKE_XCODE_VERSION, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- cache(QMAKE_XCODE_VERSION, stash) - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf ---- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:30.000000000 +0800 -+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:45.000000000 +0800 -@@ -1,51 +1,2 @@ +diff -u -r qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/default_pre.prf qtbase-opensource-src-5.9.2/mkspecs/features/mac/default_pre.prf +--- qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/default_pre.prf 2017-10-14 12:31:04.000000000 +0800 ++++ qtbase-opensource-src-5.9.2/mkspecs/features/mac/default_pre.prf 2017-10-14 12:42:02.000000000 +0800 +@@ -1,56 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - @@ -183,18 +184,23 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qt - # Make sure Xcode path is valid - !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode is set up properly -- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ -- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") -} - --isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") +- +-!isEmpty(QMAKE_XCODEBUILD_PATH) { +- # Make sure Xcode is set up properly +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") +- +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } -} - -isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { @@ -222,10 +228,10 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qt -# feature, which allows Xcode to choose the Qt libraries to link to -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf ---- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf 2017-09-16 16:40:30.000000000 +0800 -+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf 2017-09-16 16:41:16.000000000 +0800 -@@ -1,49 +0,0 @@ +diff -u -r qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/sdk.prf qtbase-opensource-src-5.9.2/mkspecs/features/mac/sdk.prf +--- qtbase-opensource-src-5.9.2.orig/mkspecs/features/mac/sdk.prf 2017-10-14 12:31:04.000000000 +0800 ++++ qtbase-opensource-src-5.9.2/mkspecs/features/mac/sdk.prf 2017-10-14 12:42:10.000000000 +0800 +@@ -1,58 +0,0 @@ - -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") @@ -235,13 +241,22 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-ope - -defineReplace(xcodeSDKInfo) { - info = $$1 +- equals(info, "Path"): \ +- info = --show-sdk-path +- equals(info, "PlatformPath"): \ +- info = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- info = --show-sdk-version - sdk = $$2 - isEmpty(sdk): \ - sdk = $$QMAKE_MAC_SDK - - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null") -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'") +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") +- # --show-sdk-platform-path won't work for Command Line Tools; this is fine +- # only used by the XCTest backend to testlib +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ +- error("Could not resolve SDK $$info for \'$$sdk\'") - cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) - } - @@ -275,4 +290,3 @@ diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-ope - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -Common subdirectories: qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/unsupported and qtbase-opensource-src-5.9.1/mkspecs/features/mac/unsupported diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh index 4458e18a454f..ce1dada0c479 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -182,7 +182,8 @@ _qtFixCMakePaths() { find "${!outputLib}" -name "*.cmake" | while read file; do substituteInPlace "$file" \ --subst-var-by NIX_OUT "${!outputLib}" \ - --subst-var-by NIX_DEV "${!outputDev}" + --subst-var-by NIX_DEV "${!outputDev}" \ + --subst-var-by NIX_BIN "${!outputBin}" done } diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix deleted file mode 100644 index ae568bc6db17..000000000000 --- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, gfortran -, blas -, boost -, python -, ocl-icd -, cudatoolkit -, nvidia_x11 -, gtest -}: - -stdenv.mkDerivation rec { - name = "clblas-cuda-${version}"; - version = "git-20160505"; - - src = fetchFromGitHub { - owner = "clMathLibraries"; - repo = "clBLAS"; - rev = "d20977ec4389c6b3751e318779410007c5e272f8"; - sha256 = "1jna176cxznv7iz43svd6cjrbbf0fc2lrbpfpg4s08vc7xnwp0n4"; - }; - - patches = [ ./platform.patch ]; - - postPatch = '' - sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt - ''; - - configurePhase = '' - findInputs ${boost.dev} boost_dirs propagated-native-build-inputs - - export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include - export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib - - mkdir -p Build - pushd Build - - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ blas nvidia_x11 ]}" - - cmake ../src -DCMAKE_INSTALL_PREFIX=$out \ - -DCMAKE_BUILD_TYPE=Release \ - -DOPENCL_ROOT=${cudatoolkit} \ - -DUSE_SYSTEM_GTEST=ON - ''; - - dontStrip = true; - - buildInputs = [ - cmake - gfortran - blas - python - ocl-icd - cudatoolkit - nvidia_x11 - gtest - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/clMathLibraries/clBLAS; - description = "A software library containing BLAS functions written in OpenCL"; - longDescription = '' - This package contains a library of BLAS functions on top of OpenCL. - The current version is linked to the NVIDIA OpenCL implementation provided by the CUDA toolkit. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix new file mode 100644 index 000000000000..40b02d303417 --- /dev/null +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, cmake +, gfortran +, blas +, boost +, python +, ocl-icd +, opencl-headers +, gtest +}: + +stdenv.mkDerivation rec { + name = "clblas-${version}"; + version = "2.12"; + + src = fetchFromGitHub { + owner = "clMathLibraries"; + repo = "clBLAS"; + rev = "v${version}"; + sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; + }; + + patches = [ ./platform.patch ]; + + postPatch = '' + sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt + ''; + + preConfigure = '' + cd src + ''; + + cmakeFlags = [ + "-DUSE_SYSTEM_GTEST=ON" + ]; + + buildInputs = [ + cmake + gfortran + blas + python + ocl-icd + opencl-headers + boost + gtest + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/clMathLibraries/clBLAS"; + description = "A software library containing BLAS functions written in OpenCL"; + longDescription = '' + This package contains a library of BLAS functions on top of OpenCL. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/science/math/clblas/cuda/platform.patch b/pkgs/development/libraries/science/math/clblas/platform.patch index 87404a426a4b..87404a426a4b 100644 --- a/pkgs/development/libraries/science/math/clblas/cuda/platform.patch +++ b/pkgs/development/libraries/science/math/clblas/platform.patch diff --git a/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix deleted file mode 100644 index 2e0b98496f3c..000000000000 --- a/pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, requireFile -, cudatoolkit -}: - -stdenv.mkDerivation rec { - version = "5.0"; - cudatoolkit_version = "7.5"; - - name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; - - src = requireFile rec { - name = "cudnn-${cudatoolkit_version}-linux-x64-v${version}-ga.tgz"; - message = '' - This nix expression requires that ${name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library - at https://developer.nvidia.com/cudnn, and run the following command in the download directory: - nix-prefetch-url file://${name} - ''; - sha256 = "c4739a00608c3b66a004a74fc8e721848f9112c5cb15f730c1be4964b3a23b3a"; - }; - - phases = "unpackPhase installPhase fixupPhase"; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib64/libcudnn.so - - mkdir -p $out - cp -a include $out/include - cp -a lib64 $out/lib64 - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - meta = { - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; - }; -} diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix deleted file mode 100644 index fd98001da82b..000000000000 --- a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, requireFile -, cudatoolkit -, fetchurl -}: - -stdenv.mkDerivation rec { - version = "5.1"; - cudatoolkit_version = "8.0"; - - name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; - - src = fetchurl { - url = "http://developer.download.nvidia.com/compute/redist/cudnn/v5.1/cudnn-8.0-linux-x64-v5.1.tgz"; - sha256 = "1kj50smlkm347wfbfqvy09ylvad1zapqjc9yqvfykmiddyrij1y1"; - }; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib64/libcudnn.so - - mkdir -p $out - cp -a include $out/include - cp -a lib64 $out/lib64 - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - meta = with stdenv.lib; { - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; - maintainers = with maintainers; [ mdaiter ]; - }; -} diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix deleted file mode 100644 index f0cfb906b1fe..000000000000 --- a/pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, requireFile -, cudatoolkit -, fetchurl -}: - -stdenv.mkDerivation rec { - version = "6.0"; - cudatoolkit_version = "8.0"; - - name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; - - src = fetchurl { - url = "http://developer.download.nvidia.com/compute/redist/cudnn/v6.0/cudnn-8.0-linux-x64-v6.0.tgz"; - sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv"; - }; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib64/libcudnn.so - - mkdir -p $out - cp -a include $out/include - cp -a lib64 $out/lib64 - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - meta = with stdenv.lib; { - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; - maintainers = with maintainers; [ jyp ]; - }; -} diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 1e1a37af2f0e..db66d8545883 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,34 +1,45 @@ -{ stdenv, requireFile, cudatoolkit }: +{ callPackage, cudatoolkit7, cudatoolkit75, cudatoolkit8, cudatoolkit9 }: -stdenv.mkDerivation rec { - version = "4.0"; +let + generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { + inherit (args) cudatoolkit; + }; - name = "cudnn-${version}"; +in - src = requireFile rec { - name = "cudnn-7.0-linux-x64-v${version}-prod.tgz"; - message = '' - This nix expression requires that ${name} is - already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program - and download cuDNN library at https://developer.nvidia.com/cudnn, and store it to the nix store with nix-store --add-fixed sha256 <FILE>. - ''; +{ + cudnn_cudatoolkit7 = generic rec { + version = "4.0"; + cudatoolkit = cudatoolkit7; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz"; sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f"; - }; - phases = "unpackPhase installPhase fixupPhase"; + cudnn_cudatoolkit75 = generic rec { + version = "6.0"; + cudatoolkit = cudatoolkit75; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; + sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an"; + }; - propagatedBuildInputs = [ cudatoolkit ]; + cudnn6_cudatoolkit8 = generic rec { + version = "6.0"; + cudatoolkit = cudatoolkit8; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; + sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv"; + }; - installPhase = '' - mkdir -p $out - cp -a include $out/include - cp -a lib64 $out/lib64 - ''; + cudnn_cudatoolkit8 = generic rec { + version = "7.0"; + cudatoolkit = cudatoolkit8; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; + sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398"; + }; - meta = { - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; + cudnn_cudatoolkit9 = generic rec { + version = "7.0"; + cudatoolkit = cudatoolkit9; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; + sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc"; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index a0d8baae78fd..663b741e4748 100644 --- a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,29 +1,34 @@ +{ version +, srcName +, sha256 +}: + { stdenv +, lib , requireFile , cudatoolkit }: stdenv.mkDerivation rec { - version = "5.0"; - cudatoolkit_version = "8.0"; + name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; - name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; + inherit version; src = requireFile rec { - name = "cudnn-${cudatoolkit_version}-linux-x64-v${version}-ga.tgz"; + name = srcName; + inherit sha256; message = '' This nix expression requires that ${name} is already part of the store. Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library at https://developer.nvidia.com/cudnn, and run the following command in the download directory: nix-prefetch-url file://${name} ''; - sha256 = "af80eb1ce0cb51e6a734b2bdc599e6d50b676eab3921e5bddfe5443485df86b6"; }; installPhase = '' function fixRunPath { p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 } fixRunPath lib64/libcudnn.so @@ -36,10 +41,16 @@ stdenv.mkDerivation rec { cudatoolkit ]; + passthru = { + inherit cudatoolkit; + majorVersion = lib.head (lib.splitString "." version); + }; + meta = with stdenv.lib; { description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = https://developer.nvidia.com/cudnn; - license = stdenv.lib.licenses.unfree; + homepage = "https://developer.nvidia.com/cudnn"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mdaiter ]; }; } diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 2ad2ed55d7c0..b74c58a2e38c 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "szip-2.1"; +stdenv.mkDerivation rec { + name = "szip-${version}"; + version = "2.1.1"; src = fetchurl { - url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; - sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8"; + url = "ftp://ftp.hdfgroup.org/lib-external/szip/${version}/src/szip-${version}.tar.gz"; + sha256 = "1a8415a7xifagb22aq9dmy7b2s5l0y6diany3b4qigylw6adlzc9"; }; meta = { diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 4742e2170131..53207f855418 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "unibilium-${version}"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mauke"; repo = "unibilium"; rev = "v${version}"; - sha256 = "1qsw19irg70l29j7qv403f32l4rrzn53w7881a6h874j9gisl51s"; + sha256 = "11mbfijdrvbmdlmxs8j4vij78ki0vna89yg3r9n9g1i6j45hiq2r"; }; makeFlags = [ "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix new file mode 100644 index 000000000000..9112079a90ea --- /dev/null +++ b/pkgs/development/libraries/v8/3.14.nix @@ -0,0 +1,86 @@ +# This old version of V8 is still needed for the R V8 module +{ stdenv, callPackage, fetchFromGitHub, gyp, readline, python, which, icu, ... }: + +assert readline != null; + +with stdenv.lib; +let + version = "3.14.5.10"; + sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k"; + + arch = if stdenv.is64bit then "x64" else "ia32"; + +in +stdenv.mkDerivation rec { + name = "v8-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = "${version}"; + inherit sha256; + }; + patchPhase = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 + sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8 + ''; + + configurePhase = '' + PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + build/gyp_v8 \ + -f make \ + --generator-output="out" \ + -Dflock_index=0 \ + -Dv8_enable_i18n_support=1 \ + -Duse_system_icu=1 \ + -Dconsole=readline \ + -Dcomponent=shared_library \ + -Dv8_target_arch=${arch} + ''; + + nativeBuildInputs = [ which ]; + buildInputs = [ readline python icu ]; + + # http://code.google.com/p/v8/issues/detail?id=2149 + NIX_CFLAGS_COMPILE = concatStringsSep " " [ + "-Wno-error=strict-overflow" + "-Wno-unused-local-typedefs" + "-Wno-aggressive-loop-optimizations" + ]; + + buildFlags = [ + "LINK=g++" + "-C out" + "builddir=$(CURDIR)/Release" + "BUILDTYPE=Release" + ]; + + postPatch = stdenv.lib.optionalString (!stdenv.cc.isClang) '' + sed -i build/standalone.gyp -e 's,-Wno-format-pedantic,,g' + ''; + + enableParallelBuilding = true; + + installPhase = '' + install -vD out/Release/d8 "$out/bin/d8" + ${if stdenv.system == "x86_64-darwin" then '' + install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" + '' else '' + install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" + ''} + cp -vr include "$out/" + ''; + + postFixup = if stdenv.isDarwin then '' + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else null; + + meta = with stdenv.lib; { + description = "Google's open source JavaScript engine"; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index c67070094de6..95a8603e08ca 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "0.0.9"; # 0.0.10 currently causes segfaults + version = "0.0.10"; src = fetchFromGitHub { owner = "Cloudef"; repo = "wlc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; + sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/wt/cmake.patch b/pkgs/development/libraries/wt/cmake.patch deleted file mode 100644 index e7b1f87411d9..000000000000 --- a/pkgs/development/libraries/wt/cmake.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt 2016-07-13 14:27:26.000000000 +0200 -+++ b/CMakeLists.txt 2016-08-16 12:58:28.135652964 +0200 -@@ -6,6 +6,7 @@ - CMAKE_POLICY(SET CMP0002 OLD) - CMAKE_POLICY(SET CMP0003 OLD) - CMAKE_POLICY(SET CMP0005 OLD) -+ CMAKE_POLICY(SET CMP0037 OLD) - ENDIF(COMMAND CMAKE_POLICY) - - PROJECT(WT) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 5d4caed890a8..3adf4f1497f8 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,24 +1,27 @@ -{stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu, - pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl, - pcre }: +{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu +, pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl +, pcre +}: stdenv.mkDerivation rec { - name = "wt"; - version = "3.3.6"; + name = "wt-${version}"; + version = "4.0.0"; src = fetchFromGitHub { owner = "kdeforche"; - repo = name; + repo = "wt"; rev = version; - sha256 = "1pvykc969l9cpd0da8bgpi4gr8f6qczrbpprrxamyj1pn0ydzvq3"; + sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost doxygen qt48Full libharu - pango fcgi firebird libmysql postgresql graphicsmagick glew - openssl pcre ]; + buildInputs = [ + cmake boost doxygen qt48Full libharu + pango fcgi firebird libmysql postgresql graphicsmagick glew + openssl pcre + ]; cmakeFlags = [ "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" @@ -28,12 +31,10 @@ stdenv.mkDerivation rec { "--no-warn-unused-cli" ]; - patches = [ ./cmake.patch ]; # fix a cmake warning; PR sent to upstream - meta = with stdenv.lib; { homepage = https://www.webtoolkit.eu/wt; description = "C++ library for developing web applications"; - platforms = platforms.linux ; + platforms = platforms.linux; license = licenses.gpl2; maintainers = [ maintainers.juliendehos ]; }; diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix new file mode 100644 index 000000000000..d702500bf719 --- /dev/null +++ b/pkgs/development/libraries/xxHash/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "xxHash-${version}"; + version = "0.6.3.20171018"; + + src = fetchFromGitHub { + sha256 = "0061ivxpx0p24m4vg7kfx9fs9f0jxvv4g76bmyss5gp90p05hc18"; + rev = "333804ccf0c0339451accac023deeab9e5f7c002"; + repo = "xxHash"; + owner = "Cyan4973"; + }; + + outputs = [ "out" "dev" ]; + + makeFlags = [ "PREFIX=$(out)" "INCLUDEDIR=$(dev)/include" ]; + + meta = with stdenv.lib; { + description = "Extremely fast hash algorithm"; + longDescription = '' + xxHash is an Extremely fast Hash algorithm, running at RAM speed limits. + It successfully completes the SMHasher test suite which evaluates + collision, dispersion and randomness qualities of hash functions. Code is + highly portable, and hashes are identical on all platforms (little / big + endian). + ''; + homepage = https://github.com/Cyan4973/xxHash; + license = with licenses; [ bsd2 gpl2 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix new file mode 100644 index 000000000000..48517036dc6d --- /dev/null +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: + +stdenv.mkDerivation rec { + name = "camomile-${version}"; + version = "0.8.5"; + + src = fetchurl { + url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; + sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; + }; + + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch; + sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; + })]; + + buildInputs = [ocaml findlib camlp4]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; + description = "A comprehensive Unicode library for OCaml"; + license = stdenv.lib.licenses.lgpl21; + platforms = ocaml.meta.platforms or []; + maintainers = [ + stdenv.lib.maintainers.z77z + ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 48517036dc6d..897a3ff6036d 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,30 +1,27 @@ -{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, cppo }: stdenv.mkDerivation rec { - name = "camomile-${version}"; - version = "0.8.5"; + version = "0.8.6"; + name = "ocaml${ocaml.version}-camomile-${version}"; - src = fetchurl { - url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; - sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; - }; + src = fetchFromGitHub { + owner = "yoriyuki"; + repo = "camomile"; + rev = "rel-${version}"; + sha256 = "1jq1xhaikczk6lbvas7c35aa04q0kjaqd8m54c4jivpj80yvg4x9"; + }; - patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch; - sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; - })]; + buildInputs = [ ocaml findlib jbuilder cppo ]; - buildInputs = [ocaml findlib camlp4]; + configurePhase = "ocaml configure.ml --share $out/share/camomile"; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; - meta = { - homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; - description = "A comprehensive Unicode library for OCaml"; - license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = [ - stdenv.lib.maintainers.z77z - ]; - }; + meta = { + inherit (ocaml.meta) platforms; + inherit (src.meta) homepage; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.lgpl21; + description = "A Unicode library for OCaml"; + }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index d6e56126018c..9d01b73479a4 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: let pname = "lablgtk"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4]; + buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index f6379c8b5a75..e005024d2225 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocamlgraph-${version}"; - version = "1.8.7"; + version = "1.8.8"; src = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; - sha256 = "1845r537swjil2fcj7lgbibc2zybfwqqasrd2s7bncajs83cl1nz"; + sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; }; buildInputs = [ ocaml findlib lablgtk ]; diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index 41d68cdc4c42..874893d62976 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-omd-1.3.0"; + name = "ocaml${ocaml.version}-omd-1.3.1"; src = fetchurl { - url = http://pw374.github.io/distrib/omd/omd-1.3.0.tar.gz; - sha256 = "0d0r6c4s3hq11d0qjc0bc1s84hz7k8nfg5q6g239as8myam4a80w"; + url = "https://github.com/Chris00/omd/releases/download/1.3.1/omd-1.3.1.tar.gz"; + sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 63696ad3e0c5..e5533d3ad4be 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -2,11 +2,11 @@ buildOcaml { name = "pcre"; - version = "7.1.1"; + version = "7.2.3"; src = fetchurl { - url = https://github.com/mmottl/pcre-ocaml/releases/download/v7.1.1/pcre-ocaml-7.1.1.tar.gz; - sha256 = "0nj4gb6hjjjmz5gnl9cjrh4w82rw8cvbwnk0hxhfgfd25p9k50n3"; + url = "https://github.com/mmottl/pcre-ocaml/releases/download/v7.2.3/pcre-ocaml-7.2.3.tar.gz"; + sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3"; }; buildInputs = [ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 1ea2310bf9fa..3be49072eb37 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { - name = "ocaml-re-1.5.0"; + name = "ocaml-re-${version}"; + version = "1.7.1"; src = fetchzip { - url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz"; - sha256 = "17avk7kwmgdjkri1sj5q4a59ykc9rj0bxj6ixxpl6i0n49br3f92"; + url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; + sha256 = "1z2z4fjrpdbl0q50fdxvy3746w1vx6ybxcb0k81hqm1342nylbmw"; }; buildInputs = [ ocaml findlib ocamlbuild ounit ]; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index ab949f4f1f22..2ce2faa7e8d6 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,15 +1,22 @@ { stdenv, fetchzip, ocaml, findlib, cppo, easy-format, biniou }: let pname = "yojson"; - version = "1.2.3"; + param = + if stdenv.lib.versionAtLeast ocaml.version "4.01" then { + version = "1.3.3"; + sha256 = "02l11facbr6bxrxq95vrcp1dxapp02kv7g4gq8rm62pb3dj5c6g7"; + } else { + version = "1.2.3"; + sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; + }; in stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${param.version}"; src = fetchzip { - url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz"; - sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; + url = "https://github.com/mjambon/${pname}/archive/v${param.version}.tar.gz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 72ff8e4c0497..85977792b4d3 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, jbuilder }: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then + { + version = "1.5"; + sha256 = "1nq884cxl1k4daa549bk7bxarwivbpp51k4blbiwyxwfhs29xgfr"; + buildInputs = [ jbuilder ]; + extra = { + buildPhase = "jbuilder build -p zed"; + inherit (jbuilder) installPhase; }; + } else { + version = "1.4"; + sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; + buildInputs = []; + extra = { createFindlibDestdir = true; }; + } +; in -stdenv.mkDerivation rec { - version = "1.4"; +stdenv.mkDerivation (rec { + inherit (param) version; name = "ocaml-zed-${version}"; src = fetchzip { url = "https://github.com/diml/zed/archive/${version}.tar.gz"; - sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild react ]; - - propagatedBuildInputs = [ camomile ]; + buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs; - createFindlibDestdir = true; + propagatedBuildInputs = [ react camomile ]; meta = { description = "Abstract engine for text edition in OCaml"; @@ -31,4 +46,4 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.gal_bolle ]; }; -} +} // param.extra) diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix new file mode 100644 index 000000000000..e0ff839ce1b7 --- /dev/null +++ b/pkgs/development/python-modules/Theano/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, fetchPypi +, gcc +, writeScriptBin +, buildPythonPackage +, isPyPy +, pythonOlder +, isPy3k +, nose +, numpy +, pydot_ng +, scipy +, six +, libgpuarray +, cudaSupport ? false, cudatoolkit +, cudnnSupport ? false, cudnn +}: + +assert cudnnSupport -> cudaSupport; + +let + extraFlags = + lib.optionals cudaSupport [ "-I ${cudatoolkit}/include" "-L ${cudatoolkit}/lib" ] + ++ lib.optionals cudnnSupport [ "-I ${cudnn}/include" "-L ${cudnn}/lib" ]; + + gcc_ = writeScriptBin "g++" '' + #!${stdenv.shell} + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${toString extraFlags}" + exec ${gcc}/bin/g++ "$@" + ''; + + libgpuarray_ = libgpuarray.override { inherit cudaSupport; }; + +in buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Theano"; + version = "0.9.0"; + + disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); + + src = fetchPypi { + inherit pname version; + sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl"; + }; + + postPatch = '' + sed -i 's,g++,${gcc_}/bin/g++,g' theano/configdefaults.py + '' + lib.optionalString cudnnSupport '' + sed -i \ + -e "s,ctypes.util.find_library('cudnn'),'${cudnn}/lib/libcudnn.so',g" \ + -e "s/= _dnn_check_compile()/= (True, None)/g" \ + theano/gpuarray/dnn.py + ''; + + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + doCheck = false; + # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'" + # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276, + # the fix for which hasn't been merged yet. + + # keep Nose around since running the tests by hand is possible from Python or bash + checkInputs = [ nose ]; + propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ]; + + meta = with stdenv.lib; { + homepage = http://deeplearning.net/software/theano/; + description = "A Python library for large-scale array computation"; + license = licenses.bsd3; + maintainers = with maintainers; [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix deleted file mode 100644 index f8b7a713d08e..000000000000 --- a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ buildPythonPackage -, fetchFromGitHub -, pythonOlder -, future -, numpy -, six -, scipy -, nose -, nose-parameterized -, pydot_ng -, sphinx -, pygments -, libgpuarray -, python -, pycuda -, cudatoolkit -, cudnn -, stdenv -}: - -buildPythonPackage rec { - name = "Theano-cuda-${version}"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "Theano"; - repo = "Theano"; - rev = "46fbfeb628220b5e42bf8277a5955c52d153e874"; - sha256 = "1sl91gli3jaw5gpjqqab4fiq4x6282spqciaid1s65pjsf3k55sc"; - }; - - doCheck = false; - - patchPhase = '' - pushd theano/sandbox/gpuarray - sed -i -re '2s/^/from builtins import bytes\n/g' subtensor.py - sed -i -re "s/(b'2')/int(bytes(\1))/g" subtensor.py - sed -i -re "s/(ctx.bin_id\[\-2\])/int(\1)/g" subtensor.py - - sed -i -re '2s/^/from builtins import bytes\n/g' dnn.py - sed -i -re "s/(b'30')/int(bytes(\1))/g" dnn.py - sed -i -re "s/(ctx.bin_id\[\-2:\])/int(\1)/g" dnn.py - popd - ''; - - dontStrip = true; - - propagatedBuildInputs = [ - numpy.blas - numpy - six - scipy - nose - nose-parameterized - pydot_ng - sphinx - pygments - pycuda - cudatoolkit - libgpuarray - cudnn - ] ++ (stdenv.lib.optional (pythonOlder "3.0") future); - - passthru.cudaSupport = true; -} diff --git a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix deleted file mode 100644 index e93af7436190..000000000000 --- a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, fetchurl -, buildPythonPackage -, isPyPy -, pythonOlder -, isPy3k -, nose -, numpy -, pydot_ng -, scipy -, six -}: - -buildPythonPackage rec { - name = "Theano-0.9.0"; - - disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); - - src = fetchurl { - url = "mirror://pypi/T/Theano/${name}.tar.gz"; - sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl"; - }; - - #preCheck = '' - # mkdir -p check-phase - # export HOME=$(pwd)/check-phase - #''; - doCheck = false; - # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'" - # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276, - # the fix for which hasn't been merged yet. - - # keep Nose around since running the tests by hand is possible from Python or bash - propagatedBuildInputs = [ nose numpy numpy.blas pydot_ng scipy six ]; - - meta = { - homepage = http://deeplearning.net/software/theano/; - description = "A Python library for large-scale array computation"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.bcdarwin ]; - }; - - passthru.cudaSupport = false; -} diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix new file mode 100644 index 000000000000..7c2147a6431a --- /dev/null +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage, fetchPypi, python, stdenv, nose +}: + +buildPythonPackage rec { + pname = "colorlover"; + version = "0.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1clwvssrj007r07prfvkqnpjy3f77dlp584lj879x8mwl8f0japi"; + }; + + # no tests included in distributed archive + doCheck = false; + + meta = { + homepage = https://github.com/jackparmer/colorlover; + description = "Color scales in Python for humans"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ globin ]; + }; +} diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix new file mode 100644 index 000000000000..620f85e436d3 --- /dev/null +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, stdenv, fetchPypi, pandas, plotly, colorlover +}: + +buildPythonPackage rec { + pname = "cufflinks"; + version = "0.12.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "04ninvwm6277n3hqc17ririss90cd832wza3q3vf115rrrds3xyy"; + }; + + propagatedBuildInputs = [ pandas plotly colorlover ]; + + # tests not included in archive + doCheck = false; + + meta = { + homepage = https://github.com/santosjorge/cufflinks; + description = "Productivity Tools for Plotly + Pandas"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ globin ]; + }; +} diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 483a8eb23d01..fb5a62296b92 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -1,21 +1,22 @@ { stdenv, buildPythonPackage, fetchurl, substituteAll, pythonOlder, - geos, gdal, pytz + geos, gdal, pytz, + withGdal ? false }: buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.5"; + version = "1.11.6"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "0a9bk1a0n0264lcr67fmwzqyhkhy6bqdzkxsj9a8dpyzca0qfdhq"; + sha256 = "0q0cmwifa6c0k6kh8fpa3mjmqw7yqd616qz8m4ls3h51xyhjrd63"; }; - patches = [ + patches = stdenv.lib.optionals withGdal [ (substituteAll { src = ./1.10-gis-libs.template.patch; geos = geos; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 47110ffe3ba4..789beaa2384c 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -7,13 +7,13 @@ else stdenv.mkDerivation rec { pname = "libarcus"; name = "${pname}-${version}"; - version = "2.6.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1arh0gkwcjv0j3arh1w04gbwkn5glrs7gbli0b1ak7dalnicmn7c"; + sha256 = "05dpd6nx32nws0ghsm365wlsb8hg2s3v9fqcmdk11biwfhnr6rjw"; }; propagatedBuildInputs = [ sip protobuf ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Communication library between internal components for Ultimaker software"; - homepage = https://github.com/Ultimaker/libArcus; + homepage = "https://github.com/Ultimaker/libArcus"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix deleted file mode 100644 index a9c64cd7d7f8..000000000000 --- a/pkgs/development/python-modules/libgpuarray/cuda/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, cmake -, cython -, numpy -, Mako -, six -, nose -, beaker -, memcached -, pkgconfig -, glibc -, clblas -, Babel -, pygments -, scipy -, python -, cudatoolkit -, nvidia_x11 -}: -buildPythonPackage rec { - name = "libgpuarray-cuda-${version}"; - version = "-9998.0"; - - src = fetchFromGitHub { - owner = "Theano"; - repo = "libgpuarray"; - rev = "fc36a40526c0a8303ace6c574ffdefba7feafe17"; - sha256 = "1kb0k42addqjxiahlcbv6v6271yhsmz71j12186fpy60870i7zm7"; - }; - - doCheck = true; - - configurePhase = '' - mkdir -p Build/Install - pushd Build - - cmake .. -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=./Install \ - -DCLBLAS_ROOT_DIR=${clblas} - - popd - ''; - - preBuild = '' - pushd Build - make - make install - - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ cudatoolkit clblas nvidia_x11 ]}" $1 - } - - fixRunPath Install/lib/libgpuarray.so - - popd - ''; - - setupPyBuildFlags = [ "-L $(pwd)/Build/Install/lib" "-I $(pwd)/Build/Install/include" ]; - - preInstall = '' - cp -r Build/Install $out - ''; - - postInstall = '' - pushd $out/${python.sitePackages}/pygpu - for f in $(find $out/pygpu -name "*.h"); do - ln -s $f $(basename $f) - done - popd - ''; - checkPhase = '' - mkdir -p my_bin - pushd my_bin - - cat > libgpuarray_run_tests << EOF -#!/bin/sh -if [ \$# -eq 0 ]; then - echo "No argument provided." - echo "Available tests:" - ls $out/${python.sitePackages}/pygpu/tests | grep "test_" - exit 1 -else - nosetests -v "$out/${python.sitePackages}/pygpu/tests/\$@" -fi -EOF - - chmod +x libgpuarray_run_tests - popd - - cp -r my_bin $out/bin - ''; - - dontStrip = true; - - propagatedBuildInputs = [ - numpy - scipy - nose - six - Mako - ]; - - buildInputs = [ - cmake - cython - beaker - memcached - pkgconfig - glibc - Babel - pygments - numpy.blas - cudatoolkit - nvidia_x11 - clblas - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/Theano/libgpuarray; - description = "Library to manipulate tensors on GPU."; - license = licenses.free; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix new file mode 100644 index 000000000000..3c24c2ed24cb --- /dev/null +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -0,0 +1,81 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, cython +, numpy +, six +, nose +, Mako +, python +, cudaSupport ? false, cudatoolkit +, openclSupport ? true, ocl-icd, clblas +}: + +buildPythonPackage rec { + name = "libgpuarray-${version}"; + version = "0.6.9"; + + src = fetchFromGitHub { + owner = "Theano"; + repo = "libgpuarray"; + rev = "v${version}"; + sha256 = "06z47ls42a37gbv0x7f3l1qvils7q0hvy02s95l530klgibp19s0"; + }; + + # requires a GPU + doCheck = false; + + configurePhase = "cmakeConfigurePhase"; + + libraryPath = lib.makeLibraryPath ( + [] + ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] + ++ lib.optionals openclSupport [ ocl-icd clblas ] + ); + + preBuild = '' + make -j$NIX_BUILD_CORES + make install + + ls $out/lib + export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE" + + cd .. + ''; + + postFixup = '' + rm $out/lib/libgpuarray-static.a + + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:$libraryPath" $1 + } + + fixRunPath $out/lib/libgpuarray.so + ''; + + propagatedBuildInputs = [ + numpy + six + Mako + ]; + + enableParallelBuilding = true; + + buildInputs = [ + cmake + cython + nose + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/Theano/libgpuarray"; + description = "Library to manipulate tensors on GPU."; + license = licenses.free; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix new file mode 100644 index 000000000000..835e39cc43e1 --- /dev/null +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytestrunner, python-utils, enum34 }: + +buildPythonPackage rec { + pname = "numpy-stl"; + name = "${pname}-${version}"; + version = "2.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w3f9yhw4mg88drqnn17gaqxbx941p3hg0rn8fsqrf5ry56h93k2"; + }; + + checkInputs = [ pytest pytestrunner ]; + + checkPhase = "py.test"; + + propagatedBuildInputs = [ cython numpy nine python-utils enum34 ]; + + meta = with lib; { + description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; + homepage = "https://github.com/WoLpH/numpy-stl/"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 5f54fb12ec23..9fb16bb03021 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.8.2"; + version = "8.8.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0xwis5hvp2wmnzqxax8896vhyb3q2fs9l9ilvyr44jdh3342dxpx"; + sha256 = "01kim7mwgm97wysclhyxcwvd2a8ifinaidkskglx7b2k0r7ji5sj"; }; meta = { diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 86f5adb28244..028d81d2934f 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -8,6 +8,9 @@ , pygit2 }: +# The source of this package needs to be patched to include the full path to +# the executables of git, mercurial and bazaar. + buildPythonPackage rec { rev = "2.6"; name = "powerline-${rev}"; @@ -17,7 +20,7 @@ buildPythonPackage rec { sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272"; }; - propagatedBuildInputs = [ git mercurial bazaar psutil pygit2]; + propagatedBuildInputs = [ psutil pygit2]; # error: This is still beta and some tests still fail doCheck = false; diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 51de5e8fad5c..a02aa94576e5 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k , boost, freetype, ftgl, mesa }: buildPythonPackage rec { @@ -11,6 +11,10 @@ buildPythonPackage rec { sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; + postPatch = stdenv.lib.optional isPy3k '' + sed -i "s,'boost_python','boost_python3',g" setup.py + ''; + buildInputs = [ boost freetype ftgl mesa ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix new file mode 100644 index 000000000000..a8faadffc112 --- /dev/null +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, fontconfig, python, freefont_ttf, makeFontsConf }: + +let + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; +in buildPythonPackage rec { + pname = "Python-fontconfig"; + version = "0.5.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "154rfd0ygcbj9y8m32n537b457yijpfx9dvmf76vi0rg4ikf7kxp"; + }; + + buildInputs = [ fontconfig ]; + + checkPhase = '' + export FONTCONFIG_FILE=${fontsConf}; + echo y | ${python.interpreter} test/test.py + ''; + + meta = { + homepage = https://github.com/Vayn/python-fontconfig; + description = "Python binding for Fontconfig"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix new file mode 100644 index 000000000000..6acd0934f471 --- /dev/null +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: + +buildPythonPackage rec { + name = "python-utils-${version}"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "WoLpH"; + repo = "python-utils"; + rev = "v${version}"; + sha256 = "1i3q9frai08nvrcmh4dg4rr0grncm68w2c097z5g1mfwdf9sv7df"; + }; + + checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; + + checkPhase = '' + rm nix_run_setup.py + py.test + ''; + + propagatedBuildInputs = [ six ]; + + meta = with lib; { + description = "Module with some convenient utilities"; + homepage = "https://github.com/WoLpH/python-utils"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 00a5df843c5e..a0a2f3a24afc 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,156 +1,179 @@ -{ stdenv -, symlinkJoin -, lib -, fetchurl -, buildPythonPackage -, isPy3k, isPy35, isPy36, isPy27 -, cudaSupport ? false -, cudatoolkit ? null -, cudnn ? null -, linuxPackages ? null -, numpy -, six -, protobuf -, mock -, backports_weakref -, zlib -, tensorflow-tensorboard +{ stdenv, lib, fetchFromGitHub, fetchpatch, symlinkJoin, buildPythonPackage, isPy3k, pythonOlder +, bazel, which, swig, binutils, glibcLocales +, python, jemalloc, openmpi +, numpy, six, protobuf, tensorflow-tensorboard, backports_weakref +, wheel, mock, scipy +, xlaSupport ? true +, cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null +# Default from ./configure script +, cudaCapabilities ? [ "3.5" "5.2" ] }: assert cudaSupport -> cudatoolkit != null - && cudnn != null - && linuxPackages != null; + && cudnn != null; # unsupported combination assert ! (stdenv.isDarwin && cudaSupport); -# tensorflow is built from a downloaded wheel, because the upstream -# project's build system is an arcane beast based on -# bazel. Untangling it and building the wheel from source is an open -# problem. +let -buildPythonPackage rec { - pname = "tensorflow"; - version = "1.3.0"; - name = "${pname}-${version}"; - format = "wheel"; - disabled = ! (isPy35 || isPy36 || isPy27); + withTensorboard = pythonOlder "3.6"; - # cudatoolkit is split (see https://github.com/NixOS/nixpkgs/commit/bb1c9b027d343f2ce263496582d6b56af8af92e6) - # However this means that libcusolver is not loadable by tensor flow. So we undo the split here. cudatoolkit_joined = symlinkJoin { - name = "unsplit_cudatoolkit"; - paths = [ cudatoolkit.out - cudatoolkit.lib ];}; - - src = let - tfurl = sys: proc: pykind: - let - tfpref = if proc == "gpu" - then "gpu/tensorflow_gpu" - else "cpu/tensorflow"; - in - "https://storage.googleapis.com/tensorflow/${sys}/${tfpref}-${version}-${pykind}.whl"; - dls = - { - darwin.cpu = { - py2 = { - url = tfurl "mac" "cpu" "py2-none-any" ; - sha256 = "0nkymqbqjx8rsmc8vkc26cfsg4hpr6lj9zrwhjnfizvkzbbsh5z4"; - }; - py3 = { - url = tfurl "mac" "cpu" "py3-none-any" ; - sha256 = "1rj4m817w3lajnb1lgn3bwfwwk3qwvypyx11dim1ybakbmsc1j20"; - }; - }; - linux-x86_64.cpu = { - py2 = { - url = tfurl "linux" "cpu" "cp27-none-linux_x86_64"; - sha256 = "09pcyx0yfil4dm6cij8n3907pfgva07a38avrbai4qk5h6hxm8w9"; - }; - py35 = { - url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64"; - sha256 = "0p10zcf41pi33bi025fibqkq9rpd3v0rrbdmc9i9yd7igy076a07"; - }; - py36 = { - url = tfurl "linux" "cpu" "cp36-cp36m-linux_x86_64"; - sha256 = "1qm8lm2f6bf9d462ybgwrz0dn9i6cnisgwdvyq9ssmy2f1gp8hxk"; - }; - }; - linux-x86_64.cuda = { - py2 = { - url = tfurl "linux" "gpu" "cp27-none-linux_x86_64"; - sha256 = "10yyyn4g2fsv1xgmw99bbr0fg7jvykay4gb5pxrrylh7h38h6wah"; - }; - py35 = { - url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64"; - sha256 = "0icwnhkcf3fxr6bmbihqzipnn4pxybd06qv7l3k0p4xdgycwzmzk"; - }; - py36 = { - url = tfurl "linux" "gpu" "cp36-cp36m-linux_x86_64"; - sha256 = "12g3akkr083gs3sisjbmm0lpsk8phn3dvy7jjfadfxshqc7za14i"; - }; - }; - }; - in - fetchurl ( - if stdenv.isDarwin then - if isPy3k then - dls.darwin.cpu.py3 - else - dls.darwin.cpu.py2 - else - if isPy35 then - if cudaSupport then - dls.linux-x86_64.cuda.py35 - else - dls.linux-x86_64.cpu.py35 - else if isPy36 then - if cudaSupport then - dls.linux-x86_64.cuda.py36 - else - dls.linux-x86_64.cpu.py36 - else - if cudaSupport then - dls.linux-x86_64.cuda.py2 - else - dls.linux-x86_64.cpu.py2 - ); - - propagatedBuildInputs = - [ numpy six protobuf mock backports_weakref ] - ++ lib.optional (!isPy36) tensorflow-tensorboard - ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn stdenv.cc ]; - - # tensorflow-gpu depends on tensorflow_tensorboard, which cannot be + name = "${cudatoolkit.name}-unsplit"; + paths = [ cudatoolkit.out cudatoolkit.lib ]; + }; + + cudaLibPath = lib.makeLibraryPath [ cudatoolkit.out cudatoolkit.lib nvidia_x11 cudnn ]; + + tfFeature = x: if x then "1" else "0"; + + common = rec { + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "tensorflow"; + repo = "tensorflow"; + rev = "v${version}"; + sha256 = "0gvi32dvv4ynr05p0gg5i0a6c55pig48k5qm7zslcqnp4sifwx0i"; + }; + + nativeBuildInputs = [ swig which wheel scipy ]; + + buildInputs = [ python jemalloc openmpi glibcLocales ] + ++ lib.optionals cudaSupport [ cudatoolkit cudnn ]; + + propagatedBuildInputs = [ numpy six protobuf ] + ++ lib.optional (!isPy3k) mock + ++ lib.optional (pythonOlder "3.4") backports_weakref + ++ lib.optional withTensorboard tensorflow-tensorboard; + + preConfigure = '' + patchShebangs configure + export HOME="$NIX_BUILD_TOP" + + export PYTHON_BIN_PATH="${python.interpreter}" + export TF_NEED_GCP=1 + export TF_NEED_HDFS=1 + export TF_NEED_CUDA=${tfFeature cudaSupport} + export TF_NEED_MPI=1 + export TF_ENABLE_XLA=${tfFeature xlaSupport} + ${lib.optionalString cudaSupport '' + export CUDA_TOOLKIT_PATH=${cudatoolkit_joined} + export TF_CUDA_VERSION=${cudatoolkit.majorVersion} + export CUDNN_INSTALL_PATH=${cudnn} + export TF_CUDNN_VERSION=${cudnn.majorVersion} + export GCC_HOST_COMPILER_PATH=${cudatoolkit.cc}/bin/gcc + export TF_CUDA_COMPUTE_CAPABILITIES=${lib.concatStringsSep "," cudaCapabilities} + ''} + + # There is _no_ non-interactive mode of configure. + sed -i \ + -e 's,read -p,echo,g' \ + -e 's,lib64,lib,g' \ + configure + ''; + + hardeningDisable = [ "all" ]; + + bazelFlags = [ "--config=opt" ] + ++ lib.optional cudaSupport "--config=cuda"; + + bazelTarget = "//tensorflow/tools/pip_package:build_pip_package"; + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = "http://tensorflow.org"; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = with platforms; if cudaSupport then linux else linux ++ darwin; + }; + }; + +in buildPythonPackage (common // { + name = "tensorflow-${common.version}"; + + deps = stdenv.mkDerivation (common // { + name = "tensorflow-external-${common.version}"; + + nativeBuildInputs = common.nativeBuildInputs ++ [ bazel ]; + + preConfigure = common.preConfigure + '' + export PYTHON_LIB_PATH="$(pwd)/site-packages" + ''; + + buildPhase = '' + mkdir site-packages + bazel --output_base="$(pwd)/output" fetch $bazelFlags $bazelTarget + ''; + + installPhase = '' + rm -rf output/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*} + # Patching markers to make them deterministic + for i in output/external/\@*.marker; do + sed -i 's, -\?[0-9][0-9]*$, 1,' "$i" + done + # Patching symlinks to remove build directory reference + find output/external -type l | while read symlink; do + ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink" + done + + cp -r output/external $out + ''; + + dontFixup = true; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "0xs2n061gnpizfcnhs5jjpfk2av634j1l2l17zhy10bbmrwn3vrp"; + }); + + nativeBuildInputs = common.nativeBuildInputs ++ [ (bazel.override { enableNixHacks = true; }) ]; + + configurePhase = '' + runHook preConfigure + export PYTHON_LIB_PATH="$out/${python.sitePackages}" + ./configure + runHook postConfigure + ''; + + buildPhase = '' + mkdir -p output/external + cp -r $deps/* output/external + chmod -R +w output + find output -type l | while read symlink; do + ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" + done + + patchShebangs . + find -type f -name CROSSTOOL\* -exec sed -i \ + -e 's,/usr/bin/ar,${binutils}/bin/ar,g' \ + {} \; + + mkdir -p $out/${python.sitePackages} + bazel --output_base="$(pwd)/output" build $bazelFlags $bazelTarget + + bazel-bin/tensorflow/tools/pip_package/build_pip_package $PWD/dist + ''; + + # tensorflow depends on tensorflow_tensorboard, which cannot be # built at the moment (some of its dependencies do not build # [htlm5lib9999999 (seven nines) -> tensorboard], and it depends on an old version of # bleach) Hence we disable dependency checking for now. - installFlags = lib.optional isPy36 "--no-dependencies"; - - # Note that we need to run *after* the fixup phase because the - # libraries are loaded at runtime. If we run in preFixup then - # patchelf --shrink-rpath will remove the cuda libraries. - postFixup = let - rpath = stdenv.lib.makeLibraryPath - (if cudaSupport then - [ stdenv.cc.cc.lib zlib cudatoolkit_joined cudnn - linuxPackages.nvidia_x11 ] - else - [ stdenv.cc.cc.lib zlib ] - ); - in - '' - find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \; - ''; + installFlags = lib.optional (!withTensorboard) "--no-dependencies"; + # Tests are slow and impure. doCheck = false; - meta = with stdenv.lib; { - description = "TensorFlow helps the tensors flow"; - homepage = http://tensorflow.org; - license = licenses.asl20; - maintainers = with maintainers; [ jyp ]; - platforms = with platforms; if cudaSupport then linux else linux ++ darwin; - }; -} + # For some reason, CUDA is not retained in RPATH. + postFixup = lib.optionalString cudaSupport '' + libPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" + patchelf --set-rpath "$(patchelf --print-rpath "$libPath"):${cudaLibPath}" "$libPath" + ''; + + doInstallCheck = true; + installCheckPhase = '' + cd $NIX_BUILD_TOP + ${python.interpreter} -c "import tensorflow" + ''; +}) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix new file mode 100644 index 000000000000..faca6edace5e --- /dev/null +++ b/pkgs/development/python-modules/twilio/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, pyjwt, pysocks, pytz, requests, six, nose, mock }: + +buildPythonPackage rec { + pname = "twilio"; + version = "6.8.0"; + name = "${pname}-${version}"; + + # tests not included in PyPi, so fetch from github instead + src = fetchFromGitHub { + owner = "twilio"; + repo = "twilio-python"; + rev = version; + sha256 = "1vi3m6kvbmv643jbz95q59rcn871y0sss48kw2nqziyr5iswfx8c"; + }; + + buildInputs = [ nose mock ]; + + propagatedBuildInputs = [ pyjwt pysocks pytz six requests ]; + + meta = with stdenv.lib; { + description = "Twilio API client and TwiML generator"; + homepage = https://github.com/twilio/twilio-python/; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 36b8711d7c1a..2e4a232f1f1e 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,7 +5,7 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - version = "2.6.1"; + version = "3.0.3"; pname = "uranium"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1682xwxf6xs1d1cfv1s7xnabqv58jjdb6szz8624b3k9rsj5l2yq"; + sha256 = "1pyzpcdb6kb0basvhgpjdiws8x0bwl71k7nkf3j3s9wk1dvyw824"; }; buildInputs = [ python gettext ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = https://github.com/Ultimaker/Uranium; + homepage = "https://github.com/Ultimaker/Uranium"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix new file mode 100644 index 000000000000..6efaf800b3cd --- /dev/null +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -0,0 +1,8 @@ +{ buildPythonPackage, django_1_8, waitress }: +buildPythonPackage { + name = "waitress-django"; + src = ./.; + pythonPath = [ django_1_8 waitress ]; + doCheck = false; + meta.description = "A waitress WSGI server serving django"; +} diff --git a/pkgs/development/python-modules/waitress-django/setup.py b/pkgs/development/python-modules/waitress-django/setup.py new file mode 100644 index 000000000000..07f7b326fdaf --- /dev/null +++ b/pkgs/development/python-modules/waitress-django/setup.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python + +from distutils.core import setup + +setup( name = "waitress-django" + , version = "0.0.0" + , description = "A waitress WSGI server serving django" + , author = "Bas van Dijk" + , author_email = "v.dijk.bas@gmail.com" + , package_dir = {"" : "src"} + , scripts = ["src/waitress-serve-django"] + ) diff --git a/pkgs/development/python-modules/waitress-django/src/waitress-serve-django b/pkgs/development/python-modules/waitress-django/src/waitress-serve-django new file mode 100755 index 000000000000..b710086c22b9 --- /dev/null +++ b/pkgs/development/python-modules/waitress-django/src/waitress-serve-django @@ -0,0 +1,14 @@ +#!/usr/bin/env python +import sys +from waitress import serve +from waitress.adjustments import Adjustments +import django +from django.core.handlers.wsgi import WSGIHandler +from django.contrib.staticfiles.handlers import StaticFilesHandler + +if __name__ == "__main__": + kw, args = Adjustments.parse_args(sys.argv[1:]) + django.setup() + # These arguments are specific to the runner, not waitress itself. + del kw['call'], kw['help'] + serve(StaticFilesHandler(WSGIHandler()), **kw) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 3de25dd1478d..7629e28dfd5c 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -253,6 +253,7 @@ let fftwtools = [ pkgs.fftw.dev ]; Formula = [ pkgs.gmp ]; geoCount = [ pkgs.gsl_1 ]; + gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; git2r = [ pkgs.zlib.dev pkgs.openssl.dev ]; GLAD = [ pkgs.gsl_1 ]; glpkAPI = [ pkgs.gmp pkgs.glpk ]; @@ -260,32 +261,37 @@ let graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; h5 = [ pkgs.hdf5-cpp pkgs.which ]; + haven = [ pkgs.libiconv ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; imager = [ pkgs.x11 ]; iBMQ = [ pkgs.gsl_1 ]; - igraph = [ pkgs.gmp ]; + igraph = [ pkgs.gmp pkgs.libxml2.dev ]; JavaGD = [ pkgs.jdk ]; jpeg = [ pkgs.libjpeg.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; libamtrack = [ pkgs.gsl_1 ]; + magick = [ pkgs.imagemagick.dev ]; mixcat = [ pkgs.gsl_1 ]; mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw.dev ]; ncdf4 = [ pkgs.netcdf ]; nloptr = [ pkgs.nlopt ]; - openssl = [ pkgs.openssl.dev ]; + odbc = [ pkgs.unixODBC ]; + openssl = [ pkgs.openssl pkgs.openssl.dev ]; outbreaker = [ pkgs.gsl_1 ]; pander = [ pkgs.pandoc pkgs.which ]; pbdMPI = [ pkgs.openmpi ]; pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; pbdZMQ = [ pkgs.which ]; + pdftools = [ pkgs.poppler.dev ]; PKI = [ pkgs.openssl.dev ]; png = [ pkgs.libpng.dev ]; PopGenome = [ pkgs.zlib.dev ]; proj4 = [ pkgs.proj ]; + protolite = [ pkgs.protobuf ]; qtbase = [ pkgs.qt4 ]; qtpaint = [ pkgs.qt4 ]; R2GUESS = [ pkgs.gsl_1 ]; @@ -293,6 +299,7 @@ let RAppArmor = [ pkgs.libapparmor ]; rapportools = [ pkgs.which ]; rapport = [ pkgs.which ]; + readxl = [ pkgs.libiconv ]; rbamtools = [ pkgs.zlib.dev ]; rcdd = [ pkgs.gmp.dev ]; RcppCNPy = [ pkgs.zlib.dev ]; @@ -315,14 +322,15 @@ let rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.mysql.lib ]; + RMySQL = [ pkgs.zlib pkgs.mysql.lib pkgs.mariadb pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; + rpanel = [ pkgs.bwidget ]; rpg = [ pkgs.postgresql ]; rphast = [ pkgs.pcre.dev pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; Rpoppler = [ pkgs.poppler ]; - RPostgreSQL = [ pkgs.postgresql ]; + RPostgreSQL = [ pkgs.postgresql pkgs.postgresql ]; RProtoBuf = [ pkgs.protobuf ]; rPython = [ pkgs.python ]; RSclient = [ pkgs.openssl.dev ]; @@ -331,6 +339,7 @@ let rtfbs = [ pkgs.zlib pkgs.pcre.dev pkgs.bzip2 pkgs.gzip pkgs.readline ]; rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; + RSymphony = [ pkgs.symphony ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; rzmq = [ pkgs.zeromq3 ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; @@ -338,6 +347,7 @@ let seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; seqinr = [ pkgs.zlib.dev ]; seqminer = [ pkgs.zlib.dev pkgs.bzip2 ]; + sf = [ pkgs.gdal pkgs.proj pkgs.geos ]; showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ]; simplexreg = [ pkgs.gsl_1 ]; SOD = [ pkgs.opencl-headers ]; @@ -349,12 +359,13 @@ let survSNP = [ pkgs.gsl_1 ]; sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ]; TAQMNGR = [ pkgs.zlib.dev ]; + tesseract = [ pkgs.tesseract pkgs.leptonica ]; tiff = [ pkgs.libtiff.dev ]; TKF = [ pkgs.gsl_1 ]; tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ]; topicmodels = [ pkgs.gsl_1 ]; udunits2 = [ pkgs.udunits pkgs.expat ]; - V8 = [ pkgs.v8 ]; + V8 = [ pkgs.v8_3_14 ]; VBLPCM = [ pkgs.gsl_1 ]; VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ]; WhopGenome = [ pkgs.zlib.dev ]; @@ -401,12 +412,20 @@ let chebpol = [ pkgs.pkgconfig ]; fftw = [ pkgs.pkgconfig ]; geoCount = [ pkgs.pkgconfig ]; + gdtools = [ pkgs.pkgconfig ]; kza = [ pkgs.pkgconfig ]; + magick = [ pkgs.pkgconfig ]; mwaved = [ pkgs.pkgconfig ]; + odbc = [ pkgs.pkgconfig ]; + openssl = [ pkgs.pkgconfig ]; + pdftools = [ pkgs.pkgconfig ]; + sf = [ pkgs.pkgconfig ]; showtext = [ pkgs.pkgconfig ]; spate = [ pkgs.pkgconfig ]; stringi = [ pkgs.pkgconfig ]; + sys = [ pkgs.libapparmor ]; sysfonts = [ pkgs.pkgconfig ]; + tesseract = [ pkgs.pkgconfig ]; Cairo = [ pkgs.pkgconfig ]; Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; qtutils = [ pkgs.qt4 ]; @@ -782,8 +801,10 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - patches = [ ./patches/RMySQL.patch ]; MYSQL_DIR="${pkgs.mysql.lib}"; + preConfigure = '' + patchShebangs configure + ''; }); devEMF = old.devEMF.overrideDerivation (attrs: { @@ -818,6 +839,9 @@ let openssl = old.openssl.overrideDerivation (attrs: { OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include"; + preConfigure = '' + sed -i.bak 's|^\( *PKG_LIBS_VERSIONED=\).*$|\1$PKG_LIBS|' configure + ''; }); Rserve = old.Rserve.overrideDerivation (attrs: { @@ -835,7 +859,71 @@ let }); V8 = old.V8.overrideDerivation (attrs: { - preConfigure = "export V8_INCLUDES=${pkgs.v8}/include"; + preConfigure = '' + export INCLUDE_DIR=${pkgs.v8_3_14}/include + export LIB_DIR=${pkgs.v8_3_14}/lib + patchShebangs configure + ''; + }); + + acs = old.acs.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + gdtools = old.gdtools.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + NIX_LDFLAGS = "-lfontconfig -lfreetype"; + }); + + magick = old.magick.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + protolite = old.protolite.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + rpanel = old.rpanel.overrideDerivation (attrs: { + preConfigure = '' + export TCLLIBPATH="${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}" + ''; + TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"; + }); + + OpenMx = old.OpenMx.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + odbc = old.odbc.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + x13binary = old.x13binary.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + + geojsonio = old.geojsonio.overrideDerivation (attrs: { + preConfigure = '' + export SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt + ''; + }); + + rstan = old.rstan.overrideDerivation (attrs: { + NIX_CFLAGS_COMPILE = "${attrs.NIX_CFLAGS_COMPILE} -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION"; }); }; diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index 2137c5c1497b..f8c1f01d4464 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper, which }: +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, makeWrapper, which, coreutils +# Always assume all markers valid (don't redownload dependencies). +# Also, don't clean up environment variables. +, enableNixHacks ? false +}: stdenv.mkDerivation rec { @@ -9,7 +13,7 @@ stdenv.mkDerivation rec { description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; maintainers = with maintainers; [ cstrahan philandstuff ]; - platforms = platforms.linux; + platforms = platforms.unix; }; name = "bazel-${version}"; @@ -19,25 +23,33 @@ stdenv.mkDerivation rec { sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb"; }; + preUnpack = '' + mkdir bazel + cd bazel + ''; sourceRoot = "."; + patches = lib.optional enableNixHacks ./nix-hacks.patch; + postPatch = '' - for f in $(grep -l -r '#!/bin/bash'); do - substituteInPlace "$f" --replace '#!/bin/bash' '#!${bash}/bin/bash' + for f in $(grep -l -r '/bin/bash'); do + substituteInPlace "$f" --replace '/bin/bash' '${bash}/bin/bash' done - for f in \ - src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \ - src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \ - src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java \ - src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java \ - ; do - substituteInPlace "$f" --replace /bin/bash ${bash}/bin/bash + for f in $(grep -l -r '/usr/bin/env'); do + substituteInPlace "$f" --replace '/usr/bin/env' '${coreutils}/bin/env' done + '' + lib.optionalString stdenv.isDarwin '' + sed -i 's,/usr/bin/xcrun clang,clang,g' \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + src/tools/xcode/xcrunwrapper/xcrunwrapper.sh + sed -i 's,/usr/bin/xcrun "''${TOOLNAME}","''${TOOLNAME}",g' \ + src/tools/xcode/xcrunwrapper/xcrunwrapper.sh + sed -i 's/"xcrun", "clang"/"clang"/g' tools/osx/xcode_configure.bzl ''; buildInputs = [ - stdenv.cc - stdenv.cc.cc.lib jdk zip unzip @@ -52,12 +64,7 @@ stdenv.mkDerivation rec { bash ]; - # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink - # detector (see com.google.devtools.build.lib.skyframe.FileFunction). - # Change this to $(mktemp -d) as soon as we figure out why. - buildPhase = '' - export TMPDIR=/tmp ./compile.sh ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ diff --git a/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch new file mode 100644 index 000000000000..563fe635e6b0 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/nix-hacks.patch @@ -0,0 +1,51 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +index eafa09fb5..d2d5e40e8 100644 +--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java ++++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +@@ -287,21 +287,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction { + markerData.put(key, value); + } + } +- boolean result = false; +- if (markerRuleKey.equals(ruleKey)) { +- result = handler.verifyMarkerData(rule, markerData, env); +- if (env.valuesMissing()) { +- return null; +- } +- } + +- if (result) { +- return new Fingerprint().addString(content).digestAndReset(); +- } else { +- // So that we are in a consistent state if something happens while fetching the repository +- markerPath.delete(); +- return null; +- } ++ return new Fingerprint().addString(content).digestAndReset(); + + } catch (IOException e) { + throw new RepositoryFunctionException(e, Transience.TRANSIENT); +diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java +index a7ebc8f7a..40f2049fa 100644 +--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java ++++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java +@@ -129,7 +129,6 @@ public class JavaSubprocessFactory implements SubprocessFactory { + ProcessBuilder builder = new ProcessBuilder(); + builder.command(params.getArgv()); + if (params.getEnv() != null) { +- builder.environment().clear(); + builder.environment().putAll(params.getEnv()); + } + +diff --git a/src/main/java/com/google/devtools/build/lib/worker/Worker.java b/src/main/java/com/google/devtools/build/lib/worker/Worker.java +index 0268d1b2b..637364657 100644 +--- a/src/main/java/com/google/devtools/build/lib/worker/Worker.java ++++ b/src/main/java/com/google/devtools/build/lib/worker/Worker.java +@@ -77,7 +77,6 @@ class Worker { + new ProcessBuilder(command) + .directory(workDir.getPathFile()) + .redirectError(Redirect.appendTo(logFile.getPathFile())); +- processBuilder.environment().clear(); + processBuilder.environment().putAll(workerKey.getEnv()); + + this.process = processBuilder.start(); diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 7f178babf32e..007ce5b07cde 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,27 +1,53 @@ -{ stdenv, fetchFromGitHub, curl, dmd, gcc }: +{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: stdenv.mkDerivation rec { name = "dub-${version}"; - version = "1.1.0"; + version = "1.5.0"; src = fetchFromGitHub { - sha256 = "1smzlfs5gjmrlghccdgn04qzy5b8l0xm8y2virayb2adrwqviscm"; - rev = "v${version}"; + owner = "dlang"; repo = "dub"; - owner = "D-Programming-Language"; + rev = "v${version}"; + sha256 = "0kmirx4ijhzirjwdqmnwqhngg38zdaydpvny2p0yj3afqgkj6vq5"; }; - buildInputs = [ curl ]; - propagatedBuildInputs = [ gcc dmd ]; - - buildPhase = '' + postPatch = '' # Avoid that the version file is overwritten substituteInPlace build.sh \ --replace source/dub/version_.d /dev/null - patchShebangs ./build.sh + + substituteInPlace build.sh \ + --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + + patchShebangs build.sh + patchShebangs test + + # Remove unittest which is not working for now (upstream already fixed: https://github.com/dlang/dub/issues/1224) + rm test/interactive-remove.sh + + # Fix test as long as there is no upstream solution. (see https://github.com/dlang/dub/pull/1227) + substituteInPlace test/issue884-init-defer-file-creation.sh \ + --replace "< /dev/stdin" "<(while :; do sleep 1; done)" \ + --replace "sleep 1" "" + ''; + + nativeBuildInputs = [ dmd libevent rsync ]; + buildInputs = [ curl ]; + + buildPhase = '' + export DMD=${dmd.out}/bin/dmd ./build.sh ''; + doCheck = false; + + checkPhase = '' + export DUB=$PWD/bin/dub + export DC=${dmd.out}/bin/dmd + export HOME=$TMP + ./test/run-unittest.sh + ''; + installPhase = '' mkdir $out mkdir $out/bin @@ -29,9 +55,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Build tool for D projects"; + description = "Package and build manager for D applications and libraries"; homepage = http://code.dlang.org/; license = licenses.mit; + maintainers = with maintainers; [ ThomasMader ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix new file mode 100644 index 000000000000..d3842a39f18b --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -0,0 +1,32 @@ +{ version, sha256 }: + +{ stdenv, fetchurl, fetchpatch, python2Packages }: + +let name = "scons"; +in python2Packages.buildPythonApplication { + name = "${name}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; + inherit sha256; + }; + + # Fix a regression in 3.0.0 (causes build errors for some packages) + patches = stdenv.lib.optional (version == "3.0.0") ./print-statements.patch; + + meta = with stdenv.lib; { + homepage = http://scons.org/; + description = "An improved, cross-platform substitute for Make"; + license = licenses.mit; + longDescription = '' + SCons is an Open Source software construction tool. Think of + SCons as an improved, cross-platform substitute for the classic + Make utility with integrated functionality similar to + autoconf/automake and compiler caches such as ccache. In short, + SCons is an easier, more reliable and faster way to build + software. + ''; + platforms = platforms.all; + maintainers = [ maintainers.primeos ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 1b2a8220361c..8e40777815c8 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,30 +1,14 @@ -{stdenv, fetchurl, python2Packages}: +{ callPackage, stdenv }: let - name = "scons"; - version = "2.5.1"; -in python2Packages.buildPythonApplication { - name = "${name}-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; + mkScons = args: callPackage (import ./common.nix args) { }; +in { + scons_2_5_1 = mkScons { + version = "2.5.1"; sha256 = "1wji1z9jdkhnmm99apx6fhld9cs52rr56aigniyrcsmlwy52298b"; }; - # No tests - doCheck = false; - - meta = { - homepage = http://scons.org/; - description = "An improved, cross-platform substitute for Make"; - license = stdenv.lib.licenses.mit; - longDescription = '' - SCons is an Open Source software construction tool. Think of - SCons as an improved, cross-platform substitute for the classic - Make utility with integrated functionality similar to - autoconf/automake and compiler caches such as ccache. In short, - SCons is an easier, more reliable and faster way to build - software. - ''; - platforms = stdenv.lib.platforms.all; + scons_3_0_0 = mkScons { + version = "3.0.0"; + sha256 = "05jjykllk4icnq6gfrkgkbc4ggxm7983q6r33mrhpilqbd02ylqg"; }; } diff --git a/pkgs/development/tools/build-managers/scons/default.upstream b/pkgs/development/tools/build-managers/scons/default.upstream deleted file mode 100644 index f9dae2818c84..000000000000 --- a/pkgs/development/tools/build-managers/scons/default.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url http://sourceforge.net/projects/scons/files/scons/ -SF_version_dir -version_link '[.]tar[.]gz/download$' -SF_redirect -ensure_hash - -do_overwrite() { - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/development/tools/build-managers/scons/print-statements.patch b/pkgs/development/tools/build-managers/scons/print-statements.patch new file mode 100644 index 000000000000..a963bf78abab --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/print-statements.patch @@ -0,0 +1,13 @@ +diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py +index 558e28f9..8fea9c4d 100644 +--- src/engine/SCons/Script/SConscript.py ++++ src/engine/SCons/Script/SConscript.py +@@ -5,8 +5,6 @@ + + """ + +-from __future__ import print_function +- + # + # __COPYRIGHT__ + # diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 10d4a3f0f283..46cee51e0e6f 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,32 +1,38 @@ -{ stdenv, fetchurl, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: - -stdenv.mkDerivation rec { - version = "2.1.13"; +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: +let + version = "2.6.6"; + goPackagePath = "github.com/buildkite/agent"; +in +buildGoPackage { name = "buildkite-agent-${version}"; - dontBuild = true; - src = fetchurl { - url = "https://github.com/buildkite/agent/releases/download/v${version}/buildkite-agent-linux-386-${version}.tar.gz"; - sha256 = "bd40c2ba37b3b54b875241a32b62190a4cf4c15e2513c573f1626a3ca35c8657"; + inherit goPackagePath; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "agent"; + rev = "v${version}"; + sha256 = "0rpi63mfzlm39517l4xjcka3m4dnfjzwvpi0i1rpf1z2288cnkyx"; }; nativeBuildInputs = [ makeWrapper ]; - sourceRoot = "."; - installPhase = '' - install -Dt "$out/bin/" buildkite-agent - mkdir -p $out/share - mv hooks bootstrap.sh $out/share/ - ''; + postInstall = '' + # Install bootstrap.sh + mkdir -p $bin/libexec/buildkite-agent + cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent + sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh + + # Fix binary name + mv $bin/bin/{agent,buildkite-agent} - postFixup = '' - substituteInPlace $out/share/bootstrap.sh \ - --replace "#!/bin/bash" "#!$(type -P bash)" - wrapProgram $out/bin/buildkite-agent \ - --set PATH '"${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}:$PATH"' + # These are runtime dependencies + wrapProgram $bin/bin/buildkite-agent \ + --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' \ + --set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh ''; - meta = { + meta = with stdenv.lib; { description = "Build runner for buildkite.com"; longDescription = '' The buildkite-agent is a small, reliable, and cross-platform build runner @@ -36,8 +42,8 @@ stdenv.mkDerivation rec { and uploading the job's artifacts. ''; homepage = https://buildkite.com/docs/agent; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.pawelpacana ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ pawelpacana zimbatm ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index bcd637699159..1c5950a04c27 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.84"; + version = "2.85"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0pwmviaps4gbv9a3sdn17kqdv9jmh5fpbms1wm95jfj77m5dyyq6"; + sha256 = "0z8rv6fxsvnw71f8s711n9s60r8jd43bigy9rqz5805k3xa68whr"; }; buildCommand = '' diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 648ec965d35c..e5c79f534b0c 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-7.01"; + name = "camlp5${if transitional then "_transitional" else ""}-7.02"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel701.tar.gz; - sha256 = "1gxhj7y30f1hbcqnqgg80wz0ymbslsfh09kl2kiackp49fywl606"; + url = https://github.com/camlp5/camlp5/archive/rel702.tar.gz; + sha256 = "1m2d55zrgllidhgslvzgmr27f56qzdahz2sv56bvjs3bg7grmhnc"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index a6252a5c729d..3d5a13c7e0ce 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip, ocaml, findlib, yojson, lib +{ stdenv, fetchzip, ocaml, findlib, yojson , withEmacsMode ? false, emacs }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.0.2"; + version = "3.0.3"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "0lcgafs5ip8vhvrp1d7yv6mzjsirmayd83cj4wwq6zxcrl7yv4x8"; + sha256 = "19gz9vcdna84xcm2b53m6b5g4c7ppb61j05fnvry3shvjiz2p58p"; }; buildInputs = [ ocaml findlib yojson ] diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index dc7f96ea8a09..391c653b98ab 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { description = "Opinionated code formatter for Scala"; homepage = http://scalafmt.org; license = licenses.asl20; - platforms = platforms.linux; maintainers = [ maintainers.markus1189 ]; }; } diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 679716d33c70..5ce324e7a60f 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -145,7 +145,7 @@ let function replaceImpureVersionSpec(versionSpec) { var parsedUrl = url.parse(versionSpec); - if(versionSpec == "latest" || versionSpec == "unstable" || + if(versionSpec == "" || versionSpec == "latest" || versionSpec == "unstable" || versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/' || /^[^/]+\/[^/]+$/.test(versionSpec)) return '*'; else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" || diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 9419b59e9212..58cfc9af9fc1 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -10,10 +10,10 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "6.11.1"; + version = "6.11.4"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "6f6655b85919aa54cb045a6d69a226849802fcc26491d0db4ce59873e41cc2b8"; + sha256 = "0l6lmid8wfvvbq391x0k19crs63zf6kkcln79fn3d088wcsh8bsc"; }; }) diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix index 4c55d571bd51..27ddec616bc8 100644 --- a/pkgs/games/bastet/default.nix +++ b/pkgs/games/bastet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, boost }: +{ stdenv, fetchFromGitHub, fetchpatch, ncurses, boost }: stdenv.mkDerivation rec { name = "bastet-${version}"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn"; }; + patches = [ + # Compatibility with new Boost + (fetchpatch { + url = "https://github.com/fph/bastet/commit/0e03f8d4d6bc6949cf1c447e632ce0d1b98c4be1.patch"; + sha256 = "1475hisbm44jirsrhdlnddppsyn83xmvcx09gfkm9drcix05alzj"; + }) + ]; + installPhase = '' mkdir -p "$out"/bin cp bastet "$out"/bin/ diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index ee8e865a6f11..fb01346d84e8 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, mono, makeWrapper, lua +{ stdenv, fetchFromGitHub, mono, makeWrapper, lua , SDL2, freetype, openal, systemd, pkgconfig, - dotnetPackages, gnome3, curl, unzip + dotnetPackages, gnome3, curl, unzip, which }: -let - version = "20161019"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "openra-${version}"; + version = "20171014"; meta = with stdenv.lib; { description = "Real Time Strategy game engine recreating the C&C titles"; @@ -16,24 +15,33 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; }; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz"; - sha256 = "1psmq3kb2whkavh5pm0xc4m5b4bihvrl8pfrk851iqg1cs22bg0w"; + src = fetchFromGitHub { + owner = "OpenRA"; + repo = "OpenRA"; + rev = "release-${version}"; + sha256 = "0nlwpmiwhjs3qc2lxwnrh4p874v5y6mf4avi6bqgr1wvzc43n8wr"; + + extraPostFetch = '' + sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh + $out/thirdparty/fetch-thirdparty-deps.sh + ''; }; dontStrip = true; - buildInputs = with dotnetPackages; - [ NUnit3 NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp NUnitConsole OpenNAT ] + buildInputs = (with dotnetPackages; + [ NUnit3 NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp NUnitConsole OpenNAT ]) ++ [ curl unzip lua gnome3.zenity ]; nativeBuildInputs = [ curl unzip mono makeWrapper lua pkgconfig ]; - patchPhase = '' + postPatch = '' mkdir Support - sed -i 's/^VERSION.*/VERSION = release-${version}/g' Makefile + sed -i \ + -e 's/^VERSION.*/VERSION = release-${version}/g' \ + -e '/GeoLite2-Country.mmdb.gz/d' \ + -e '/fetch-geoip-db.sh/d' \ + Makefile substituteInPlace thirdparty/configure-native-deps.sh --replace "locations=\"" "locations=\"${lua}/lib " - substituteInPlace Makefile --replace "@./thirdparty/fetch-geoip-db.sh" "" ''; preConfigure = '' @@ -41,63 +49,6 @@ in stdenv.mkDerivation rec { make version ''; - preBuild = let dotnetPackagesDlls = with dotnetPackages; [ - "${OpenNAT}/lib/dotnet/Open.NAT/net45/Open.Nat.dll" - "${MonoNat}/lib/dotnet/Mono.Nat/net40/Mono.Nat.dll" - "${FuzzyLogicLibrary}/lib/dotnet/FuzzyLogicLibrary/Release/FuzzyLogicLibrary.dll" - "${SmartIrc4net}/lib/dotnet/SmartIrc4net/net40/SmarIrc4net*" - "${SharpZipLib}/lib/dotnet/SharpZipLib/20/ICSharpCode.SharpZipLib.dll" - "${MaxMindGeoIP2}/lib/dotnet/MaxMind.GeoIP2/net40/MaxMind.GeoIP2*" - "${MaxMindDb}/lib/dotnet/MaxMind.Db/net40/MaxMind.Db.*" - "${SharpFont}/lib/dotnet/SharpFont/net20/SharpFont.dll" - "${SharpFont}/lib/dotnet/SharpFont/SharpFont.dll.config" - "${StyleCopMSBuild}/lib/dotnet/StyleCop.MSBuild/StyleCop*.dll" - "${StyleCopPlusMSBuild}/lib/dotnet/StyleCopPlus.MSBuild/StyleCopPlus.dll" - "${RestSharp}/lib/dotnet/RestSharp/net4-client/RestSharp.dll" - "${NUnit}/lib/dotnet/NUnit/nunit.framework.*" - "${NUnitConsole}/lib/dotnet/NUnit.Console/*" - "${NewtonsoftJson}/lib/dotnet/Newtonsoft.Json/Newtonsoft.Json.dll" - ]; - movePackages = [ - ( let filename = "Eluant.dll"; in { origin = fetchurl { - url = "https://github.com/OpenRA/Eluant/releases/download/20160124/${filename}"; - sha256 = "1c20whz7dzfhg3szd62rvb79745x5iwrd5pp62j3bbj1q9wpddmb"; - }; target = filename; }) - - ( let filename = "SDL2-CS.dll"; in { origin = fetchurl { - url = "https://github.com/OpenRA/SDL2-CS/releases/download/20151227/${filename}"; - sha256 = "0gqw2wg37cqhhlc2a9lfc4ndkyfi4m8bkv7ckxbawgydjlknq83n"; - }; target = filename; }) - - ( let filename = "SDL2-CS.dll.config"; in { origin = fetchurl { - url = "https://github.com/OpenRA/SDL2-CS/releases/download/20151227/${filename}"; - sha256 = "15709iscdg44wd33szw5y0fdxwvqfjw8v3xjq6a0mm46gr7mkw7g"; - }; target = filename; }) - - ( let filename = "OpenAL-CS.dll"; in { origin = fetchurl { - url = "https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/${filename}"; - sha256 = "0lvyjkn7fqys97wym8rwlcp6ay2z059iabfvlcxhlrscjpyr2cyk"; - }; target = filename; }) - - ( let filename = "OpenAL-CS.dll.config"; in { origin = fetchurl { - url = "https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/${filename}"; - sha256 = "0wcmk3dw26s93598ck5jism5609v0y233i0f1b76yilyfimg9sjq"; - }; target = filename; }) - - ( let filename = "GeoLite2-Country.mmdb.gz"; in { origin = fetchurl { - url = "http://geolite.maxmind.com/download/geoip/database/${filename}"; - sha256 = "0a82v0sj4zf5vigrn1pd6mnbqz6zl3rgk9nidqqzy836as2kxk9v"; - }; target = filename; }) - ]; - in '' - mkdir thirdparty/download/ - - ${stdenv.lib.concatMapStringsSep "\n" (from: "cp -r ${from} thirdparty/download") dotnetPackagesDlls} - ${stdenv.lib.concatMapStringsSep "\n" ({origin, target}: "cp ${origin} thirdparty/download/${target}") movePackages} - - make dependencies - ''; - buildFlags = [ "DEBUG=false" "default" "man-page" ]; doCheck = true; @@ -109,14 +60,13 @@ in stdenv.mkDerivation rec { postInstall = with stdenv.lib; let runtime = makeLibraryPath [ SDL2 freetype openal systemd lua ]; + binaries= makeBinPath [ which mono gnome3.zenity ]; in '' wrapProgram $out/lib/openra/launch-game.sh \ - --prefix PATH : "${mono}/bin" \ - --set PWD $out/lib/openra/ \ + --prefix PATH : "${binaries}" \ --prefix LD_LIBRARY_PATH : "${runtime}" mkdir -p $out/bin - echo -e "#!${stdenv.shell}\ncd $out/lib/openra && $out/lib/openra/launch-game.sh" > $out/bin/openra - chmod +x $out/bin/openra + makeWrapper $out/lib/openra/launch-game.sh $out/bin/openra --run "cd $out/lib/openra" ''; } diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix new file mode 100644 index 000000000000..a54d3a45ae81 --- /dev/null +++ b/pkgs/games/openrct2/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, fetchFromGitHub, + SDL2, cmake, curl, fontconfig, freetype, jansson, libiconv, libpng, + libpthreadstubs, libzip, mesa_glu, openssl, pkgconfig, speexdsp, zlib +}: + +let + name = "openrct2-${version}"; + version = "0.1.1"; + + openrct2-src = fetchFromGitHub { + owner = "OpenRCT2"; + repo = "OpenRCT2"; + rev = "v${version}"; + sha256 = "1xxwqx2gzvsdrsy76rz3sys9m4pyn9q25nbnkba3cw1z4l2b73lg"; + }; + + title-sequences-src = fetchFromGitHub { + owner = "OpenRCT2"; + repo = "title-sequences"; + rev = "v0.1.0"; + sha256 = "17c926lhby90ilvyyl6jsiy0df8dw5jws97xigp3x8hddhvv7c16"; + }; +in +stdenv.mkDerivation rec { + inherit name; + + srcs = [ openrct2-src title-sequences-src ]; + sourceRoot = "."; + + buildInputs = [ + SDL2 + cmake + curl + fontconfig + freetype + jansson + libiconv + libpng + libpthreadstubs + libzip + mesa_glu + openssl + pkgconfig + speexdsp + zlib + ]; + + postUnpack = '' + cp -r ${openrct2-src}/* ${sourceRoot} + cp -r ${title-sequences-src} ${sourceRoot}/title + + # creating temporary files in fixCmakeFiles fails otherwise + chmod -R u+w ${sourceRoot} + ''; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" "-DDOWNLOAD_TITLE_SEQUENCES=OFF"]; + + makeFlags = ["all" "g2"]; + + preFixup = "ln -s $out/share/openrct2 $out/bin/data"; + + meta = with stdenv.lib; { + description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; + homepage = https://openrct2.website/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/misc/emulators/higan/0001-change-flags.diff b/pkgs/misc/emulators/higan/0001-change-flags.diff index 1ac1b1360b2a..5821a9c130b0 100644 --- a/pkgs/misc/emulators/higan/0001-change-flags.diff +++ b/pkgs/misc/emulators/higan/0001-change-flags.diff @@ -1,23 +1,26 @@ -diff -rupN higan_v097-source.old/higan/GNUmakefile higan_v097-source/higan/GNUmakefile ---- higan_v097-source.old/higan/GNUmakefile 2016-01-24 09:21:45.822940200 +0100 -+++ higan_v097-source/higan/GNUmakefile 2016-01-24 09:24:03.028722500 +0100 -@@ -36,7 +36,7 @@ ifeq ($(platform),windows) - else ifeq ($(platform),macosx) - flags += -march=native - else ifneq ($(filter $(platform),linux bsd),) -- flags += -march=native -fopenmp -+ flags += -fopenmp +diff -Naur higan_v105-source.old/higan/GNUmakefile higan_v105-source.new/higan/GNUmakefile +--- higan_v105-source.old/higan/GNUmakefile 2017-10-07 01:34:22.000000000 -0300 ++++ higan_v105-source.new/higan/GNUmakefile 2017-10-17 00:02:40.580957396 -0200 +@@ -26,7 +26,7 @@ + flags += -fopenmp link += -fopenmp - link += -Wl,-export-dynamic - link += -lX11 -lXext -diff -rupN higan_v097-source.old/nall/GNUmakefile higan_v097-source/nall/GNUmakefile ---- higan_v097-source.old/nall/GNUmakefile 2016-01-24 09:21:46.021749600 +0100 -+++ higan_v097-source/nall/GNUmakefile 2016-01-24 09:25:06.347100800 +0100 -@@ -40,8 +40,8 @@ cflags := -x c -std=c99 - objcflags := -x objective-c -std=c99 + ifeq ($(binary),application) +- flags += -march=native ++ flags += + link += -Wl,-export-dynamic + link += -lX11 -lXext + else ifeq ($(binary),library) +diff -Naur higan_v105-source.old/nall/GNUmakefile higan_v105-source.new/nall/GNUmakefile +--- higan_v105-source.old/nall/GNUmakefile 2017-09-23 18:34:22.000000000 -0300 ++++ higan_v105-source.new/nall/GNUmakefile 2017-10-17 00:03:33.568916550 -0200 +@@ -40,8 +40,8 @@ + objcflags := -x objective-c -std=c11 cppflags := -x c++ -std=c++14 objcppflags := -x objective-c++ -std=c++14 -flags := -link := +flags := $(CXXFLAGS) +link := $(LDFLAGS) + + # compiler detection + ifeq ($(compiler),) diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index f055c8ed0882..75331e0e09a2 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "higan-${version}"; - version = "104"; + version = "105"; sourceName = "higan_v${version}-source"; src = fetchurl { urls = [ "http://download.byuu.org/${sourceName}.7z" ]; - sha256 = "0i2ma8zjjxadq4368n4m41vhmrb62na6s7pi219ajdsb96x0091l"; + sha256 = "1lpj345vlnwcywhzq1fzxwl08zc2x4d103rgyyp7yw8m0f8f9sdl"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; @@ -81,8 +81,3 @@ stdenv.mkDerivation rec { platforms = with platforms; unix; }; } - -# -# TODO: -# - fix the BML and BIOS paths - maybe submitting -# a custom patch to upstream would not be a bad idea... diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index adc2a6104e7b..90502188e5fc 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2550,4 +2550,14 @@ rec { }; + zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "zig-vim-2017-10-17"; + src = fetchgit { + url = "https://github.com/zig-lang/zig.vim"; + rev = "6059db59f61b517f5d65303b61f03324e01fdc2f"; + sha256 = "0w3pa63s0r6h6w1iqmc444qrsc99xcccwapd6nyh3gb72z228d7z"; + }; + dependencies = []; + + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index acde3cf2e5b6..442464a16e71 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -161,6 +161,7 @@ "github:zah/nim.vim" "github:zchee/deoplete-go" "github:zchee/deoplete-jedi" +"github:zig-lang/zig.vim" "goyo" "gruvbox" "matchit.zip" diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 725c788dd1ac..7bec6cadcfc4 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -6,11 +6,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.7.7"; + name = "audit-2.8.1"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "1vvqw5xgirap0jdmajw7l3pq563aycvy3hlqvj3k2cac8i4jbqlq"; + sha256 = "0v1vng43fjsh158zb5k5d81ngn4p4jmj1247m27pk0bfzy9dxv0v"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 091a0d4b46f4..67ce39ddbd39 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, pkgconfig, glib, gperf, utillinux}: +{stdenv, fetchurl, pkgconfig, glib, gperf, utillinux, kmod}: let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.1"; + version = "3.2.4"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"; + sha256 = "1vbg2k5mngyxdcdw4jkkzxbwdgrcr643hkby1whz7x91kg4g9p6x"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib gperf utillinux + glib gperf utillinux kmod ]; in stdenv.mkDerivation { @@ -21,11 +21,6 @@ stdenv.mkDerivation { inherit (s) url sha256; }; patches = [ - (fetchurl { - # for new gperf - url = "https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60.patch"; - sha256 = "097pjmgq243mz3vfxndwmm37prmacgq2f4r4gb47whfkbd6syqcw"; - }) ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index d54586c5f4f5..77d137f94535 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.7"; + version = "4.13.9"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16vjjl3qw0a8ci6xbnywhb8bpr3ccbs0i6xa54lc094cd5gvx4v3"; + sha256 = "13ra6psp6w3rf5vzmvhg88v2nh8zq20xl0r92728b8x9vgj1bp51"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index b820b6a917b4..e1f3fe63ea07 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.56"; + version = "4.9.58"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jnkf0ir42xkandx1lnqrxmskzwl6j46aqmzrxilddx9pkdjplhi"; + sha256 = "19r1ybrfqjh2cmpvljd94cwag34kly7pzih2j5m4nr49hsi153vl"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index 35222f207962..a93e4a96119c 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13.7"; + version = "4.13.9"; revision = "a"; - sha256 = "1ddhjj77pslivy6ngkqn020z08n5nvq8p261hz14sgp8h69v30is"; + sha256 = "0v2ki1vgmg8yifnflbhryrv7pxvyf0157ysngc1n1hcqyypq4sji"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 206dc6889e8b..4a68160ce05a 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "kexec-tools-${version}"; - version = "2.0.14"; + version = "2.0.15"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" ]; - sha256 = "1ihd3kzw8xnc5skq4pb633rr80007knjm4n1dd67a24xkplygcpz"; + sha256 = "1rwl04y1mpb28yq5ynnk8j124dmhj5p8c4hcdn453sri2j37p6w9"; }; hardeningDisable = [ "format" "pic" "relro" ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index b7fa8e140e25..1a36c669577b 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -2,7 +2,7 @@ , thin-provisioning-tools, enable_dmeventd ? false }: let - version = "2.02.173"; + version = "2.02.175"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "0r4dx87z7ggxmxligdzz43chgfrwn9lyj7vaz63z97h0gs61dfff"; + sha256 = "0n95cc2b0jb0fh2pd9jyg9ww7lyzpia9n9sryw9f4aq8dpna7dsd"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index c1f9425efc34..f818d2c0d8c0 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.8"; + version = "2.1.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "15449r56rqg3487kzsnfvz0w4p5ajrq0krcsdh6c9r6g0ark93hd"; + sha256 = "1qld0gi19mximxm0qyr6vzav32gymhc7fvp0bzwv37j0b8q0fi1r"; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libapparmor gnutls libselinux libseccomp cgmanager libnih dbus libcap - python3Packages.python systemd + python3Packages.python python3Packages.setuptools systemd ]; patches = [ diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index e37a2b9f55e6..c51b8b26c809 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.16"; + version = "1.1.17"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "048h0w4yjyza4h05bkc6dpwg3hq6l03na46g0q1ha8fpwnjqawck"; + sha256 = "0r0lyp2w6v2bvm8h1si7w3p2qx037szl14qnxm5p00568z3m3an8"; }; enableParallelBuilding = true; - # required to avoid busybox segfaulting on startup when invoking - # nix-build "<nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix>" + # Disable auto-adding stack protector flags, + # so musl can selectively disable as needed hardeningDisable = [ "stackprotector" ]; preConfigure = '' @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--enable-static" + "CFLAGS=-fstack-protector-strong" ]; patches = []; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 94fc9ca05e78..7912c67aa0b6 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nvme-cli-${version}"; - version = "0.9"; + version = "1.4"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "16n0gg1zx4fgadcq94kx6bgysqw60jvybjwynk7mj3fzdbvzrqyh"; + sha256 = "00jrr1mya9wkapiapph3nch3kpqas6vlc8kl8dbrjjfb5hg35gqf"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; description = "NVM-Express user space tooling for Linux"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ tavyc ]; + maintainers = with maintainers; [ primeos tavyc ]; }; } diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 75fbacfb90ef..5e0f83c4c681 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -68,8 +68,8 @@ in }; splUnstable = common { - version = "2017-09-26"; - rev = "e8474f9ad3b3d23c3277535c4f53f8fd1e6cbd74"; - sha256 = "0251cnffgx98nckgz6imwa8dnvba44wc02aacmr1n430gmq72xra"; + version = "2017-10-16"; + rev = "28920ea3346c1c905c5f727ea3e54297e6257568"; + sha256 = "0m42na009ivb9q9gz15ra94wqx5xdw18waanm56aqzrjxbqqa3ll"; }; } diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index ea49f9e40292..834476da0ca1 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -3,7 +3,8 @@ python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, docbook_xml_xslt, ldap, systemd, nspr, check, cmocka, uid_wrapper, - nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson }: + nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson + , withSudo ? false }: let docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; @@ -41,6 +42,8 @@ stdenv.mkDerivation rec { --with-ldb-lib-dir=$out/modules/ldb --with-nscd=${glibc.bin}/sbin/nscd ) + '' + stdenv.lib.optionalString withSudo '' + configureFlagsArray+=("--with-sudo") ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 8e16a3165f67..3d4309b7177a 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -5,23 +5,18 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); majorVersion = "2.30"; - patchVersion = ""; + patchVersion = "2"; - fstrimPatch = fetchpatch { - url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=155d48f590a50bb5dc265162ff2f9a971daed543"; - sha256 = "1wj0fj3iwaimr6p8wxg6l2i1hjyrfgcwcxziyxqz8acxba7k6zxh"; - }; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262"; + sha256 = "1p494mwd8v6p6mpmmjybkc7bz1qwp9x4cdi8hdvp2nwvkr4fanvv"; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - fstrimPatch ]; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index b6d294836c28..18ed3287edc4 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20171011"; + version = "0.0.20171017"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "15hby5fi85r7h7adr8kva26w9b2sz3147d7nl2y0fdblb3v4zr72"; + sha256 = "1k9m980d7zmnhpj9kanyfavqrn7ryva16iblk9jrk6sdhxi9mdsp"; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index dfcb3896244a..bfa8dac72ba7 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -2,7 +2,7 @@ , configFile ? "all" # Userspace dependencies -, zlib, libuuid, python, attr +, zlib, libuuid, python, attr, openssl # Kernel dependencies , kernel ? null, spl ? null, splUnstable ? null @@ -41,7 +41,8 @@ let nativeBuildInputs = [ autoreconfHook nukeReferences ]; buildInputs = optionals buildKernel [ spl ] - ++ optionals buildUser [ zlib libuuid python attr ]; + ++ optionals buildUser [ zlib libuuid python attr ] + ++ optionals (buildUser && isUnstable) [ openssl ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; @@ -158,10 +159,10 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2017-09-26"; + version = "2017-10-16"; - rev = "7e98073379353a05498ac5a2f1a5df2a2257d6b0"; - sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7"; + rev = "7670f721fc82e6cdcdd31f83760a79b6f2f2b998"; + sha256 = "0ask9d9936s7mhs9q5wzvn6c8fd322i76hs2n7fajfk17b1a1lkj"; isUnstable = true; extraPatches = [ diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index a4cc5c8780da..8b107e74f3f2 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.4.0"; + version = "6.4.2"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "1ba8zpcywnnanzqxjaqiyfc6j5qr6jk6laryz8npiqz4grv3qk61"; + sha256 = "1akwbgbks6k63m22vrcvvz9jz4wqz380j8gb8lzbzm4yk8y7f4p9"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index f2ccb523e2ff..c8b9978a9edc 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.5.0"; + version = "7.5.1"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "12pf0q1ixsf9ld0569mbwvjz5v9bhh7ad3bd8x9qx188vq5cz381"; + sha256 = "0dl9sjp1z7h340phmfhwha2j7hj5zcspk8v7n6vhsrfsjbkm80vy"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index cdbdf04f4454..00d1c5c568d0 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn , systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty +, fetchpatch }: let inherit (stdenv.lib) optional optionals; in @@ -14,6 +15,12 @@ stdenv.mkDerivation rec { sha256 = "68e04961d0bf6ba193cb7ec658b295c4ff6e60b3754d64bcd77ebdcee0f283fd"; }; + patches = [(fetchpatch { # remove for >= 2.6.1 + name = "kdig-tls.patch"; + url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/b72d5cd032795.diff"; + sha256 = "0ig31rp82j49jh8n3s0dcf5abhh35mcp2k2wii7bh0c60ngb29k6"; + })]; + outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 2d2fb26324c4..8b70ad423e9c 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "node_exporter-${version}"; - version = "0.14.0"; + version = "0.15.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4"; + sha256 = "0v1m6m9fmlw66s9v50y2rfr5kbpb9mxbwpcab4cmgcjs1y7wcn49"; }; # FIXME: megacli test fails diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 8e11fe877c83..59b27efba568 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.4.1"; + version = "1.4.2"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1q0xl599zyqyralsl6mml1xl0h2206564sa2azivjmg48z7blcll"; + sha256 = "1lmk0czqbr4mn1zf99403r8s6nyyk3bxwgvxfx7w4apvxl433iw4"; }; buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/servers/monitoring/telegraf/deps-1.4.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.4.2.nix index 4391d58164f0..4391d58164f0 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.4.1.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.4.2.nix diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 2e32f75c8673..102868c0d46c 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.3"; + version = "4.9.4"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "13y7k6g6jksnllw0mwgzw4dqczh5c5hvq3zlqin7q98m0fpib4ly"; + sha256 = "1npfl7n1w2l0j6c6iizw1szzq0lz9wy6jb55qmwhfkzwj0zd7mqp"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 711b1282b80d..a74221cfbd33 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "10arm3sm9dbzi97x1mjh46r5f6zii4f1w8nl0zfw3knbapab8xv5"; + sha256 = "07wn5pg7pkya8d4k2khp2jyvkdkmm5431fj1k0m1i5k65yyvfqzr"; }; outputs = [ "out" "doc" ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "The personal, minimalist, super-fast, database free, bookmarking service"; license = licenses.gpl3Plus; homepage = https://github.com/shaarli/Shaarli; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ schneefux ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 369fecda47aa..9831d7dabce1 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "shaarli-material-${version}"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "kalvn"; repo = "Shaarli-Material"; rev = "v${version}"; - sha256 = "0ivq35183r5vyzvf47sgxwdxllmvhd5w9w75xgyp3kbw2na4yrmr"; + sha256 = "0x8d9425n3jrwzsyxclbxfspvi91v1klq8r3m6wcj81kys7vmzgh"; }; patchPhase = '' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b2b238997b9d..4161df6ae8b9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -848,11 +848,11 @@ let }) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (mkDerivation "libXfont" { - name = "libXfont-1.5.2"; + name = "libXfont-1.5.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2; - sha256 = "0w8d07bkmjiarkx09579bl8zsq903mn8javc7qpi0ix4ink5x502"; + url = mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2; + sha256 = "1l4k3i3xzqdmaszykh6bb2ah78p6c3z7fak7xzgq2d38s87w31db"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 42cee12843c2..526785ae8fba 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 diff --git a/pkgs/servers/xmpp/biboumi/catch.patch b/pkgs/servers/xmpp/biboumi/catch.patch new file mode 100644 index 000000000000..05cf534ecfef --- /dev/null +++ b/pkgs/servers/xmpp/biboumi/catch.patch @@ -0,0 +1,30 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -273,27 +273,6 @@ foreach(file ${source_all}) + endforeach() + + # +-## Add a rule to download the catch unit test framework +-# +-include(ExternalProject) +-ExternalProject_Add(catch +- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git" +- PREFIX "external" +- UPDATE_COMMAND "" +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +- ) +-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE) +-ExternalProject_Get_Property(catch SOURCE_DIR) +-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp) +- target_include_directories(test_suite +- PUBLIC "${SOURCE_DIR}/include/" +- ) +- add_dependencies(test_suite catch) +-endif() +- +-# + ## Add some custom rules to launch the tests + # + add_custom_target(check COMMAND "test_suite" diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix new file mode 100644 index 000000000000..e59aaa9116c9 --- /dev/null +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, + libiconv, botan2, systemd, pkgconfig, udns, pandoc, procps } : + +stdenv.mkDerivation rec { + name = "biboumi-${version}"; + version = "6.1"; + + src = fetchurl { + url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz"; + sha256 = "1la1n502v2wyfm0vl8v4m0hbigkkjchi21446n9mb203fz1cvr77"; + }; + + louiz_catch = fetchgit { + url = https://lab.louiz.org/louiz/Catch.git; + rev = "35f510545d55a831372d3113747bf1314ff4f2ef"; + sha256 = "1l5b32sgr9zc2hlfr445hwwxv18sh3cn5q1xmvf588z6jyf88g2g"; + }; + + patches = [ ./catch.patch ]; + + nativeBuildInputs = [ cmake pkgconfig pandoc ]; + buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd + udns procps ]; + + inherit procps; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi + substituteInPlace unit/biboumi.service.cmake --replace /bin/kill $procps/bin/kill + cp $louiz_catch/single_include/catch.hpp tests/ + # echo "policy_directory=$out/etc/biboumi" >> conf/biboumi.cfg + # TODO include conf/biboumi.cfg as example somewhere + ''; + + enableParallelBuilding = true; + doCheck = true; + + meta = with stdenv.lib; { + description = "Modern XMPP IRC gateway"; + platforms = platforms.unix; + homepage = https://lab.louiz.org/louiz/biboumi; + license = licenses.zlib; + maintainers = [ maintainers.woffs ]; + }; +} diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix new file mode 100644 index 000000000000..dd9c12c831c9 --- /dev/null +++ b/pkgs/tools/admin/ansible/2.4.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchurl +, pythonPackages +, windowsSupport ? false +}: + +pythonPackages.buildPythonPackage rec { + pname = "ansible"; + version = "2.4.0.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "0xkwnx817rygb1922gncv9ivgvb7hjg8g53r39hfdm3jgzp6y9qs"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = false; + + propagatedBuildInputs = with pythonPackages; [ + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns + ] ++ stdenv.lib.optional windowsSupport pywinrm; + + meta = with stdenv.lib; { + homepage = http://www.ansible.com; + description = "A simple automation tool"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ + jgeerds + joamaki + ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 5f15a9d0455c..8f10ee22ddcf 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.60.1) + fastlane (2.61.0) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -103,10 +103,10 @@ GEM rouge (2.0.7) rubyzip (1.2.1) security (0.1.3) - signet (0.7.3) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) slack-notifier (1.5.1) terminal-notifier (1.8.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 0d9c1f55835d..c1285e434963 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -137,10 +137,10 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sg8xh1rjigiq438knkpdq685kyw34ki3h7baj65qh9mkkc8drxy"; + sha256 = "0n73748vw7y29ycx0rjdg9zvn8xhncq07zq1l4a16n5s82rb14iy"; type = "gem"; }; - version = "2.60.1"; + version = "2.61.0"; }; gh_inspector = { source = { @@ -360,10 +360,10 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.1"; }; slack-notifier = { source = { diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 318bb2859e54..eb544fc693e4 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, pkgconfig -, ocaml, ocamlPackages +, ocamlPackages , libao, portaudio, alsaLib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, fdk_aac @@ -26,7 +26,7 @@ stdenv.mkDerivation { configureFlags = [ "--localstatedir=/var" ]; buildInputs = - [ which ocaml ocamlPackages.findlib pkgconfig + [ which ocamlPackages.ocaml ocamlPackages.findlib pkgconfig libao portaudio alsaLib libpulseaudio libjack2 libsamplerate libmad taglib lame libogg libvorbis speex libtheora libopus fdk_aac @@ -40,6 +40,6 @@ stdenv.mkDerivation { homepage = http://liquidsoap.fm/; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; - platforms = ocaml.meta.platforms or []; + platforms = ocamlPackages.ocaml.meta.platforms or []; }; } diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 7c3ab92fa88a..22dc9e747233 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.43.4"; + name = "e2fsprogs-1.43.7"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d"; + sha256 = "1i51w5l45zhz3i98k92xbbvkqklvjrvw3zvqky3gk9cdmqp5y0w7"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 6bdff06699b9..7284ee95a909 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "povray-${version}"; - version = "3.7.0.3"; + version = "3.7.0.4"; src = fetchFromGitHub { owner = "POV-Ray"; repo = "povray"; rev = "v${version}"; - sha256 = "0mzkgk3gn8jfrw1fq0z3kqbysdfq8nwdl8a28l18v8gzb31bblhq"; + sha256 = "1wkwb43w5r9pa79yazy4w4s8n6g280igag97hgl7dyi289q39n0q"; }; diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 66f02bcc7bcc..f1b049ba2cee 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fzy-${version}"; - version = "0.7"; + version = "0.9"; src = fetchFromGitHub { owner = "jhawthorn"; repo = "fzy"; rev = version; - sha256 = "11sc92j9fx23byxv5y4rq0jxp55vc9mrn5hx9lb162vdrl8a4222"; + sha256 = "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index b3370a3cab1f..49796c5f2292 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, lessSecure ? false }: stdenv.mkDerivation rec { - name = "less-487"; + name = "less-520"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "01i7n6jaxwmww3pasy3hg38zc6x7jw0w05mqqvh6caqbrdaq9p7k"; + sha256 = "12wh0j07971j53v7irfcv0vkb7wpi7f83jll4mwjy92wc27fm2bv"; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 9895fff3ba8f..4b7857d60e7b 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, utillinux }: @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { sha256 = "14hrv23film4iihyclcvc2r2dgxl8w3as50r81xjjc85iyp6yxkm"; }; + patches = [ + # Fix build with new Boost + (fetchpatch { + url = "https://github.com/openSUSE/snapper/commit/2e3812d2c1d1f54861fb79f5c2b0197de96a00a3.patch"; + sha256 = "0yrzss1v7lmcvkajmchz917yqsvlsdfz871szzw790v6pql1322s"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig docbook_xsl libxslt docbook_xml_dtd_45 diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 5bf7dd49143e..b41f38905380 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.9.0"; - sha256 = "13p8rvf1naknjin1n97370ifyj475lyyh60cbw2v6gczi9rs84p3"; + version = "0.10.0"; + sha256 = "199pq15qknpcafw8ryb9kk1jsrwnncg6k5l9d4n0nmms4knxlqlf"; erubis = buildRubyGem rec { inherit ruby; @@ -27,7 +27,15 @@ buildRubyGem rec { sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; }; - propagatedBuildInputs = [ erubis thor ]; + xdg = buildRubyGem rec { + inherit ruby; + name = "ruby${ruby.version}-${gemName}-${version}"; + gemName = "xdg"; + version = "2.2.3"; + sha256 = "1bn47fdbwxqbdvjcfg86i32hmwm36k0xl876kb85f5da5v84lzmq"; + }; + + propagatedBuildInputs = [ erubis thor xdg ]; meta = with lib; { description = "Manage complex tmux sessions easily"; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index dc5f6fb03c0c..ccedec968e4b 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.10.01"; + version = "2017.10.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "047zinsczn6c96fzkarlb29y7sjwyh84nxlpfpa6mi4rn090wkqb"; + sha256 = "0npr8b1xg1dylz717kfllw433h1y16251npzch48lchq69bhm4iy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index c01e419ab239..29e527fe862d 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.3.0"; + name = "yubico-piv-tool-1.4.4"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "0l9lkzwi2227y5y02i5g1d701bmlyaj8lffv72jks1w4mkh7q7qh"; + sha256 = "0s9pib3g4lmxw9rjjd5h3ad401150kb1wqrzf8w1bq79g0zsq3mb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 8e37b85275d1..079beedcc07c 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "098ahj7nyf5c70221aq5q3aqllb94frz9lzig8rkhqfsa4mmslg5"; + sha256 = "07i9wrj7bs9770ppx943zgn8j9zvffxg2pib4w5ljxapqldhwrsq"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 99c225ec259f..b19d4cca315d 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.14.1"; + version = "2.15"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "0fayfpyc9cs6yp474400nyjbix6aywicz6pw17rzm4m7k06q5xmc"; + sha256 = "0wm16s129615i7rw48422q3x3ixr4v2p9942p0s6qk2fjlc3y8hf"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix new file mode 100644 index 000000000000..55b168a21aec --- /dev/null +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip, autoreconfHook, zlib, bzip2 }: + +stdenv.mkDerivation rec { + name = "bgpdump-2017-09-29"; + + src = fetchzip { + url = "https://bitbucket.org/ripencc/bgpdump/get/94a0e724b335.zip"; + sha256 = "09g9vz2zc4nyzl669w1j7fxw21ifja6dxbp0xbqh6n7w3gpx2g88"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib bzip2 ]; + + meta = { + homepage = https://bitbucket.org/ripencc/bgpdump/wiki/Home; + description = ''Analyze dump files produced by Zebra/Quagga or MRT''; + license = stdenv.lib.licenses.hpnd; + maintainers = with stdenv.lib.maintainers; [ lewo ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 8b81e0696c23..7dcfc6b512fb 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl }: +{ fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl, perl }: stdenv.mkDerivation rec { - name = "isync-1.2.1"; + name = "isync-1.3.0"; src = fetchurl { url = "mirror://sourceforge/isync/${name}.tar.gz"; - sha256 = "1bij6nm06ghkg98n2pdyacam2fyg5y8f7ajw0d5653m0r4ldw5p7"; + sha256 = "173wd7x8y5sp94slzwlnb7zhgs32r57zl9xspl2rf4g3fqwmhpwd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ openssl db cyrus_sasl ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 0671b7d00899..7ef278e359cc 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -44,10 +44,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-swanctl" "--enable-cmd" "--enable-systemd" "--enable-farp" "--enable-dhcp" + "--enable-openssl" "--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym" "--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2" - "--enable-eap-mschapv2" "--enable-xauth-eap" "--enable-ext-auth" + "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth" "--enable-forecast" "--enable-connmark" "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" ++ stdenv.lib.optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" - "--enable-curl" "--enable-openssl" + "--enable-curl" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" "--enable-tnc-imv" "--enable-imv-attestation" diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 756478dccb77..e60c4eecbaf6 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -1,9 +1,12 @@ -{ stdenv, lib, coreutils, findutils, gnugrep, darwin, shellcheck }: +{ stdenv, lib, coreutils, findutils, gnugrep, darwin, shellcheck +, doCheck ? false # Avoid having GHC in the build-time closure of all NixOS configuratinos +}: + stdenv.mkDerivation { name = "nix-info"; src = ./info.sh; - buildInputs = [ + nativeBuildInputs = lib.optionals doCheck [ shellcheck ]; @@ -25,7 +28,7 @@ stdenv.mkDerivation { substituteAllInPlace ./nix-info ''; - doCheck = true; + inherit doCheck; checkPhase = '' shellcheck ./nix-info ''; @@ -34,4 +37,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp ./nix-info $out/bin/nix-info ''; + + meta = { + platforms = lib.platforms.all; + }; } diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 99a5013e217e..622d095d4613 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,21 +1,16 @@ { stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: stdenv.mkDerivation rec { - version = "1.7.20"; + version = "1.8.1"; name = "librepo-${version}"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "librepo"; - rev = name; - sha256 = "17fgj2wifn2qxmh1p285fbwys0xbvwbnmxsdfvqyr5njpyl2s99h"; + rev = version; + sha256 = "11rypnxjgsc2klyg294ndxy1cyp0nyk00zpjhcvqkhp58vvkkv12"; }; - patchPhase = '' - substituteInPlace librepo/python/python2/CMakeLists.txt \ - --replace ' ''${PYTHON_INSTALL_DIR}' " $out/lib/python2.7/site-packages" - ''; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python2 expat glib pcre openssl curl check attr gpgme ]; @@ -25,9 +20,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; + homepage = https://rpm-software-management.github.io/librepo/; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; }; } - diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ac697be555ac..4359682d96a0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5650_1dd29d7a"; + suffix = "pre5663_c7af84ce"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "1dd29d7aebae706f3e90a18bbfae727f2ed03c70"; - sha256 = "182v2rczm8al1ggbaca8qapvrjyp21li1fd3fiwr5nqgazgr5308"; + rev = "c7af84ce846a9deefa5b4db1b1bce1c091ca2a1e"; + sha256 = "1sc6rkx0500jz4fyfqm7443s1q24whmpx10mfs12wdk516f0q8qh"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index 3e4ddcd880e9..a9763b07b71f 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -1,30 +1,31 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub, autoconf, pkgconfig, libtool +, bison, flex, libnl, protobuf, protobufc }: stdenv.mkDerivation rec { - name = "nsjail-git-2015-08-10"; + name = "nsjail-${version}"; + version = "2.1"; - src = fetchgit { - url = https://github.com/google/nsjail; - rev = "8b951e6c2827386786cde4a124cd1846d25b9404"; - sha256 = "02bmwd48l6ngp0nc65flw395mpj66brx3808d5xd19qn5524lnni"; + src = fetchFromGitHub { + owner = "google"; + repo = "nsjail"; + rev = version; + fetchSubmodules = true; + sha256 = "1wkhy86d0vgzngdvv593yhcghjh63chb8s67v891zll6bwgwg5h2"; }; + nativeBuildInputs = [ autoconf libtool pkgconfig ]; + buildInputs = [ bison flex libnl protobuf protobufc ]; + installPhase = '' mkdir -p $out/bin cp nsjail $out/bin ''; - meta = { - description = '' - A light-weight process isolation tool, making use of Linux namespaces - and seccomp-bpf syscall filters - ''; - homepage = http://google.github.io/nsjail; - - license = stdenv.lib.licenses.apsl20; - - maintainers = [ stdenv.lib.maintainers.bosu ]; - - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; + homepage = http://nsjail.com/; + license = licenses.apsl20; + maintainers = [ maintainers.bosu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 6f662206350f..1b32ad710071 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, coreutils, pam, groff +{ stdenv, fetchurl, coreutils, pam, groff, sssd , sendmailPath ? "/run/wrappers/bin/sendmail" , withInsults ? false +, withSssd ? false }: stdenv.mkDerivation rec { @@ -30,6 +31,9 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional withInsults [ "--with-insults" "--with-all-insults" + ] ++ stdenv.lib.optional withSssd [ + "--with-sssd" + "--with-sssd-lib=${sssd}/lib" ]; configureFlagsArray = [ diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 7ca4d8bd1c17..bfb0dd11b8ed 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,13 +9,13 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "19y688nvi0vr7cdnaa5sy2m65xicjwi5qgkgzyjvb7r3zb0dnli1"; + sha256 = "1dcmqbcdkj42614am2invb6wf8v29z4sp4d354a4d83rwhyb0qly"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; @@ -27,6 +27,8 @@ in stdenv.mkDerivation rec { mkdir -p src/github.com/hashicorp ln -s $(pwd) src/github.com/hashicorp/vault + mkdir -p .git/hooks + GOPATH=$(pwd) make ''; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 6f4b94f826d7..ddfd8cbbc01f 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; }; + # on 5.7.2: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl libdbi libgcrypt libmemcached diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 26d84ae0320e..6ef1f54c23b7 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -4,12 +4,12 @@ let version = "6.5"; - dbrev = "4394"; + dbrev = "4548"; 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 = "1kdpgbl1az0xhqn7j613cx366n7amra8xz3391jpzzrd3vlga393"; - name = "smartmontools-drivedb.h"; + url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; + sha256 = "0nwk4ir0c40b01frqm7a0lvljh5k9yhslc3j4485zjsx3v5w269f"; + name = "smartmontools-drivedb.h"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 34ed4a975a10..25800ed3a1ca 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -5,7 +5,7 @@ GEM addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) afm (0.2.2) - asciidoctor (1.5.5) + asciidoctor (1.5.6.1) asciidoctor-bespoke (1.0.0.alpha.1) asciidoctor (>= 1.5.0) slim (~> 3.0.6) @@ -16,7 +16,7 @@ GEM asciidoctor (~> 1.5, >= 1.5.2) htmlentities (~> 4.3) opal (~> 0.6.3) - asciidoctor-pdf (1.5.0.alpha.13) + asciidoctor-pdf (1.5.0.alpha.16) asciidoctor (>= 1.5.0) prawn (>= 1.3.0, < 3.0.0) prawn-icon (= 1.2.0) diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index c436d6f97518..43011b22b76a 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -26,10 +26,10 @@ asciidoctor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0kj2lls8f83nlhfkdkmbf7k5q9c9kk1cc15b1a4dy6arx4yzmvw7"; + sha256 = "c4371c419306d69152809eb896c291ca09969dc26ca34be36f4eab82914fceca"; type = "gem"; }; - version = "1.5.5"; + version = "1.5.6.1"; }; asciidoctor-bespoke = { source = { @@ -58,10 +58,10 @@ asciidoctor-pdf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0lp1q1yxy4y9k3znxxgj6pl0cbymz0yk5hsif73sg2bnpk62id9i"; + sha256 = "0f6b2a1533577dfba218de5dd886771447e4d1cb670b81d2c3bf3a180e6029a1"; type = "gem"; }; - version = "1.5.0.alpha.13"; + version = "1.5.0.alpha.16"; }; concurrent-ruby = { source = { @@ -287,4 +287,4 @@ }; version = "1.4.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 708bf46bbb06..e4613802892e 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.7"; name = "pdf2djvu-${version}"; src = fetchurl { url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; - sha256 = "0fr8b44rsqll2m6qnh9id1lfc980k7rj3aq975mwba4y57rwnlnc"; + sha256 = "1h92f9prx69wz9h57lncxj8ddh2xg6q7hjhlqqzzf30k59il4zcy"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 34a689ee9bd6..30979e312fc5 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -187,6 +187,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex ''; preBuild = "cd texk/web2c"; + CXXFLAGS = "-std=c++11 -Wno-reserved-user-defined-literal"; # TODO: remove once texlive 2017 is out? enableParallelBuilding = true; # now distribute stuff into outputs, roughly as upstream TL diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2f7d462a9f3..bfb50c829691 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -645,9 +645,7 @@ with pkgs; }; aria = aria2; - aspcud = callPackage ../tools/misc/aspcud { - boost = boost163; - }; + aspcud = callPackage ../tools/misc/aspcud { }; at = callPackage ../tools/system/at { }; @@ -764,6 +762,8 @@ with pkgs; bootchart = callPackage ../tools/system/bootchart { }; + bowtie2 = callPackage ../applications/science/biology/bowtie2 { }; + boxfs = callPackage ../tools/filesystems/boxfs { }; brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); @@ -1103,7 +1103,7 @@ with pkgs; gosu = callPackage ../tools/misc/gosu { }; - gringo = callPackage ../tools/misc/gringo { }; + gringo = callPackage ../tools/misc/gringo { scons = scons_2_5_1; }; gti = callPackage ../tools/misc/gti { }; @@ -1151,9 +1151,7 @@ with pkgs; nfdump = callPackage ../tools/networking/nfdump { }; - patdiff = callPackage ../tools/misc/patdiff { - ocamlPackages = ocamlPackages_4_03; - }; + patdiff = callPackage ../tools/misc/patdiff { }; playerctl = callPackage ../tools/audio/playerctl { }; @@ -1402,9 +1400,7 @@ with pkgs; citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; - citra = libsForQt5.callPackage ../misc/emulators/citra { - boost = boost163; - }; + citra = libsForQt5.callPackage ../misc/emulators/citra { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; @@ -1581,27 +1577,19 @@ with pkgs; cudatoolkit65 cudatoolkit7 cudatoolkit75 - cudatoolkit8; - - cudatoolkit = cudatoolkit8; + cudatoolkit8 + cudatoolkit9; - cudnn = callPackage ../development/libraries/science/math/cudnn/default.nix {}; + cudatoolkit = cudatoolkit9; - cudnn5_cudatoolkit75 = callPackage ../development/libraries/science/math/cudnn/7.5-5.0 { - cudatoolkit = cudatoolkit75; - }; + inherit (callPackages ../development/libraries/science/math/cudnn { }) + cudnn_cudatoolkit7 + cudnn_cudatoolkit75 + cudnn6_cudatoolkit8 + cudnn_cudatoolkit8 + cudnn_cudatoolkit9; - cudnn5_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.0 { - cudatoolkit = cudatoolkit8; - }; - - cudnn51_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.1 { - cudatoolkit = cudatoolkit8; - }; - - cudnn60_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-6.0 { - cudatoolkit = cudatoolkit8; - }; + cudnn = cudnn_cudatoolkit9; curlFull = curl.override { idnSupport = true; @@ -2255,6 +2243,8 @@ with pkgs; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; + gitea = callPackage ../applications/version-management/gitea { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -2905,6 +2895,7 @@ with pkgs; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg_2; + ocamlPackages = ocamlPackages_4_02; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -4391,7 +4382,7 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { inherit (ocamlPackages) ocaml camlp4; }; + sks = callPackage ../servers/sks { inherit (ocamlPackages_4_02) ocaml camlp4; }; skydns = callPackage ../servers/skydns { }; @@ -4635,6 +4626,8 @@ with pkgs; timetrap = callPackage ../applications/office/timetrap { }; + tzupdate = callPackage ../applications/misc/tzupdate { }; + tinc = callPackage ../tools/networking/tinc { }; tie = callPackage ../development/tools/misc/tie { }; @@ -6157,9 +6150,7 @@ with pkgs; ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; - ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { - ocamlPackages = ocamlPackages_4_03; - }; + ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { nodejs = nodejs-4_x; @@ -6298,6 +6289,7 @@ with pkgs; }; teyjus = callPackage ../development/compilers/teyjus { + inherit (ocamlPackages_4_02) ocaml; omake = omake_rc1; }; @@ -6859,8 +6851,9 @@ with pkgs; ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {}; ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {}; ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {}; - ansible = ansible_2_3; - ansible2 = ansible_2_3; + ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {}; + ansible = ansible_2_4; + ansible2 = ansible_2_4; antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; @@ -7198,10 +7191,12 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages_4_03) ocaml findlib camlp4 sedlex ocamlbuild; + inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild; }; - framac = callPackage ../development/tools/analysis/frama-c { }; + framac = callPackage ../development/tools/analysis/frama-c { + ocamlPackages = ocamlPackages_4_03; + }; frame = callPackage ../development/libraries/frame { }; @@ -7423,9 +7418,7 @@ with pkgs; noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; - obelisk = callPackage ../development/tools/ocaml/obelisk { - ocamlPackages = ocaml-ng.ocamlPackages_4_03; - }; + obelisk = callPackage ../development/tools/ocaml/obelisk { }; obuild = callPackage ../development/tools/ocaml/obuild { }; @@ -7545,7 +7538,9 @@ with pkgs; selendroid = callPackage ../development/tools/selenium/selendroid { }; - scons = callPackage ../development/tools/build-managers/scons { }; + sconsPackages = callPackage ../development/tools/build-managers/scons { }; + scons = sconsPackages.scons_3_0_0; + scons_2_5_1 = sconsPackages.scons_2_5_1; sbt = callPackage ../development/tools/build-managers/sbt { }; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; @@ -7716,7 +7711,6 @@ with pkgs; inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast; }; - ### DEVELOPMENT / LIBRARIES a52dec = callPackage ../development/libraries/a52dec { }; @@ -7824,8 +7818,9 @@ with pkgs; boost162 = callPackage ../development/libraries/boost/1.62.nix { }; boost163 = callPackage ../development/libraries/boost/1.63.nix { }; boost164 = callPackage ../development/libraries/boost/1.64.nix { }; - boost16x = boost164; - boost = boost162; + boost165 = callPackage ../development/libraries/boost/1.65.nix { }; + boost16x = boost165; + boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -8031,6 +8026,18 @@ with pkgs; dotconf = callPackage ../development/libraries/dotconf { }; + # Multi-arch "drivers" which we want to build for i686. + driversi686Linux = recurseIntoAttrs { + inherit (pkgsi686Linux) + mesa_noglu + vaapiIntel + libvdpau-va-gl + vaapiVdpau + beignet + glxinfo + vdpauinfo; + }; + dssi = callPackage ../development/libraries/dssi {}; dxflib = callPackage ../development/libraries/dxflib {}; @@ -10023,6 +10030,8 @@ with pkgs; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { + enableCuda = config.cudaSupport or false; + cudatoolkit = cudatoolkit8; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; }; @@ -10031,6 +10040,8 @@ with pkgs; openexr = callPackage ../development/libraries/openexr { }; + openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; + openldap = callPackage ../development/libraries/openldap { }; opencolorio = callPackage ../development/libraries/opencolorio { }; @@ -10055,6 +10066,8 @@ with pkgs; openslp = callPackage ../development/libraries/openslp {}; + openvdb = callPackage ../development/libraries/openvdb {}; + inherit (callPackages ../development/libraries/libressl { }) libressl_2_5 libressl_2_6; @@ -10085,7 +10098,7 @@ with pkgs; }; opensubdiv = callPackage ../development/libraries/opensubdiv { - stdenv_gcc5 = overrideCC stdenv gcc5; + cudaSupport = config.cudaSupport or false; cmake = cmake_2_8; }; @@ -10095,6 +10108,8 @@ with pkgs; ortp = callPackage ../development/libraries/ortp { }; + openrct2 = callPackage ../games/openrct2/default.nix { }; + osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; p11_kit = callPackage ../development/libraries/p11-kit { }; @@ -10310,7 +10325,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver; + threadweaver kirigami2; ### KDE PLASMA 5 @@ -10844,6 +10859,13 @@ with pkgs; gnutls = gnutls; }); + # 3.14 is needed for R V8 module in ../development/r-modules/default.nix + v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { + inherit (python2Packages) python gyp; + cctools = darwin.cctools; + stdenv = overrideCC stdenv gcc5; + }; + v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (python2Packages) python gyp; cctools = darwin.cctools; @@ -11051,6 +11073,8 @@ with pkgs; xvidcore = callPackage ../development/libraries/xvidcore { }; + xxHash = callPackage ../development/libraries/xxHash {}; + xylib = callPackage ../development/libraries/xylib { }; yajl = callPackage ../development/libraries/yajl { }; @@ -11097,6 +11121,8 @@ with pkgs; czmq = czmq3; }; + zig = callPackage ../development/compilers/zig {}; + zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; @@ -11409,7 +11435,9 @@ with pkgs; charybdis = callPackage ../servers/irc/charybdis {}; - clickhouse = callPackage ../servers/clickhouse { }; + clickhouse = callPackage ../servers/clickhouse { + boost = boost160; + }; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; @@ -11465,6 +11493,8 @@ with pkgs; inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; }; + biboumi = callPackage ../servers/xmpp/biboumi { }; + elasticmq = callPackage ../servers/elasticmq { }; eventstore = callPackage ../servers/nosql/eventstore { @@ -12927,7 +12957,6 @@ with pkgs; systemd = callPackage ../os-specific/linux/systemd { utillinux = utillinuxMinimal; # break the cyclic dependency - gperf = gperf_3_0; # fix build until v233 } // { udev.bin = systemd; # ${systemd.udev.bin}/bin/udevadm @@ -13620,6 +13649,8 @@ with pkgs; airwave = callPackage ../applications/audio/airwave/default.nix { }; + alembic = callPackage ../development/libraries/alembic {}; + alchemy = callPackage ../applications/graphics/alchemy { }; alock = callPackage ../misc/screensavers/alock { }; @@ -13814,12 +13845,14 @@ with pkgs; inherit (gnome2) zenity; }; + bgpdump = callPackage ../tools/networking/bgpdump { }; + blackbox = callPackage ../applications/version-management/blackbox { }; bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - stdenv_gcc5 = overrideCC stdenv gcc5; + cudaSupport = config.cudaSupport or false; python = python35; }; @@ -14096,11 +14129,11 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_06 - docker_17_09; + docker_17_09 + docker_17_10; docker = docker_17_09; - docker-edge = docker_17_09; + docker-edge = docker_17_10; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -15006,6 +15039,7 @@ with pkgs; wlc = callPackage ../development/libraries/wlc { }; orbment = callPackage ../applications/window-managers/orbment { }; sway = callPackage ../applications/window-managers/sway { }; + swaylock = callPackage ../applications/window-managers/sway { }; swc = callPackage ../development/libraries/swc { }; wld = callPackage ../development/libraries/wld { }; @@ -15405,7 +15439,7 @@ with pkgs; bison = bison2; }; - llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { }; + llpp = ocaml-ng.ocamlPackages.callPackage ../applications/misc/llpp { }; lmms = callPackage ../applications/audio/lmms { stdenv = overrideCC stdenv gcc5; @@ -15719,6 +15753,8 @@ with pkgs; ruby = ruby_2_1; }; + partio = callPackage ../development/libraries/partio {}; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; pcmanfm-qt = lxqt.pcmanfm-qt; @@ -15737,6 +15773,8 @@ with pkgs; polybar = callPackage ../applications/misc/polybar { }; + ptex = callPackage ../development/libraries/ptex {}; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; @@ -15881,6 +15919,8 @@ with pkgs; opencpn = callPackage ../applications/misc/opencpn { }; + openfx = callPackage ../development/libraries/openfx {}; + openimageio = callPackage ../applications/graphics/openimageio { }; openjump = callPackage ../applications/misc/openjump { }; @@ -15901,7 +15941,7 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; }; + orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; ocamlPackages = ocamlPackages_4_02; }; osmo = callPackage ../applications/office/osmo { }; @@ -16482,7 +16522,7 @@ with pkgs; curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = qt5.callPackage ../applications/misc/cura { }; + cura = qt56.callPackage ../applications/misc/cura { }; curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; @@ -16552,7 +16592,7 @@ with pkgs; stalonetray = callPackage ../applications/window-managers/stalonetray {}; - inherit (ocamlPackages_4_03) stog; + inherit (ocamlPackages) stog; stp = callPackage ../applications/science/logic/stp {}; @@ -17423,6 +17463,7 @@ with pkgs; zanshin = libsForQt5.callPackage ../applications/office/zanshin { inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; inherit (kdeFrameworks) krunner kwallet; + boost = boost160; }; zathura = callPackage ../applications/misc/zathura { @@ -17571,6 +17612,7 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; + inherit (kdeApplications) kcalcore; boost = boost160; }; @@ -18251,8 +18293,8 @@ with pkgs; kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop - plasma-integration plasma-nm plasma-pa plasma-workspace - plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm startkde + plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings; ### SCIENCE @@ -18351,10 +18393,7 @@ with pkgs; blas = callPackage ../development/libraries/science/math/blas { }; - clblas-cuda = callPackage ../development/libraries/science/math/clblas/cuda { - cudatoolkit = pkgs.cudatoolkit75; - inherit (linuxPackages) nvidia_x11; - }; + clblas = callPackage ../development/libraries/science/math/clblas { }; jags = callPackage ../applications/science/math/jags { }; @@ -18480,9 +18519,7 @@ with pkgs; abella = callPackage ../applications/science/logic/abella {}; - acgtk = callPackage ../applications/science/logic/acgtk { - ocamlPackages = ocamlPackages_4_03; - }; + acgtk = callPackage ../applications/science/logic/acgtk { }; alt-ergo = callPackage ../applications/science/logic/alt-ergo { ocamlPackages = ocamlPackages_4_02; @@ -18583,7 +18620,9 @@ with pkgs; }; cvc4 = callPackage ../applications/science/logic/cvc4 {}; - ekrhyper = callPackage ../applications/science/logic/ekrhyper {}; + ekrhyper = callPackage ../applications/science/logic/ekrhyper { + inherit (ocamlPackages_4_02) ocaml; + }; eprover = callPackage ../applications/science/logic/eprover { }; @@ -18614,7 +18653,9 @@ with pkgs; java = if stdenv.isLinux then jre else jdk; }; - iprover = callPackage ../applications/science/logic/iprover {}; + iprover = callPackage ../applications/science/logic/iprover { + inherit (ocamlPackages_4_02) ocaml; + }; jonprl = callPackage ../applications/science/logic/jonprl { smlnj = if stdenv.isDarwin @@ -18736,8 +18777,15 @@ with pkgs; caffe = callPackage ../applications/science/math/caffe rec { cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false; - # CUDA 8 doesn't support GCC 6. - stdenv = if cudaSupport then overrideCC pkgs.stdenv gcc5 else pkgs.stdenv; + cudnnSupport = cudaSupport; + }; + + cntk = callPackage ../applications/science/math/cntk rec { + cudaSupport = pkgs.config.cudaSupport or false; + cudnnSupport = cudaSupport; + inherit (linuxPackages) nvidia_x11; + cudatoolkit = cudatoolkit8; + cudnn = cudnn6_cudatoolkit8; }; ecm = callPackage ../applications/science/math/ecm { }; @@ -18761,7 +18809,9 @@ with pkgs; sbcl = null; }; - mxnet = callPackage ../applications/science/math/mxnet { + mxnet = callPackage ../applications/science/math/mxnet rec { + cudaSupport = config.cudaSupport or false; + cudnnSupport = cudaSupport; inherit (linuxPackages) nvidia_x11; }; @@ -19157,6 +19207,7 @@ with pkgs; nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; nix-info = callPackage ../tools/nix/info { }; + nix-info-tested = callPackage ../tools/nix/info { doCheck = true; }; nix-index = callPackage ../tools/package-management/nix-index { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 275c0739ce65..43c249e7b1d9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -98,7 +98,10 @@ let camlzip = callPackage ../development/ocaml-modules/camlzip { }; camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; - camomile = callPackage ../development/ocaml-modules/camomile { }; + camomile = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/camomile { } + else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { }; camlimages_4_0 = if lib.versionOlder "4.02" ocaml.version @@ -986,5 +989,5 @@ in rec ocamlPackages_latest = ocamlPackages_4_05; - ocamlPackages = ocamlPackages_4_02; + ocamlPackages = ocamlPackages_4_04; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 69c89c2529d3..9f1423c65c1c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2917,10 +2917,10 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.050"; + name = "CryptX-0.054"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "c1de040779d9f5482d0a2f17a9a5aa6b069c7c58c07fbe26ab62bc689a5c9161"; + sha256 = "f084a706f6ff032ca5c46ec6f90ba5b6a26ae8752584911830f6535bf76d8e57"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 231d5fecf6ba..65210b2e0553 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -60,7 +60,7 @@ let buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args ); - graphiteVersion = "0.9.15"; + graphiteVersion = "1.0.2"; fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs: let @@ -95,7 +95,10 @@ in { setuptools = callPackage ../development/python-modules/setuptools { }; - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; }; + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { + pythonPackages = self; + boost = pkgs.boost160; + }; acoustics = callPackage ../development/python-modules/acoustics { }; @@ -253,6 +256,10 @@ in { pythonPackages = self; }; + pyqt56 = pkgs.libsForQt56.callPackage ../development/python-modules/pyqt/5.x.nix { + pythonPackages = self; + }; + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; @@ -275,6 +282,8 @@ in { python-stdnum = callPackage ../development/python-modules/python-stdnum { }; + python-utils = callPackage ../development/python-modules/python-utils { }; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; PyWebDAV = callPackage ../development/python-modules/pywebdav { }; @@ -535,6 +544,8 @@ in { }; } else null; + python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; + funcsigs = callPackage ../development/python-modules/funcsigs { }; APScheduler = callPackage ../development/python-modules/APScheduler { }; @@ -1476,7 +1487,10 @@ in { # Build boost for this specific Python version # TODO: use separate output for libboost_python.so - boost = pkgs.boost.override {inherit python;}; + boost = pkgs.boost.override { + inherit (self) python numpy; + enablePython = true; + }; buttersink = buildPythonPackage rec { name = "buttersink-0.6.8"; @@ -1531,7 +1545,6 @@ in { python = self.python; boost = self.boost; numpy = self.numpy; - pythonSupport = true; }; capstone = buildPythonPackage rec { @@ -1667,6 +1680,8 @@ in { csvkit = callPackage ../development/python-modules/csvkit { }; + cufflinks = callPackage ../development/python-modules/cufflinks { }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; cvxopt = buildPythonPackage rec { @@ -2576,6 +2591,27 @@ in { }; }; + cntk = buildPythonPackage rec { + inherit (pkgs.cntk) name version src meta; + + buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ]; + propagatedBuildInputs = with self; [ numpy scipy enum34 protobuf pip ]; + + CNTK_LIB_PATH = "${pkgs.cntk}/lib"; + CNTK_COMPONENT_VERSION = pkgs.cntk.version; + + postPatch = '' + cd bindings/python + ''; + + postInstall = '' + rm -rf $out/${python.sitePackages}/cntk/libs + ln -s ${pkgs.cntk}/lib $out/${python.sitePackages}/cntk/libs + # It's not installed for some reason. + cp cntk/cntk_py.py $out/${python.sitePackages}/cntk + ''; + }; + celery = buildPythonPackage rec { name = "celery-${version}"; version = "4.0.2"; @@ -2909,6 +2945,8 @@ in { colorama = callPackage ../development/python-modules/colorama { }; + colorlover = callPackage ../development/python-modules/colorlover { }; + CommonMark = buildPythonPackage rec { name = "CommonMark-${version}"; version = "0.6.3"; @@ -6648,14 +6686,15 @@ in { }; }; - python-mapnik = buildPythonPackage { - name = "python-mapnik-git-2016-08-30"; + python-mapnik = buildPythonPackage rec { + name = "python-mapnik-${version}"; + version = "3.0.13"; src = pkgs.fetchFromGitHub { owner = "mapnik"; repo = "python-mapnik"; - rev = "541fd962d4fc99d50ec472af6ddccfdbf98cff37"; - sha256 = "1d93qjnzggdpbhnmxlmk5jh0zd2jnpfl4n4aip5ypd39ilqibhf3"; + rev = "v${version}"; + sha256 = "0biw9bfkbsgfyjihyvkj4abx9s9r3h81rk6dc1y32022rypsqhkp"; }; disabled = isPyPy; @@ -8286,14 +8325,14 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_tagging_0_3 = self.django_tagging.overrideAttrs (attrs: rec { - name = "django-tagging-0.3.6"; + django_tagging_0_4_3 = self.django_tagging.overrideAttrs (attrs: rec { + name = "django-tagging-0.4.3"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; - sha256 = "03zlbq13rydfh28wh0jk3x3cjk9x6jjmqnx1i3ngjmfwbxf8x6j1"; + sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs"; }; - propagatedBuildInputs = with self; [ django ]; + propagatedBuildInputs = with self; [ django_1_8 ]; }); django_classytags = buildPythonPackage rec { @@ -11127,14 +11166,12 @@ in { }; }); - libgpuarray-cuda = callPackage ../development/python-modules/libgpuarray/cuda/default.nix rec { - inherit (self) numpy scipy; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit75; - clblas = pkgs.clblas-cuda; + libgpuarray = callPackage ../development/python-modules/libgpuarray { + clblas = pkgs.clblas.override { boost = self.boost; }; + cudaSupport = pkgs.config.cudaSupport or false; }; - libnacl = callPackage ../development/python-modules/libnacl/default.nix { + libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; }; @@ -13311,6 +13348,8 @@ in { }; }; + numpy-stl = callPackage ../development/python-modules/numpy-stl { }; + numtraits = buildPythonPackage rec { pname = "numtraits"; version = "0.2"; @@ -18274,22 +18313,6 @@ in { }; }; - # Remove before release of 17.09 - requests_1 = buildPythonPackage rec { - name = "requests-1.2.3"; - disabled = !pythonOlder "3.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "156bf3ec27ba9ec7e0cf8fbe02808718099d218de403eb64a714d73ba1a29ab1"; - }; - - meta = { - description = "An Apache2 licensed HTTP library, written in Python, for human beings"; - homepage = http://docs.python-requests.org/en/latest/; - }; - }; - requests2 = throw "requests2 has been deprecated. Use requests instead."; # use requests, not requests_2 @@ -19833,24 +19856,20 @@ in { stevedore = callPackage ../development/python-modules/stevedore {}; - Theano = self.TheanoWithoutCuda; + Theano = callPackage ../development/python-modules/Theano rec { + cudaSupport = pkgs.config.cudaSupport or false; + cudnnSupport = cudaSupport; + }; - TheanoWithoutCuda = callPackage ../development/python-modules/Theano/theano-without-cuda { }; + TheanoWithoutCuda = self.Theano.override { + cudaSupport = true; + cudnnSupport = true; + }; - TheanoWithCuda = callPackage ../development/python-modules/Theano/theano-with-cuda ( - let - boost = pkgs.boost159.override { - inherit (self) python numpy scipy; - }; - in rec { - cudatoolkit = pkgs.cudatoolkit75; - cudnn = pkgs.cudnn5_cudatoolkit75; - inherit (self) numpy scipy; - pycuda = self.pycuda.override { inherit boost; }; - libgpuarray = self.libgpuarray-cuda.override { - clblas = pkgs.clblas-cuda.override { inherit boost; }; - }; - }); + TheanoWithCuda = self.Theano.override { + cudaSupport = false; + cudnnSupport = false; + }; tidylib = buildPythonPackage rec { version = "0.2.4"; @@ -22250,11 +22269,11 @@ EOF }; waitress = buildPythonPackage rec { - name = "waitress-0.8.9"; + name = "waitress-1.0.2"; src = pkgs.fetchurl { url = "mirror://pypi/w/waitress/${name}.tar.gz"; - sha256 = "826527dc9d334ed4ed76cdae672fdcbbccf614186657db71679ab58df869458a"; + sha256 = "0pw6yyxi348r2xpq3ykqnf7gwi881azv2422d2ixb0xi5jws2ky7"; }; doCheck = false; @@ -22265,6 +22284,8 @@ EOF }; }; + waitress-django = callPackage ../development/python-modules/waitress-django { }; + webassets = buildPythonPackage rec { name = "webassets-${version}"; version = "0.12.1"; @@ -23457,7 +23478,7 @@ EOF src = pkgs.fetchurl { url = "mirror://pypi/w/whisper/${name}.tar.gz"; - sha256 = "1chkphxwnwvy2cs7jc2h2i0lqqvi9jx6vqj3ly88lwk7m35r4ss2"; + sha256 = "1v1bi3fl1i6p4z4ki692bykrkw6907dn3mfq0151f70lvi3zpns3"; }; # error: invalid command 'test' @@ -23524,7 +23545,7 @@ EOF src = pkgs.fetchurl { url = "mirror://pypi/c/carbon/${name}.tar.gz"; - sha256 = "f01db6d37726c6fc0a8aaa66a7bf14436b0dd0d62ef3c20ecb31605a4d365d2e"; + sha256 = "142smpmgbnjinvfb6s4ijazish4vfgzyd8zcmdkh55y051fkixkn"; }; propagatedBuildInputs = with self; [ whisper txamqp zope_interface twisted ]; @@ -23739,10 +23760,13 @@ EOF src = pkgs.fetchurl rec { url = "mirror://pypi/g/graphite-web/${name}.tar.gz"; - sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; + sha256 = "0q8bwlj75jqyzmazfsi5sa26xl58ssa8wdxm2l4j0jqyn8xpfnmc"; }; - propagatedBuildInputs = with self; [ django django_tagging_0_3 whisper pycairo ldap memcached pytz ]; + propagatedBuildInputs = with self; [ + django_1_8 django_tagging_0_4_3 whisper pycairo cairocffi + ldap memcached pytz urllib3 scandir + ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ @@ -23750,10 +23774,20 @@ EOF ''; preConfigure = '' - substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo' - substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" - cp webapp/graphite/manage.py bin/manage-graphite.py - substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings' + # graphite is configured by storing a local_settings.py file inside the + # graphite python package. Since that package is stored in the immutable + # Nix store we can't modify it. So how do we configure graphite? + # + # First of all we rename "graphite.local_settings" to + # "graphite_local_settings" so that the settings are not looked up in the + # graphite package anymore. Secondly we place a directory containing a + # graphite_local_settings.py on the PYTHONPATH in the graphite module + # <nixpkgs/nixos/modules/services/monitoring/graphite.nix>. + substituteInPlace webapp/graphite/settings.py \ + --replace "graphite.local_settings" " graphite_local_settings" + + substituteInPlace webapp/graphite/settings.py \ + --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" ''; # error: invalid command 'test' @@ -25963,14 +25997,20 @@ EOF tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflow = self.tensorflowWithoutCuda; + tensorflow = callPackage ../development/python-modules/tensorflow rec { + bazel = pkgs.bazel_0_4; + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit8; + cudnn = pkgs.cudnn6_cudatoolkit8; + }; - tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { }; + tensorflowWithoutCuda = self.tensorflow.override { + cudaSupport = false; + }; - tensorflowWithCuda = callPackage ../development/python-modules/tensorflow { + tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; - cudatoolkit = pkgs.cudatoolkit8; - cudnn = pkgs.cudnn60_cudatoolkit80; }; tflearn = buildPythonPackage rec { @@ -26486,7 +26526,12 @@ EOF stripe = callPackage ../development/python-modules/stripe { }; - uranium = callPackage ../development/python-modules/uranium { }; + twilio = callPackage ../development/python-modules/twilio { }; + + uranium = callPackage ../development/python-modules/uranium { + # https://github.com/Ultimaker/Cura/issues/2596 + pyqt5 = self.pyqt56; + }; vine = callPackage ../development/python-modules/vine { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 952b1e8927e4..8cbb7063b4eb 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -48,6 +48,7 @@ let jobs.nix.x86_64-darwin jobs.nox.x86_64-darwin jobs.nix-info.x86_64-darwin + jobs.nix-info-tested.x86_64-darwin jobs.openssh.x86_64-darwin jobs.openssl.x86_64-darwin jobs.postgresql.x86_64-darwin @@ -92,6 +93,8 @@ let # Needed for support jobs.nix-info.x86_64-linux jobs.nix-info.x86_64-darwin + jobs.nix-info-tested.x86_64-linux + jobs.nix-info-tested.x86_64-darwin # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux # Ensure that basic stuff works on darwin |