From dd61eb9bdadd6d407e53b72152752ff51d3f7853 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 30 Aug 2016 20:10:42 +1000 Subject: [PATCH 001/195] hyperterm: init at 0.7.6 --- pkgs/applications/misc/hyperterm/default.nix | 42 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/misc/hyperterm/default.nix diff --git a/pkgs/applications/misc/hyperterm/default.nix b/pkgs/applications/misc/hyperterm/default.nix new file mode 100644 index 00000000000..b3e0ef71c3c --- /dev/null +++ b/pkgs/applications/misc/hyperterm/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchurl, dpkg, gtk, atk, glib, pango, gdk_pixbuf, cairo +, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr +, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver +, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: + +let + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc gtk atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio + ]; +in +stdenv.mkDerivation rec { + version = "0.7.6"; + name = "hyperterm-${version}"; + src = fetchurl { + url = https://github.com/zeit/hyperterm/releases/download/v0.7.1/hyperterm-0.7.1.deb; + sha256 = "1xdwhmzlkg1ly1xgsbv99xk4x1g1x270vx1b12dvf10ck5x9v63a"; + }; + buildInputs = [ dpkg ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = '' + mkdir -p "$out/bin" + ln -s "$out/opt/HyperTerm/HyperTerm" "$out/bin/HyperTerm" + mv opt "$out/" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/HyperTerm/HyperTerm" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/HyperTerm/resources/app/node_modules/child_pty/build/Release/exechelper" + mv usr/* "$out/" + ''; + dontPatchELF = true; + meta = with lib; { + description = "A terminal built on web technologies"; + homepage = https://hyperterm.org/; + maintainers = with maintainers; [ puffnfresh ]; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95b1b21e892..022e43bc893 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13449,6 +13449,8 @@ in hydrogen = callPackage ../applications/audio/hydrogen { }; + hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome) GConf; }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; spectrwm = callPackage ../applications/window-managers/spectrwm { }; From c60354237a5500a37d217ba588c3b061026460a7 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Fri, 2 Sep 2016 23:22:41 +0100 Subject: [PATCH 002/195] hyperdex: Remove broken package and its dependencies. Closes #17995. Presumably no one was using it otherwise we'd have noticed it breaking sooner. --- pkgs/servers/nosql/hyperdex/busybee.nix | 25 --------- pkgs/servers/nosql/hyperdex/default.nix | 55 -------------------- pkgs/servers/nosql/hyperdex/hyperleveldb.nix | 20 ------- pkgs/servers/nosql/hyperdex/libe.nix | 20 ------- pkgs/servers/nosql/hyperdex/libmacaroons.nix | 20 ------- pkgs/servers/nosql/hyperdex/libpo6.nix | 19 ------- pkgs/servers/nosql/hyperdex/replicant.nix | 30 ----------- pkgs/top-level/all-packages.nix | 2 - 8 files changed, 191 deletions(-) delete mode 100644 pkgs/servers/nosql/hyperdex/busybee.nix delete mode 100644 pkgs/servers/nosql/hyperdex/default.nix delete mode 100644 pkgs/servers/nosql/hyperdex/hyperleveldb.nix delete mode 100644 pkgs/servers/nosql/hyperdex/libe.nix delete mode 100644 pkgs/servers/nosql/hyperdex/libmacaroons.nix delete mode 100644 pkgs/servers/nosql/hyperdex/libpo6.nix delete mode 100644 pkgs/servers/nosql/hyperdex/replicant.nix diff --git a/pkgs/servers/nosql/hyperdex/busybee.nix b/pkgs/servers/nosql/hyperdex/busybee.nix deleted file mode 100644 index e71fb608260..00000000000 --- a/pkgs/servers/nosql/hyperdex/busybee.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, unzip, autoreconfHook, libpo6, libe, pkgconfig }: - -stdenv.mkDerivation rec { - name = "busybee-${version}"; - version = "0.5.2"; - - src = fetchurl { - url = "https://github.com/rescrv/busybee/archive/releases/${version}.zip"; - sha256 = "0b51h1kmkf0s3d9y7wjqgp1pk1rk9i7n8bcgyj01kflzdgafbl0b"; - }; - - buildInputs = [ - autoreconfHook - libe - libpo6 - pkgconfig - unzip - ]; - - meta = with stdenv.lib; { - description = "A high-performance messaging layer"; - homepage = https://github.com/rescrv/busybee; - license = licenses.bsd3; - }; -} diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix deleted file mode 100644 index 73a2dfc1f18..00000000000 --- a/pkgs/servers/nosql/hyperdex/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, unzip, autoreconfHook, autoconf-archive -, python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc -, flex, pandoc, help2man, callPackage }: - -assert stdenv.isLinux; - -let -hyperleveldb = callPackage ./hyperleveldb.nix {}; -libpo6 = callPackage ./libpo6.nix {}; -libe = callPackage ./libe.nix { inherit libpo6; }; -busybee = callPackage ./busybee.nix { inherit libpo6 libe; }; -replicant = callPackage ./replicant.nix { - inherit libpo6 libe busybee hyperleveldb; -}; -libmacaroons = callPackage ./libmacaroons.nix { }; - -in -stdenv.mkDerivation rec { - name = "hyperdex-${version}"; - version = "1.5.0"; - - src = fetchurl { - url = "https://github.com/rescrv/HyperDex/archive/releases/${version}.zip"; - sha256 = "0l7w3x6c4nslz5ijmj8xys0k1slwi3s4crxmi16ml1x32bqgzhj7"; - }; - - buildInputs = [ - autoreconfHook - autoconf-archive - busybee - glog - hyperleveldb - json_c - libe - libmacaroons - libpo6 - pkgconfig - popt - python - replicant - unzip - gperf - yacc - flex - help2man - pandoc - ]; - - meta = with stdenv.lib; { - description = "A scalable, searchable key-value store"; - homepage = http://hyperdex.org; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix deleted file mode 100644 index 1e3c3afe234..00000000000 --- a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, unzip, autoreconfHook }: - -stdenv.mkDerivation rec { - name = "hyperleveldb-${version}"; - version = "1.2.1"; - - src = fetchurl { - url = "https://github.com/rescrv/HyperLevelDB/archive/releases/${version}.zip"; - sha256 = "0m5fwl9sc7c6m2zm3zjlxxg7f602gnaryikxgflahhdccdvvr56y"; - }; - - buildInputs = [ unzip autoreconfHook ]; - - meta = with stdenv.lib; { - description = ''A fork of LevelDB intended to meet the needs of - HyperDex while remaining compatible with LevelDB.''; - homepage = https://github.com/rescrv/HyperLevelDB; - license = licenses.bsd3; - }; -} diff --git a/pkgs/servers/nosql/hyperdex/libe.nix b/pkgs/servers/nosql/hyperdex/libe.nix deleted file mode 100644 index 733f33288ce..00000000000 --- a/pkgs/servers/nosql/hyperdex/libe.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, unzip, autoreconfHook, libpo6, pkgconfig }: - -stdenv.mkDerivation rec { - name = "libe-${version}"; - version = "0.8.1"; - - src = fetchurl { - url = "https://github.com/rescrv/e/archive/releases/${version}.zip"; - sha256 = "18xm0hcnqdf0ipfn19jrgzqsxij5xjbbnihhzc57n4v7yfdca1w3"; - }; - - buildInputs = [ unzip autoreconfHook libpo6 pkgconfig ]; - - meta = with stdenv.lib; { - description = "Library containing high-performance datastructures and utilities for C++"; - homepage = https://github.com/rescrv/e; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix deleted file mode 100644 index 016ee704e58..00000000000 --- a/pkgs/servers/nosql/hyperdex/libmacaroons.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, unzip, autoreconfHook, pkgconfig, libsodium, python }: - -stdenv.mkDerivation rec { - name = "libmacaroons-${version}"; - version = "0.3.0"; - - src = fetchurl { - url = "https://github.com/rescrv/libmacaroons/archive/releases/${version}.zip"; - sha256 = "18c44424jri0p5la6jgrnlz5p937hk7ws2mldhzjwisqyf5qld43"; - }; - - buildInputs = [ unzip autoreconfHook python libsodium pkgconfig ]; - - meta = with stdenv.lib; { - description = ''Macaroons are flexible authorization credentials that - support decentralized delegation, attenuation, and verification.''; - homepage = https://github.com/rescrv/libmacaroons; - license = licenses.bsd3; - }; -} diff --git a/pkgs/servers/nosql/hyperdex/libpo6.nix b/pkgs/servers/nosql/hyperdex/libpo6.nix deleted file mode 100644 index 70e46f45347..00000000000 --- a/pkgs/servers/nosql/hyperdex/libpo6.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, unzip, autoreconfHook }: - -stdenv.mkDerivation rec { - name = "libpo6-${version}"; - version = "0.5.2"; - - src = fetchurl { - url = "https://github.com/rescrv/po6/archive/releases/${version}.zip"; - sha256 = "17grzkh6aw1f68qvkhivbb6vwbm6jd41ysbfn88pypf5lczxrxly"; - }; - - buildInputs = [ unzip autoreconfHook ]; - - meta = with stdenv.lib; { - description = "POSIX wrappers for C++"; - homepage = https://github.com/rescrv/po6; - license = licenses.bsd3; - }; -} diff --git a/pkgs/servers/nosql/hyperdex/replicant.nix b/pkgs/servers/nosql/hyperdex/replicant.nix deleted file mode 100644 index 43c86e6c0c9..00000000000 --- a/pkgs/servers/nosql/hyperdex/replicant.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, unzip, autoreconfHook, glog, - hyperleveldb, libe, pkgconfig, popt, libpo6, busybee }: - -stdenv.mkDerivation rec { - name = "replicant-${version}"; - version = "0.6.3"; - - src = fetchurl { - url = "https://github.com/rescrv/Replicant/archive/releases/${version}.zip"; - sha256 = "1q3pdq2ndpj70yd1578bn4grlrp77gl8hv2fz34jpx34qmlalda4"; - }; - - buildInputs = [ - autoreconfHook - busybee - glog - hyperleveldb - libe - libpo6 - pkgconfig - popt - unzip - ]; - - meta = with stdenv.lib; { - description = "A system for maintaining replicated state machines"; - homepage = https://github.com/rescrv/Replicant; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c47d59069a..ae5511b8cb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10504,8 +10504,6 @@ in influxdb10 = callPackage ../servers/nosql/influxdb/v1.nix { }; - hyperdex = callPackage ../servers/nosql/hyperdex { }; - mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; From f96cd1ea642c6a3f639f8bf9499ac34451afc6b3 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 3 Sep 2016 08:25:25 +0200 Subject: [PATCH 003/195] emacs module: Fix to get properly themed GTK apps --- nixos/modules/services/editors/emacs.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 6795ec52fe4..08fa6de6374 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -79,9 +79,13 @@ in { environment.systemPackages = [ cfg.package editorScript ]; - environment.variables = if cfg.defaultEditor then { - EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor"; - } else {}; + environment.variables = { + # This is required so that GTK applications launched from Emacs + # get properly themed: + GTK_DATA_PREFIX = "${config.system.path}"; + } // (if cfg.defaultEditor then { + EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor"; + } else {}); }; meta.doc = ./emacs.xml; From 810787238df835befd442c538cfa34ad799f3e72 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2016 23:38:23 -0400 Subject: [PATCH 004/195] fontforge: enable Carbon which is required on OSX --- pkgs/tools/misc/fontforge/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 54551b5af39..388f603873f 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withGTK [ gtk2 pango ] - ++ lib.optionals (withGTK && stdenv.isDarwin) [ Carbon Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; configureFlags = lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f94cd7257bb..36e9a328738 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1617,7 +1617,9 @@ in flvtool2 = callPackage ../tools/video/flvtool2 { }; - fontforge = lowPrio (callPackage ../tools/misc/fontforge { }); + fontforge = lowPrio (callPackage ../tools/misc/fontforge { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }); fontforge-gtk = callPackage ../tools/misc/fontforge { withGTK = true; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; From 372a56fadbf29b5b65b5754b289c328bbc063655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 4 Sep 2016 07:25:21 -0300 Subject: [PATCH 005/195] rage: 0.2.0 -> 0.2.1 --- pkgs/desktops/enlightenment/rage.nix | 39 +++++++++++----------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 9ef557654dc..a9222105058 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,19 +1,28 @@ -{ stdenv, fetchurl, efl, automake, autoconf, libtool, pkgconfig, gst_all_1 -, makeWrapper, lib }: +{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "06fxhznwbd5x341r8ml3cpwmvwn0aq9i1akcgclk4vjdqiyff1d9"; + sha256 = "0xlxb1hmbnqcy088cqpj2i87hsd5h3da7d2f9afiavz0ssw4ll94"; }; nativeBuildInputs = [ - automake autoconf libtool pkgconfig makeWrapper + pkgconfig + wrapGAppsHook ]; + buildInputs = [ + efl + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + ]; + NIX_CFLAGS_COMPILE = [ "-I${efl}/include/ecore-con-1" "-I${efl}/include/ecore-evas-1" @@ -29,28 +38,10 @@ stdenv.mkDerivation rec { "-I${efl}/include/ethumb-client-1" ]; - buildInputs = [ - efl - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav - ]; - - configurePhase = '' - ./autogen.sh --prefix=$out - ''; - - postInstall = '' - wrapProgram $out/bin/rage \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - meta = { description = "Video + Audio player along the lines of mplayer"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ]; + maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; From 85e2b60b771db9bef25ad94bd8ffc199088f9afe Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 4 Sep 2016 16:56:46 +0200 Subject: [PATCH 006/195] xpra: 0.17.4 -> 0.17.5 --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 1e5cc846513..1a84eaddda6 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -7,11 +7,11 @@ let inherit (pythonPackages) python cython buildPythonApplication; in buildPythonApplication rec { - name = "xpra-0.17.4"; + name = "xpra-0.17.5"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "0v9xiy1d1izjnpy4d4l5zwfhb6z7x35nn8nzzn7a5mnsim5qb9wj"; + sha256 = "01k5iax42820pblfadig8rqfa1wlcgpakmjp142gx3fg59fnav3i"; }; buildInputs = [ From 2540b419f24e5ccae881e3d233220539ab82624c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 12 Aug 2016 15:32:36 +0200 Subject: [PATCH 007/195] kapacitor: init at 1.0.0 --- pkgs/servers/monitoring/kapacitor/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/monitoring/kapacitor/default.nix diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix new file mode 100644 index 00000000000..804826941f2 --- /dev/null +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "kapacitor-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/influxdata/kapacitor"; + + src = fetchFromGitHub { + owner = "influxdata"; + repo = "kapacitor"; + rev = "v${version}"; + sha256 = "14l9bhj6qdif79s4dyqqbnjgj3m4iarvw0ckld1wdhpdgvl8w9qh"; + }; + + meta = with lib; { + description = "Open source framework for processing, monitoring, and alerting on time series data"; + license = licenses.mit; + homepage = https://influxdata.com/time-series-platform/kapacitor/; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdd24c2e858..b63ad03e96e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -845,6 +845,8 @@ in interlock = callPackage ../servers/interlock {}; + kapacitor = callPackage ../servers/monitoring/kapacitor { }; + long-shebang = callPackage ../misc/long-shebang {}; mathics = pythonPackages.mathics; From 9b31fcf8c046c0941a851f97de7a8779c9161e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 4 Sep 2016 20:42:32 +0200 Subject: [PATCH 008/195] zotero: remove esr suffix from version string. Also escaped the perl regexes since that will become an error in the future. --- pkgs/applications/office/zotero/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 5a21754b44e..3cb7ed491fb 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }: +{ stdenv, fetchurl, lib, bash, firefox, perl, unzipNLS, xorg }: let @@ -30,7 +30,7 @@ stdenv.mkDerivation { unzip "${xpi}" -d "$out/libexec/zotero" BUILDID=`date +%Y%m%d` - GECKO_VERSION="${firefox.passthru.version}" + GECKO_VERSION="${lib.removeSuffix "esr" firefox.passthru.version}" UPDATE_CHANNEL="default" # Copy branding @@ -52,8 +52,8 @@ stdenv.mkDerivation { # Copy application.ini and modify cp assets/application.ini "$out/libexec/zotero/application.ini" - perl -pi -e "s/{{VERSION}}/$version/" "$out/libexec/zotero/application.ini" - perl -pi -e "s/{{BUILDID}}/$BUILDID/" "$out/libexec/zotero/application.ini" + perl -pi -e "s/\{\{VERSION}}/$version/" "$out/libexec/zotero/application.ini" + perl -pi -e "s/\{\{BUILDID}}/$BUILDID/" "$out/libexec/zotero/application.ini" perl -pi -e "s/^MaxVersion.*\$/MaxVersion=$GECKO_VERSION/" "$out/libexec/zotero/application.ini" # Copy prefs.js and modify From 735bbda892547d46315cfc7e4af5ebaa30117f06 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 27 Aug 2016 05:28:25 +0200 Subject: [PATCH 009/195] zimg: init at 2.2.1 --- pkgs/development/libraries/zimg/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/zimg/default.nix diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix new file mode 100644 index 00000000000..3f11cd71a3f --- /dev/null +++ b/pkgs/development/libraries/zimg/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec{ + name = "zimg-${version}"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "sekrit-twc"; + repo = "zimg"; + rev = "e88b156fdd6d5ae647bfc68a30e86d14f214764d"; + sha256 = "1hb35pm9ykdyhg71drd59yy29d154m2r1mr8ikyzpi3knanjn23a"; + }; + + buildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "Scaling, colorspace conversion and dithering library"; + homepage = https://github.com/sekrit-twc/zimg; + license = licenses.wtfpl; + platform = platforms.linux; # check upstream issue #52 + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74bde248417..886f2a90066 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17679,6 +17679,8 @@ in maphosts = callPackage ../tools/networking/maphosts {}; + zimg = callPackage ../development/libraries/zimg { }; + zuki-themes = callPackage ../misc/themes/zuki { }; zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {}; From 347fcb6a841f7e07cb8a3c9a31a35d6d9fa51ed2 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 27 Aug 2016 05:36:45 +0200 Subject: [PATCH 010/195] vapoursynth: init at R33.1 --- .../libraries/vapoursynth/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/vapoursynth/default.nix diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix new file mode 100644 index 00000000000..12cba8decc7 --- /dev/null +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, + glibc, zimg, imagemagick, libass, tesseract, yasm, + python3 +}: + +stdenv.mkDerivation rec { + name = "vapoursynth-${version}"; + version = "R33.1"; + + src = fetchFromGitHub { + owner = "vapoursynth"; + repo = "vapoursynth"; + rev = "0d69d29abb3c4ba9e806958bf9c539bd6eff6852"; + sha256 = "1dbz81vgqfsb306d7891p8y25y7632y32ii3l64shr0jsq64vgsm"; + }; + + buildInputs = [ + pkgconfig autoreconfHook + zimg imagemagick libass glibc tesseract yasm + (python3.withPackages (ps: with ps; [ sphinx cython ])) + ]; + + configureFlags = [ + "--enable-imwri" + "--disable-static" + ]; + + meta = with stdenv.lib; { + description = "A video processing framework with the future in mind"; + homepage = http://www.vapoursynth.com/; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ rnhmjoj ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 886f2a90066..766b7e4d41d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16098,6 +16098,8 @@ in vapor = callPackage ../games/vapor { love = love_0_8; }; + vapoursynth = callPackage ../development/libraries/vapoursynth { }; + vassal = callPackage ../games/vassal { }; vdrift = callPackage ../games/vdrift { }; From d7e5fbfb573e14e9492865883030e520d2febc55 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 27 Aug 2016 05:38:57 +0200 Subject: [PATCH 011/195] vapoursynth-mvtools: init at 16 --- .../libraries/vapoursynth-mvtools/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/vapoursynth-mvtools/default.nix diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix new file mode 100644 index 00000000000..0fb34e5953e --- /dev/null +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, + vapoursynth, yasm, fftwFloat +}: + +stdenv.mkDerivation rec { + name = "vapoursynth-mvtools-${version}"; + version = "16"; + + src = fetchFromGitHub { + owner = "dubhater"; + repo = "vapoursynth-mvtools"; + rev = "48959b868c18fa8066502f957734cbd5fb9762a0"; + sha256 = "15xpqvfzhv0kcf3gyghni4flazi1mmj2iy6zw5834phqr52yg07z"; + }; + + buildInputs = [ + pkgconfig autoreconfHook + yasm vapoursynth fftwFloat + ]; + + configureFlags = "--libdir=$(out)/lib/vapoursynth"; + + meta = with stdenv.lib; { + description = "A set of filters for motion estimation and compensation"; + homepage = https://github.com/dubhater/vapoursynth-mvtools; + license = licenses.gpl2; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766b7e4d41d..1f0a293f22f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16100,6 +16100,8 @@ in vapoursynth = callPackage ../development/libraries/vapoursynth { }; + vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; + vassal = callPackage ../games/vassal { }; vdrift = callPackage ../games/vdrift { }; From 6fabc515d01a5644a027a7d12f845979fce023a3 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 27 Aug 2016 06:36:40 +0200 Subject: [PATCH 012/195] mpv: add vapoursynth support --- pkgs/applications/video/mpv/default.nix | 181 +++++++++++++----------- 1 file changed, 99 insertions(+), 82 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7eea4dc2d69..507e99665e0 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,56 +1,70 @@ -{ stdenv, fetchurl, fetchFromGitHub, docutils, makeWrapper, perl, pkgconfig -, python, which, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs -, lua, lua5_sockets -, libuchardet, rubberband -, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null -, xineramaSupport ? true, libXinerama ? null -, xvSupport ? true, libXv ? null -, sdl2Support? true, SDL2 ? null -, alsaSupport ? true, alsaLib ? null -, screenSaverSupport ? true, libXScrnSaver ? null -, vdpauSupport ? true, libvdpau ? null -, dvdreadSupport? true, libdvdread ? null -, dvdnavSupport ? true, libdvdnav ? null -, bluraySupport ? true, libbluray ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, jackaudioSupport ? false, libjack2 ? null -, pulseSupport ? true, libpulseaudio ? null -, bs2bSupport ? true, libbs2b ? null -# For screenshots -, libpngSupport ? true, libpng ? null -# for Youtube support -, youtubeSupport ? true, youtube-dl ? null -, cacaSupport ? true, libcaca ? null -, vaapiSupport ? false, libva ? null -, waylandSupport ? false, wayland ? null, libxkbcommon ? null +{ stdenv, fetchurl, fetchFromGitHub, makeWrapper +, docutils, perl, pkgconfig, python3, which, ffmpeg +, freefont_ttf, freetype, libass, libpthreadstubs +, lua, lua5_sockets, libuchardet, rubberband + +, x11Support ? true, + mesa ? null, + libX11 ? null, + libXext ? null, + libXxf86vm ? null + +, waylandSupport ? false, + wayland ? null, + libxkbcommon ? null + +, xineramaSupport ? true, libXinerama ? null +, xvSupport ? true, libXv ? null +, sdl2Support ? true, SDL2 ? null +, alsaSupport ? true, alsaLib ? null +, screenSaverSupport ? true, libXScrnSaver ? null +, vdpauSupport ? true, libvdpau ? null +, dvdreadSupport ? true, libdvdread ? null +, dvdnavSupport ? true, libdvdnav ? null +, bluraySupport ? true, libbluray ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, pulseSupport ? true, libpulseaudio ? null +, bs2bSupport ? true, libbs2b ? null +, cacaSupport ? true, libcaca ? null +, libpngSupport ? true, libpng ? null +, youtubeSupport ? true, youtube-dl ? null +, vapoursynthSupport ? false, vapoursynth ? null +, jackaudioSupport ? false, libjack2 ? null +, vaapiSupport ? false, libva ? null + # scripts you want to be loaded by default , scripts ? [] }: -assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); -assert xineramaSupport -> (libXinerama != null && x11Support); -assert xvSupport -> (libXv != null && x11Support); -assert sdl2Support -> SDL2 != null; -assert alsaSupport -> alsaLib != null; -assert screenSaverSupport -> libXScrnSaver != null; -assert vdpauSupport -> libvdpau != null; -assert dvdreadSupport -> libdvdread != null; -assert dvdnavSupport -> libdvdnav != null; -assert bluraySupport -> libbluray != null; -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> libjack2 != null; -assert pulseSupport -> libpulseaudio != null; -assert bs2bSupport -> libbs2b != null; -assert libpngSupport -> libpng != null; -assert youtubeSupport -> youtube-dl != null; -assert cacaSupport -> libcaca != null; -assert waylandSupport -> (wayland != null && libxkbcommon != null); +with stdenv.lib; + +let + available = x: x != null; +in +assert x11Support -> all available [mesa libX11 libXext libXxf86vm]; +assert waylandSupport -> all available [wayland libxkbcommon]; +assert xineramaSupport -> x11Support && available libXinerama; +assert xvSupport -> x11Support && available libXv; +assert sdl2Support -> available SDL2; +assert alsaSupport -> available alsaLib; +assert screenSaverSupport -> available libXScrnSaver; +assert vdpauSupport -> available libvdpau; +assert dvdreadSupport -> available libdvdread; +assert dvdnavSupport -> available libdvdnav; +assert bluraySupport -> available libbluray; +assert speexSupport -> available speex; +assert theoraSupport -> available libtheora; +assert pulseSupport -> available libpulseaudio; +assert bs2bSupport -> available libbs2b; +assert cacaSupport -> available libcaca; +assert libpngSupport -> available libpng; +assert youtubeSupport -> available youtube-dl; +assert vapoursynthSupport -> available vapoursynth; +assert jackaudioSupport -> available libjack2; +assert vaapiSupport -> available libva; let - inherit (stdenv.lib) optional optionals optionalString concatStringsSep; - # Purity: Waf is normally downloaded by bootstrap.py, but # for purity reasons this behavior should be avoided. wafVersion = "1.8.12"; @@ -59,16 +73,14 @@ let "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1"; }; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "mpv-${version}"; version = "0.19.0"; src = fetchFromGitHub { owner = "mpv-player"; - repo = "mpv"; - rev = "v${version}"; + repo = "mpv"; + rev = "v${version}"; sha256 = "14rbglrcplhkf16ik4fbcv7k27lz6h4glfayr12ylh98srmsscqa"; }; @@ -80,60 +92,65 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-libmpv-shared" + "--enable-manpage-build" + "--enable-zsh-comp" "--disable-libmpv-static" "--disable-static-build" - "--enable-manpage-build" "--disable-build-date" # Purity - "--enable-zsh-comp" - ] ++ optional vaapiSupport "--enable-vaapi" - ++ optional waylandSupport "--enable-wayland"; + (enableFeature vaapiSupport "vaapi") + (enableFeature waylandSupport "wayland") + ]; configurePhase = '' - python ${waf} configure --prefix=$out $configureFlags + python3 ${waf} configure --prefix=$out $configureFlags ''; - nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python which ]; + nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; buildInputs = [ - ffmpeg freetype libass libpthreadstubs lua lua5_sockets libuchardet rubberband - ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] - ++ optional alsaSupport alsaLib - ++ optional xvSupport libXv - ++ optional theoraSupport libtheora - ++ optional xineramaSupport libXinerama - ++ optional dvdreadSupport libdvdread - ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ optional bluraySupport libbluray - ++ optional jackaudioSupport libjack2 - ++ optional pulseSupport libpulseaudio + ffmpeg freetype libass libpthreadstubs + lua lua5_sockets libuchardet rubberband + ] ++ optional alsaSupport alsaLib + ++ optional xvSupport libXv + ++ optional theoraSupport libtheora + ++ optional xineramaSupport libXinerama + ++ optional dvdreadSupport libdvdread + ++ optional bluraySupport libbluray + ++ optional jackaudioSupport libjack2 + ++ optional pulseSupport libpulseaudio ++ optional screenSaverSupport libXScrnSaver - ++ optional vdpauSupport libvdpau - ++ optional speexSupport speex - ++ optional bs2bSupport libbs2b - ++ optional libpngSupport libpng - ++ optional youtubeSupport youtube-dl - ++ optional sdl2Support SDL2 - ++ optional cacaSupport libcaca - ++ optional vaapiSupport libva - ++ optionals waylandSupport [ wayland libxkbcommon ]; + ++ optional vdpauSupport libvdpau + ++ optional speexSupport speex + ++ optional bs2bSupport libbs2b + ++ optional libpngSupport libpng + ++ optional youtubeSupport youtube-dl + ++ optional sdl2Support SDL2 + ++ optional cacaSupport libcaca + ++ optional vaapiSupport libva + ++ optional vapoursynthSupport vapoursynth + ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] + ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] + ++ optionals waylandSupport [ wayland libxkbcommon ]; enableParallelBuilding = true; buildPhase = '' - python ${waf} build + python3 ${waf} build ''; installPhase = '' - python ${waf} install + python3 ${waf} install # Use a standard font mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - '' + optionalString youtubeSupport '' # Ensure youtube-dl is available in $PATH for MPV wrapProgram $out/bin/mpv \ + --add-flags "--script=${concatStringsSep "," scripts}" \ + '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ - --add-flags "--script=${concatStringsSep "," scripts}" + '' + optionalString vapoursynthSupport '' + --prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH" ''; meta = with stdenv.lib; { From 1d4ed387516ae0fdadabc09335c1da6f51cd80e7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2016 23:39:43 -0400 Subject: [PATCH 013/195] fontforge: prevent configure from picking up xquartz installation --- pkgs/tools/misc/fontforge/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 388f603873f..ba1154ab72d 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] - ++ lib.optional withGTK "--enable-gtk2-use"; + ++ lib.optional withGTK "--enable-gtk2-use" + ++ lib.optional (!withGTK) "--without-x"; preConfigure = '' cp -r "${gnulib}" ./gnulib From 780d9d64815d5f525e637930d051b40c1aeb5250 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2016 23:40:08 -0400 Subject: [PATCH 014/195] dejavu-fonts: enable on OSX --- pkgs/data/fonts/dejavu-fonts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 6d9abdad2fa..267a0b80a1f 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { # See http://dejavu-fonts.org/wiki/License for details license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 6ee4fd834fd45eed252de0f43033ffa0bfa19b9e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Sep 2016 20:16:16 +0300 Subject: [PATCH 015/195] swt: Add libXt Not sure what change made this to be required. It was probably propagated by something previously. --- pkgs/development/libraries/java/swt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 454190ebdfb..52d235c6a44 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk -, libXtst, libXi, mesa, webkit, libsoup, xorg +, libXt, libXtst, libXi, mesa, webkit, libsoup, xorg , pango, gdk_pixbuf, glib }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; - buildInputs = [ unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup ]; + buildInputs = [ unzip jdk pkgconfig gtk libXt libXtst libXi mesa webkit libsoup ]; NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; From 5f8b6b2e1d2eaff9bfdec53f5d9743dfee2e0224 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Mon, 5 Sep 2016 20:01:50 +0200 Subject: [PATCH 016/195] ecl: add gcc into wrapper PATH otherwise the native gcc based compiler does not work --- pkgs/development/compilers/ecl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 61737004e6f..cfaf8184c69 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl , libtool, autoconf, automake , gmp, mpfr, libffi, makeWrapper -, noUnicode ? false, +, noUnicode ? false +, gcc }: let s = # Generated upstream information @@ -17,7 +18,7 @@ let libtool autoconf automake makeWrapper ]; propagatedBuildInputs = [ - libffi gmp mpfr + libffi gmp mpfr gcc ]; in stdenv.mkDerivation { @@ -43,6 +44,7 @@ stdenv.mkDerivation { postInstall = '' sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config wrapProgram "$out/bin/ecl" \ + --prefix PATH ':' "${gcc}/bin" \ --prefix NIX_LDFLAGS ' ' "-L${gmp.lib or gmp.out or gmp}/lib" \ --prefix NIX_LDFLAGS ' ' "-L${libffi.lib or libffi.out or libffi}/lib" ''; From 8774294e304836def3985492678016337d2595a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Aug 2016 12:36:16 +0200 Subject: [PATCH 017/195] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v2.0.1-3-g27b56fd using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/535780cef61f8677c35bbb097955e05f7eef8cec - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d7ece2dc93b010f8324b40fb36cee38eb29a2979 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/15c64f722ec2deb91661bcf060b4114d49c97142 --- .../haskell-modules/configuration-lts.nix | 35 + .../haskell-modules/hackage-packages.nix | 1653 +++++++++++++---- 2 files changed, 1313 insertions(+), 375 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix index 675debc74be..dfe0087db77 100644 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ b/pkgs/development/haskell-modules/configuration-lts.nix @@ -220,6 +220,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DPutils" = dontDistribute super."DPutils"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -673,6 +674,7 @@ self: super: { "NestedFunctor" = dontDistribute super."NestedFunctor"; "NestedSampling" = dontDistribute super."NestedSampling"; "NetSNMP" = dontDistribute super."NetSNMP"; + "Network-NineP" = doDistribute super."Network-NineP_0_4_0"; "NewBinary" = dontDistribute super."NewBinary"; "Ninjas" = dontDistribute super."Ninjas"; "NoSlow" = dontDistribute super."NoSlow"; @@ -808,6 +810,7 @@ self: super: { "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; + "SCalendar" = dontDistribute super."SCalendar"; "SConfig" = dontDistribute super."SConfig"; "SDL" = dontDistribute super."SDL"; "SDL-gfx" = dontDistribute super."SDL-gfx"; @@ -821,6 +824,7 @@ self: super: { "SFont" = dontDistribute super."SFont"; "SG" = dontDistribute super."SG"; "SGdemo" = dontDistribute super."SGdemo"; + "SGplus" = dontDistribute super."SGplus"; "SHA2" = dontDistribute super."SHA2"; "SMTPClient" = dontDistribute super."SMTPClient"; "SNet" = dontDistribute super."SNet"; @@ -1156,6 +1160,7 @@ self: super: { "alarmclock" = doDistribute super."alarmclock_0_2_0_9"; "alea" = dontDistribute super."alea"; "alex-meta" = dontDistribute super."alex-meta"; + "alex-tools" = dontDistribute super."alex-tools"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; "algebra" = dontDistribute super."algebra"; @@ -1871,6 +1876,7 @@ self: super: { "chp-spec" = dontDistribute super."chp-spec"; "chp-transformers" = dontDistribute super."chp-transformers"; "chronograph" = dontDistribute super."chronograph"; + "chronos" = dontDistribute super."chronos"; "chu2" = dontDistribute super."chu2"; "chuchu" = dontDistribute super."chuchu"; "chunked-data" = doDistribute super."chunked-data_0_2_0"; @@ -2061,6 +2067,7 @@ self: super: { "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; "conf" = dontDistribute super."conf"; + "conffmt" = dontDistribute super."conffmt"; "config-manager" = dontDistribute super."config-manager"; "config-select" = dontDistribute super."config-select"; "config-value" = dontDistribute super."config-value"; @@ -2149,6 +2156,7 @@ self: super: { "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; + "cpuinfo" = dontDistribute super."cpuinfo"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; "cql" = doDistribute super."cql_3_0_7"; @@ -2167,6 +2175,7 @@ self: super: { "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; + "crawlchain" = dontDistribute super."crawlchain"; "craze" = dontDistribute super."craze"; "crc" = dontDistribute super."crc"; "crc16" = dontDistribute super."crc16"; @@ -2440,6 +2449,7 @@ self: super: { "demarcate" = dontDistribute super."demarcate"; "denominate" = dontDistribute super."denominate"; "dense" = dontDistribute super."dense"; + "dependent-map" = doDistribute super."dependent-map_0_2_2_0"; "dependent-state" = dontDistribute super."dependent-state"; "depends" = dontDistribute super."depends"; "dephd" = dontDistribute super."dephd"; @@ -2473,6 +2483,7 @@ self: super: { "diagrams-boolean" = dontDistribute super."diagrams-boolean"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_1"; "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_5"; + "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_11"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_6"; @@ -3432,6 +3443,7 @@ self: super: { "google-html5-slide" = dontDistribute super."google-html5-slide"; "google-mail-filters" = dontDistribute super."google-mail-filters"; "google-oauth2" = dontDistribute super."google-oauth2"; + "google-oauth2-jwt" = dontDistribute super."google-oauth2-jwt"; "google-search" = dontDistribute super."google-search"; "google-translate" = dontDistribute super."google-translate"; "googleplus" = dontDistribute super."googleplus"; @@ -3645,6 +3657,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-filestore" = dontDistribute super."hakyll-filestore"; "hakyll-ogmarkup" = dontDistribute super."hakyll-ogmarkup"; + "hakyll-shakespeare" = dontDistribute super."hakyll-shakespeare"; "halberd" = dontDistribute super."halberd"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; @@ -4416,6 +4429,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_31"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4924,6 +4938,7 @@ self: super: { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11_6_2"; "language-cil" = dontDistribute super."language-cil"; "language-conf" = dontDistribute super."language-conf"; "language-css" = dontDistribute super."language-css"; @@ -5004,6 +5019,7 @@ self: super: { "lens-utils" = dontDistribute super."lens-utils"; "lenses" = dontDistribute super."lenses"; "lensref" = dontDistribute super."lensref"; + "lentil" = doDistribute super."lentil_0_1_12_0"; "lenz" = dontDistribute super."lenz"; "lenz-template" = dontDistribute super."lenz-template"; "level-monad" = dontDistribute super."level-monad"; @@ -5211,6 +5227,7 @@ self: super: { "luachunk" = dontDistribute super."luachunk"; "luautils" = dontDistribute super."luautils"; "lub" = dontDistribute super."lub"; + "lucid" = doDistribute super."lucid_2_9_5"; "lucid-foundation" = dontDistribute super."lucid-foundation"; "lucid-svg" = doDistribute super."lucid-svg_0_6_0_1"; "lucienne" = dontDistribute super."lucienne"; @@ -5345,6 +5362,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoize" = doDistribute super."memoize_0_7"; "memorypool" = dontDistribute super."memorypool"; "memscript" = dontDistribute super."memscript"; "merge-bash-history" = dontDistribute super."merge-bash-history"; @@ -5925,8 +5943,16 @@ self: super: { "pandoc-types" = doDistribute super."pandoc-types_1_16_1"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "pango" = doDistribute super."pango_0_13_1_1"; + "papa" = dontDistribute super."papa"; + "papa-lens" = dontDistribute super."papa-lens"; + "papa-prelude" = dontDistribute super."papa-prelude"; + "papa-prelude-core" = dontDistribute super."papa-prelude-core"; + "papa-prelude-lens" = dontDistribute super."papa-prelude-lens"; + "papa-prelude-semigroupoids" = dontDistribute super."papa-prelude-semigroupoids"; + "papa-prelude-semigroups" = dontDistribute super."papa-prelude-semigroups"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; + "paprika" = dontDistribute super."paprika"; "para" = dontDistribute super."para"; "paragon" = dontDistribute super."paragon"; "parallel-tasks" = dontDistribute super."parallel-tasks"; @@ -6240,6 +6266,7 @@ self: super: { "prelude-prime" = dontDistribute super."prelude-prime"; "prelude2010" = dontDistribute super."prelude2010"; "preprocess-haskell" = dontDistribute super."preprocess-haskell"; + "preprocessor" = dontDistribute super."preprocessor"; "present" = dontDistribute super."present"; "press" = dontDistribute super."press"; "presto-hdbc" = dontDistribute super."presto-hdbc"; @@ -6449,6 +6476,7 @@ self: super: { "random-eff" = dontDistribute super."random-eff"; "random-effin" = dontDistribute super."random-effin"; "random-extras" = dontDistribute super."random-extras"; + "random-fu-multivariate" = dontDistribute super."random-fu-multivariate"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; "random-strings" = dontDistribute super."random-strings"; @@ -7424,6 +7452,7 @@ self: super: { "sym-plot" = dontDistribute super."sym-plot"; "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; + "symon" = dontDistribute super."symon"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -7596,6 +7625,7 @@ self: super: { "text-lips" = dontDistribute super."text-lips"; "text-loc" = dontDistribute super."text-loc"; "text-locale-encoding" = dontDistribute super."text-locale-encoding"; + "text-metrics" = dontDistribute super."text-metrics"; "text-normal" = dontDistribute super."text-normal"; "text-position" = dontDistribute super."text-position"; "text-printer" = dontDistribute super."text-printer"; @@ -8006,6 +8036,7 @@ self: super: { "utc" = dontDistribute super."utc"; "utf8-env" = dontDistribute super."utf8-env"; "utf8-prelude" = dontDistribute super."utf8-prelude"; + "utility-ht" = doDistribute super."utility-ht_0_0_11"; "uu-cco" = dontDistribute super."uu-cco"; "uu-cco-examples" = dontDistribute super."uu-cco-examples"; "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; @@ -8263,6 +8294,8 @@ self: super: { "wraxml" = dontDistribute super."wraxml"; "wreq-sb" = dontDistribute super."wreq-sb"; "wright" = dontDistribute super."wright"; + "writer-cps-mtl" = dontDistribute super."writer-cps-mtl"; + "writer-cps-transformers" = dontDistribute super."writer-cps-transformers"; "wsdl" = dontDistribute super."wsdl"; "wsedit" = dontDistribute super."wsedit"; "wtk" = dontDistribute super."wtk"; @@ -8375,6 +8408,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_18_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; @@ -8453,6 +8487,7 @@ self: super: { "yesod-s3" = dontDistribute super."yesod-s3"; "yesod-sass" = dontDistribute super."yesod-sass"; "yesod-session-redis" = dontDistribute super."yesod-session-redis"; + "yesod-static" = doDistribute super."yesod-static_1_5_0_3"; "yesod-tableview" = dontDistribute super."yesod-tableview"; "yesod-test" = doDistribute super."yesod-test_1_5_1_1"; "yesod-test-json" = dontDistribute super."yesod-test-json"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a3191794d3b..8331af278e9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -249,17 +249,17 @@ self: { }) {}; "ADPfusion" = callPackage - ({ mkDerivation, base, bits, containers, mmorph, mtl, OrderedBits - , primitive, PrimitiveArray, QuickCheck, strict, template-haskell - , test-framework, test-framework-quickcheck2, test-framework-th - , th-orphans, transformers, tuple, vector + ({ mkDerivation, base, bits, containers, DPutils, mmorph, mtl + , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict + , template-haskell, test-framework, test-framework-quickcheck2 + , test-framework-th, th-orphans, transformers, tuple, vector }: mkDerivation { pname = "ADPfusion"; - version = "0.5.1.0"; - sha256 = "cd3acc617c59a90e94b6666f5f6814515a2a11625d8794c977afe51520586951"; + version = "0.5.2.0"; + sha256 = "264284d9a7bb0978caec240c98d8cabbe89772248bd8e7514f53b277f902a61d"; libraryHaskellDepends = [ - base bits containers mmorph mtl OrderedBits primitive + base bits containers DPutils mmorph mtl OrderedBits primitive PrimitiveArray QuickCheck strict template-haskell th-orphans transformers tuple vector ]; @@ -267,7 +267,6 @@ self: { base bits OrderedBits PrimitiveArray QuickCheck strict test-framework test-framework-quickcheck2 test-framework-th vector ]; - jailbreak = true; homepage = "https://github.com/choener/ADPfusion"; description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; @@ -756,6 +755,8 @@ self: { pname = "Agda"; version = "2.5.1.1"; sha256 = "563b8063fc94349b56ae1867e973f1751db0e9a8997af7ede93d3c3a8c66a6b0"; + revision = "1"; + editedCabalFile = "388327fd9b4f98671a05ba6aa873d8161133d71e6234fcdb208882eda9fd161b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -772,7 +773,6 @@ self: { haskell-src-exts mtl process ]; executableToolDepends = [ emacs ]; - jailbreak = true; postInstall = '' files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) for f in "''${files[@]}" ; do @@ -1604,24 +1604,24 @@ self: { }) {}; "BiobaseTypes" = callPackage - ({ mkDerivation, aeson, base, binary, cereal, cereal-text - , data-default, deepseq, hashable, log-domain, primitive - , PrimitiveArray, QuickCheck, stringable, test-framework - , test-framework-quickcheck2, test-framework-th, text, text-binary - , vector, vector-binary-instances, vector-th-unbox + ({ mkDerivation, aeson, base, bimaps, binary, cereal, cereal-text + , cereal-vector, data-default, deepseq, hashable, intern + , log-domain, primitive, PrimitiveArray, QuickCheck, stringable + , tasty, tasty-quickcheck, tasty-th, text, text-binary, vector + , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseTypes"; - version = "0.1.1.1"; - sha256 = "ba23d60cdb43afb26cfa74532f40b1dba2c1f216bdd3dd6dc78b540942ece1c0"; + version = "0.1.2.0"; + sha256 = "b1086f4228edfad9cddfb7abdbeca079bef5517a3629552069f3dfcd8378e84e"; libraryHaskellDepends = [ - aeson base binary cereal cereal-text data-default deepseq hashable - log-domain primitive PrimitiveArray QuickCheck stringable text - text-binary vector vector-binary-instances vector-th-unbox + aeson base bimaps binary cereal cereal-text cereal-vector + data-default deepseq hashable intern log-domain primitive + PrimitiveArray QuickCheck stringable text text-binary vector + vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - test-framework-th + base QuickCheck tasty tasty-quickcheck tasty-th ]; jailbreak = true; homepage = "https://github.com/choener/BiobaseTypes"; @@ -1655,8 +1655,8 @@ self: { }: mkDerivation { pname = "BiobaseXNA"; - version = "0.9.2.1"; - sha256 = "79ad74d27a7215c8514337af1b515ba429771692a33dcd2298c39ae2c6026d09"; + version = "0.9.3.0"; + sha256 = "c5175ce6473b6f46885834acf600b11ca196d62ae0c5de2c598b8f01c07f3e45"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3384,8 +3384,8 @@ self: { ({ mkDerivation, base, HUnit, mtl, old-locale, QuickCheck, time }: mkDerivation { pname = "Craft3e"; - version = "0.1.0.10"; - sha256 = "b7909eeb97361ab1623d4a824c6cfc6b416b7c956d6a9fa3d74dda90f9943ae3"; + version = "0.1.1.0"; + sha256 = "7315402aceb5ce2fff070add7aac3503ea02adb76dade5b1f472744d439601e5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3641,6 +3641,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "DPutils" = callPackage + ({ mkDerivation, base, containers, kan-extensions, parallel, pipes + , QuickCheck, tasty, tasty-quickcheck, tasty-th, vector + }: + mkDerivation { + pname = "DPutils"; + version = "0.0.0.2"; + sha256 = "cfa99cdd515cffd20f5c20ad100d4793ea3d36f650a7c049bc7182efec5cc33e"; + libraryHaskellDepends = [ + base containers kan-extensions parallel pipes QuickCheck vector + ]; + testHaskellDepends = [ + base containers kan-extensions parallel pipes QuickCheck tasty + tasty-quickcheck tasty-th vector + ]; + homepage = "https://github.com/choener/DPutils"; + description = "utilities for DP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "DRBG" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, cipher-aes128 , crypto-api, crypto-api-tests, cryptohash-cryptoapi, entropy @@ -5518,8 +5538,8 @@ self: { }: mkDerivation { pname = "FormalGrammars"; - version = "0.3.0.0"; - sha256 = "65ec8b4334748b18bb2a64606adf324c8cc12e192448b33cc7877cd66341171f"; + version = "0.3.1.0"; + sha256 = "cc6d92eeda014b8f1b89eed81e11f9b7c4b9c150771f330e43092644754fbac8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5527,7 +5547,9 @@ self: { HaTeX lens mtl parsers PrimitiveArray semigroups template-haskell text transformers trifecta unordered-containers vector ]; - executableHaskellDepends = [ ansi-wl-pprint base cmdargs ]; + executableHaskellDepends = [ + ansi-wl-pprint base cmdargs trifecta + ]; jailbreak = true; homepage = "https://github.com/choener/FormalGrammars"; description = "(Context-free) grammars in formal language theory"; @@ -6827,6 +6849,26 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; + "H_0_9_0_1" = callPackage + ({ mkDerivation, base, bytestring, cmdargs, file-embed, inline-r + , pretty, process, temporary, vector + }: + mkDerivation { + pname = "H"; + version = "0.9.0.1"; + sha256 = "5fc04dfefcac9f6882cea9e65755479f7b1d853618c89258a005df63c8d57134"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cmdargs file-embed inline-r pretty process + temporary vector + ]; + homepage = "https://tweag.github.io/HaskellR"; + description = "The Haskell/R mixed programming environment"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HARM" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -8412,7 +8454,6 @@ self: { sha256 = "badebf99ae5a4982cdf2f8932f080e349240dc2b75c40e75ce2518ea086c5381"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq filepath ]; - doCheck = false; homepage = "https://github.com/hspec/HUnit#readme"; description = "A unit testing framework for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -8518,8 +8559,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "HaLeX"; - version = "1.2.1"; - sha256 = "1ab0d64eeedec08d9b72c423712437a656fae8ce46ae839bff7778e59f843309"; + version = "1.2.2"; + sha256 = "8b21e5a3c5ff7f2d195f667ae4892ffcdc626fa32ff3e22c1fb0f5b5676b9c95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl ]; @@ -10306,6 +10347,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels_3_2_8" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl + , primitive, transformers, vector, zlib + }: + mkDerivation { + pname = "JuicyPixels"; + version = "3.2.8"; + sha256 = "038c6547d543442a93b2028be4b84c225bb7a6fa913e1fc57325c58d043d5644"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq mtl primitive + transformers vector zlib + ]; + homepage = "https://github.com/Twinside/Juicy.Pixels"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-canvas" = callPackage ({ mkDerivation, base, containers, JuicyPixels }: mkDerivation { @@ -10368,6 +10427,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-scale-dct_0_1_1_1" = callPackage + ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels, time + }: + mkDerivation { + pname = "JuicyPixels-scale-dct"; + version = "0.1.1.1"; + sha256 = "3e967d7313d9e157fc51f7e0dda42a2050c01aaf28870943dba922ebaf456c88"; + libraryHaskellDepends = [ + base base-compat carray fft JuicyPixels + ]; + testHaskellDepends = [ + base base-compat carray fft JuicyPixels time + ]; + jailbreak = true; + homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; + description = "Scale JuicyPixels images with DCT"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-util" = callPackage ({ mkDerivation, base, JuicyPixels, vector }: mkDerivation { @@ -10652,21 +10731,22 @@ self: { }) {}; "LATS" = callPackage - ({ mkDerivation, base, constraint-classes, hmatrix, semigroups - , vector + ({ mkDerivation, base, constraint-classes, hmatrix, openblasCompat + , semigroups, vector }: mkDerivation { pname = "LATS"; - version = "0.4.1"; - sha256 = "6a07e22952b72a02665a7adc9058a0dfba2e667f2459758cc9dda3b258380698"; + version = "0.4.2"; + sha256 = "43eb07e25804a5c1f2671d0e845da2eca5910f13e92889c970ea4a5d4ef9a3b7"; libraryHaskellDepends = [ base constraint-classes hmatrix semigroups vector ]; + librarySystemDepends = [ openblasCompat ]; homepage = "http://github.com/guaraqe/lats#readme"; description = "Linear Algebra on Typed Spaces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; - }) {}; + }) {inherit (pkgs) openblasCompat;}; "LDAP" = callPackage ({ mkDerivation, base, lber, openldap }: @@ -12496,7 +12576,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {inherit (pkgs) net_snmp;}; - "Network-NineP" = callPackage + "Network-NineP_0_4_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers, convertible , exceptions, monad-loops, monad-peel, mstate, mtl, network, NineP , regex-posix, stateref, transformers @@ -12515,6 +12595,27 @@ self: { jailbreak = true; description = "High-level abstraction over 9P protocol"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Network-NineP" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, convertible + , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl + , network, NineP, regex-posix, stateref, transformers + }: + mkDerivation { + pname = "Network-NineP"; + version = "0.4.1"; + sha256 = "9d7a456c672c1e7ef1075e27654b21ecacd8062917e1482c8060e404f3960f4a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers convertible exceptions hslogger + monad-loops monad-peel mstate mtl network NineP regex-posix + stateref transformers + ]; + description = "High-level abstraction over 9P protocol"; + license = "unknown"; }) {}; "NewBinary" = callPackage @@ -13295,22 +13396,19 @@ self: { }) {}; "OrderedBits" = callPackage - ({ mkDerivation, base, bits, primitive, QuickCheck, test-framework - , test-framework-quickcheck2, test-framework-th, vector - , vector-algorithms + ({ mkDerivation, base, bits, primitive, QuickCheck, tasty + , tasty-quickcheck, tasty-th, vector, vector-algorithms }: mkDerivation { pname = "OrderedBits"; - version = "0.0.1.0"; - sha256 = "59fa6692c6a3960b3de86b1adaf4b2e12d71b23e7734302737aa8cfc7cfdd5af"; + version = "0.0.1.1"; + sha256 = "084e073c7b310b36fdfb0ad6c5793ef1478890b8a136160ab555e65b54e81284"; libraryHaskellDepends = [ base bits primitive vector vector-algorithms ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - test-framework-th vector + base QuickCheck tasty tasty-quickcheck tasty-th vector ]; - jailbreak = true; homepage = "https://github.com/choener/OrderedBits"; description = "Efficient ordered (by popcount) enumeration of bits"; license = stdenv.lib.licenses.bsd3; @@ -13926,24 +14024,23 @@ self: { "PrimitiveArray" = callPackage ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector - , deepseq, hashable, OrderedBits, primitive, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th + , deepseq, DPutils, hashable, OrderedBits, primitive, QuickCheck + , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck, tasty-th , vector, vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "PrimitiveArray"; - version = "0.7.0.1"; - sha256 = "06a856c82a5858f7b91948b2816b3afe5fab14bde3be83676900cb70c2cc53a1"; + version = "0.7.1.0"; + sha256 = "d950e1f842ff65012484a7d0c03f1b3e990d3ff6bdd08eecdac4d478f9af23f6"; libraryHaskellDepends = [ - aeson base binary bits cereal cereal-vector deepseq hashable - OrderedBits primitive QuickCheck vector vector-binary-instances - vector-th-unbox + aeson base binary bits cereal cereal-vector deepseq DPutils + hashable OrderedBits primitive QuickCheck smallcheck vector + vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - test-framework-th + base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th ]; - jailbreak = true; homepage = "https://github.com/choener/PrimitiveArray"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -15074,6 +15171,19 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "SCalendar" = callPackage + ({ mkDerivation, base, containers, text, time }: + mkDerivation { + pname = "SCalendar"; + version = "0.1.0.0"; + sha256 = "896fbdaa6db59df65666f68d622841d4df46196b207eb1e37d5b592850767537"; + libraryHaskellDepends = [ base containers text time ]; + jailbreak = true; + homepage = "https://github.com/sebasHack/SCalendar"; + description = "Library for managing calendars and resource availability"; + license = stdenv.lib.licenses.mit; + }) {}; + "SConfig" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -15254,6 +15364,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "SGplus" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "SGplus"; + version = "1.1"; + sha256 = "639702205bd0f11aabd6fd8fe025bfb21e9af40d6af4d48c3c5b086ecf8299e3"; + libraryHaskellDepends = [ base mtl ]; + description = "(updated) Small geometry library for dealing with vectors and collision detection"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "SHA" = callPackage ({ mkDerivation, array, base, binary, bytestring, QuickCheck , test-framework, test-framework-quickcheck2 @@ -16202,6 +16323,8 @@ self: { pname = "Spock"; version = "0.11.0.0"; sha256 = "9dcc232e83860d28f44bd4f35a8b38e59330ada78a30c661aaddf244f4a5deb3"; + revision = "1"; + editedCabalFile = "22e12daad61dfaeefdbad563859bf8efe1ee38cf0be49cb18e954227d7e76eac"; libraryHaskellDepends = [ base base64-bytestring bytestring containers cryptonite focus hashable http-types hvect list-t monad-control mtl reroute @@ -18467,8 +18590,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "XMLParser"; - version = "0.1.0.0"; - sha256 = "906668c9ebaa2ff4cf8eb97b097e80fa26acea05a8762afa7a06d499d30fdbeb"; + version = "0.1.0.3"; + sha256 = "d62e8062e1a2d2f00d8e6d8a707fb798ae5b5cc2c48a513375d5634fef116fd4"; libraryHaskellDepends = [ base parsec ]; homepage = "xy30.com"; description = "A library to parse xml"; @@ -21656,6 +21779,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alex-tools" = callPackage + ({ mkDerivation, base, template-haskell, text }: + mkDerivation { + pname = "alex-tools"; + version = "0.1.0.0"; + sha256 = "0e15fed255f7eb609c6cd4834c1f95888cd1f0ee4793e17c1759b12f2c6a58e6"; + revision = "1"; + editedCabalFile = "d0ac2206fc41c34888c991591aeba577f4d20d0ce7847e63604477322dc02053"; + libraryHaskellDepends = [ base template-haskell text ]; + description = "A set of functions for a common use case of Alex"; + license = stdenv.lib.licenses.isc; + }) {}; + "alfred" = callPackage ({ mkDerivation, aeson, base, bytestring, hexpat, http-conduit , http-types, network-uri, text, xmlgen @@ -29946,26 +30082,24 @@ self: { }) {}; "bimaps" = callPackage - ({ mkDerivation, aeson, base, binary, cereal, containers, deepseq - , hashable, primitive, QuickCheck, storable-tuple, test-framework - , test-framework-quickcheck2, test-framework-th + ({ mkDerivation, aeson, base, binary, cereal, cereal-vector + , containers, deepseq, hashable, primitive, QuickCheck + , storable-tuple, tasty, tasty-quickcheck, tasty-th , unordered-containers, vector, vector-binary-instances , vector-th-unbox }: mkDerivation { pname = "bimaps"; - version = "0.0.0.4"; - sha256 = "0722d747a505ac7444c7ec87b956e58081fee65ddbf45ac7f5bd26f3f08cf275"; + version = "0.1.0.1"; + sha256 = "c143b5e2643d3c679b0e3083fe46a447eeab4fbac1f979c593c5c189f047ba04"; libraryHaskellDepends = [ - aeson base binary cereal containers deepseq hashable primitive - storable-tuple unordered-containers vector vector-binary-instances - vector-th-unbox + aeson base binary cereal cereal-vector containers deepseq hashable + primitive storable-tuple unordered-containers vector + vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - test-framework-th + base QuickCheck tasty tasty-quickcheck tasty-th ]; - jailbreak = true; homepage = "https://github.com/choener/bimaps"; description = "bijections with multiple implementations"; license = stdenv.lib.licenses.bsd3; @@ -38023,8 +38157,8 @@ self: { }: mkDerivation { pname = "cereal-plus"; - version = "0.4.1"; - sha256 = "696f8a279e6c38c70c1b821565398b850c602464fba909ab3ce7c30b4b14e492"; + version = "0.4.2"; + sha256 = "71ffb40ea0e400d27dc89bb7e3dfbd8b54fb26e07b71bdd7ecff2f0ef95a01c9"; libraryHaskellDepends = [ array base bytestring cereal containers errors hashable hashtables mmorph mtl stm text time unordered-containers vector @@ -38034,7 +38168,6 @@ self: { HTF HUnit mmorph mtl QuickCheck quickcheck-instances stm text time unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/cereal-plus"; description = "An extended serialization library on top of \"cereal\""; license = stdenv.lib.licenses.mit; @@ -38917,6 +39050,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chronos" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable + , HUnit, primitive, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "chronos"; + version = "0.1.0"; + sha256 = "ce21a30d63f79e8885ff45248b7578a8d02ce7ed562a7f3cebb302be64d092b3"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive text vector + ]; + testHaskellDepends = [ + attoparsec base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "https://github.com/andrewthad/chronos#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chu2" = callPackage ({ mkDerivation, base, bytestring, data-default, hack2 , hack2-handler-snap-server, utf8-string @@ -39110,20 +39264,6 @@ self: { }) {}; "cipher-aes128" = callPackage - ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: - mkDerivation { - pname = "cipher-aes128"; - version = "0.7.0.2"; - sha256 = "3f2359189bb5d7f12d795cf59953315b5498a8ec39bebd44be0263da8cb8a32f"; - libraryHaskellDepends = [ - base bytestring cereal crypto-api tagged - ]; - homepage = "https://github.com/TomMD/cipher-aes128"; - description = "AES and common modes using AES-NI when available"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cipher-aes128_0_7_0_3" = callPackage ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: mkDerivation { pname = "cipher-aes128"; @@ -39135,7 +39275,6 @@ self: { homepage = "https://github.com/TomMD/cipher-aes128"; description = "AES and common modes using AES-NI when available"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cipher-blowfish" = callPackage @@ -43331,6 +43470,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conffmt" = callPackage + ({ mkDerivation, base, language-conf, megaparsec + , optparse-applicative, pretty, text + }: + mkDerivation { + pname = "conffmt"; + version = "0.2.3.0"; + sha256 = "f4146a3ce79dec05c3dd551d3f58f55d28fc5722b02302d36178778fba83ebbb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base language-conf megaparsec optparse-applicative pretty text + ]; + homepage = "https://github.com/beijaflor-io/haskell-language-conf#readme"; + description = "A .conf file formatter"; + license = stdenv.lib.licenses.mit; + }) {}; + "config-manager" = callPackage ({ mkDerivation, base, directory, filepath, HUnit, parsec , temporary, test-framework, test-framework-hunit, text, time @@ -45137,6 +45294,27 @@ self: { license = "LGPL"; }) {}; + "cpphs_1_20_2" = callPackage + ({ mkDerivation, base, directory, old-locale, old-time, polyparse + }: + mkDerivation { + pname = "cpphs"; + version = "1.20.2"; + sha256 = "dcb1d712a0f867c8a4fdd6e4ce7cbd33ce7912c76ac2db3a6157933fad8629db"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory old-locale old-time polyparse + ]; + executableHaskellDepends = [ + base directory old-locale old-time polyparse + ]; + homepage = "http://projects.haskell.org/cpphs/"; + description = "A liberalised re-implementation of cpp, the C pre-processor"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cprng-aes" = callPackage ({ mkDerivation, base, byteable, bytestring, cipher-aes , crypto-random @@ -45211,6 +45389,19 @@ self: { license = "GPL"; }) {}; + "cpuinfo" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, deepseq }: + mkDerivation { + pname = "cpuinfo"; + version = "0.1.0.0"; + sha256 = "31dda274cd488fcdb295617aa2ed754ee697ad653edef5cf7fba56cb8e942623"; + libraryHaskellDepends = [ attoparsec base bytestring deepseq ]; + jailbreak = true; + homepage = "https://github.com/TravisWhitaker/cpuinfo"; + description = "Haskell Library for Checking CPU Information"; + license = stdenv.lib.licenses.mit; + }) {}; + "cpuperf" = callPackage ({ mkDerivation, base, mtl, process }: mkDerivation { @@ -45590,6 +45781,22 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "crawlchain" = callPackage + ({ mkDerivation, base, bytestring, directory, HTTP, network-uri + , split, tagsoup, time + }: + mkDerivation { + pname = "crawlchain"; + version = "0.1.0.9"; + sha256 = "12bd2f1f2f9dbe5abb67a77a85db087669917381f2ddcc2b28fb5d3aa1248238"; + libraryHaskellDepends = [ + base bytestring directory HTTP network-uri split tagsoup time + ]; + jailbreak = true; + description = "Simulation user crawl paths"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "craze" = callPackage ({ mkDerivation, async, base, bytestring, containers, curl , data-default-class, doctest, doctest-discover, haxy, hspec @@ -49906,8 +50113,8 @@ self: { }: mkDerivation { pname = "dbm"; - version = "0.2"; - sha256 = "e5b5c5d6da4623fd7544111b4c917a26db81d0c41d881f748097ec8085d5bbce"; + version = "0.3"; + sha256 = "f6963467efbe00300472b4d30bd7ab11db6b50c183e89d31fbac5080f922eb9c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -51261,7 +51468,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dependent-map" = callPackage + "dependent-map_0_2_2_0" = callPackage ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { pname = "dependent-map"; @@ -51271,6 +51478,19 @@ self: { homepage = "https://github.com/mokus0/dependent-map"; description = "Dependent finite maps (partial dependent products)"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dependent-map" = callPackage + ({ mkDerivation, base, containers, dependent-sum }: + mkDerivation { + pname = "dependent-map"; + version = "0.2.3.0"; + sha256 = "4a0b9c615dab33e9ef3b628ed88664e9d24e33fdb29b3aa5c66cb4b3fc1b2a20"; + libraryHaskellDepends = [ base containers dependent-sum ]; + homepage = "https://github.com/mokus0/dependent-map"; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; }) {}; "dependent-state" = callPackage @@ -51299,6 +51519,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "dependent-sum_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dependent-sum"; + version = "0.4"; + sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mokus0/dependent-sum"; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dependent-sum-template" = callPackage ({ mkDerivation, base, dependent-sum, template-haskell, th-extras }: @@ -52015,7 +52248,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-contrib" = callPackage + "diagrams-contrib_1_3_0_11" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , data-default, data-default-class, diagrams-core, diagrams-lib , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom @@ -52043,6 +52276,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "diagrams-contrib" = callPackage + ({ mkDerivation, base, circle-packing, colour, containers + , data-default, data-default-class, diagrams-core, diagrams-lib + , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom + , mtl, parsec, QuickCheck, random, semigroups, split + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text + }: + mkDerivation { + pname = "diagrams-contrib"; + version = "1.3.0.12"; + sha256 = "a576a63fc9f216558415303ace621e42778d5db08286b838dd850e9640279620"; + libraryHaskellDepends = [ + base circle-packing colour containers data-default + data-default-class diagrams-core diagrams-lib diagrams-solve + force-layout lens linear MonadRandom mtl parsec random semigroups + split text + ]; + testHaskellDepends = [ + base containers diagrams-lib HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Collection of user contributions to diagrams EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-core" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, semigroups @@ -54414,6 +54675,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_2" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.2"; + sha256 = "77397ecfb9a7cbfac15226cbe09ec156a3deb6e21c7af948bc8ab459e88641b1"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -56719,20 +56995,20 @@ self: { }) {}; "edge" = callPackage - ({ mkDerivation, ALUT, base, cmdtheline, containers, gloss, random - , wraparound + ({ mkDerivation, ALUT, base, cmdtheline, containers, gloss, OpenAL + , random, wraparound }: mkDerivation { pname = "edge"; - version = "0.9.0.2"; - sha256 = "7bfeedfc9db97e0d61c8650f9a542ddf3602f15ee6251141797fa035f82da965"; + version = "0.9.1.0"; + sha256 = "3fee75be8cba2e4d5f877b48ef2ea2df80e59522fd189ab550d821a1678ba8c9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ALUT base cmdtheline containers gloss random wraparound + ALUT base cmdtheline containers gloss OpenAL random wraparound ]; jailbreak = true; - homepage = "http://frigidcode.com/code/edge"; + homepage = "https://qlfiles.net"; description = "Top view space combat arcade game"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -62920,8 +63196,8 @@ self: { }: mkDerivation { pname = "fixfile"; - version = "0.3.0.0"; - sha256 = "9ece220e3f833b9ec3002492efc881051e54ecd06fe9b86e9178af48bdcee24f"; + version = "0.5.0.0"; + sha256 = "ebac16bee38bc0fd05790429d40b1c4a0089b82a53da45d2e74d226c4bdf8d65"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath hashable hashtables lens mtl temporary vector @@ -65587,6 +65863,7 @@ self: { settings tagsoup text time time-interval time-units transformers unordered-containers utf8-string vcs-web-hook-parse ]; + jailbreak = true; homepage = "https://notabug.org/fr33domlover/funbot"; description = "IRC bot for fun, learning, creativity and collaboration"; license = stdenv.lib.licenses.publicDomain; @@ -69463,8 +69740,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.6"; - sha256 = "5976ada26222409159f618af13ac5b8adf40746ee97005ae03459fa79b22c904"; + version = "2.91.7"; + sha256 = "72d63ab29583c73c9978515ff840061f138da27799ffe9e2f7c981380317ce86"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject @@ -71032,27 +71309,27 @@ self: { "glirc" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, Cabal , config-value, connection, containers, data-default-class, deepseq - , directory, filepath, gitrev, hashable, irc-core, lens, network - , process, regex-tdfa, regex-tdfa-text, split, stm, text, time, tls - , transformers, unix, unordered-containers, vector, vty, x509 - , x509-store, x509-system + , directory, filepath, gitrev, hashable, HUnit, irc-core, lens + , network, process, regex-tdfa, regex-tdfa-text, socks, split, stm + , text, time, tls, transformers, unix, unordered-containers, vector + , vty, x509, x509-store, x509-system }: mkDerivation { pname = "glirc"; - version = "2.11"; - sha256 = "24c00b3ebf4c9eb9d355255b0217d0984519c2d67e29c8aa98d923ee53123e4a"; - revision = "1"; - editedCabalFile = "efcc2845625158d6483b35c66e06f3a8656287b3022888ba319d73500ec1bcc7"; - isLibrary = false; + version = "2.14"; + sha256 = "20661fdd945ef0960dd24dc3b16cf73aa9498772709f9fcaa78c8213fd7347be"; + isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; - executableHaskellDepends = [ + libraryHaskellDepends = [ async attoparsec base bytestring config-value connection containers data-default-class deepseq directory filepath gitrev hashable - irc-core lens network process regex-tdfa regex-tdfa-text split stm - text time tls transformers unix unordered-containers vector vty - x509 x509-store x509-system + irc-core lens network process regex-tdfa regex-tdfa-text socks + split stm text time tls transformers unix unordered-containers + vector vty x509 x509-store x509-system ]; + executableHaskellDepends = [ base lens text ]; + testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/glguy/irc-core"; description = "Console IRC client"; license = stdenv.lib.licenses.isc; @@ -71295,8 +71572,8 @@ self: { }: mkDerivation { pname = "gloss-juicy"; - version = "0.2"; - sha256 = "18cf706cf7bfaac1f37d4d031d00faccddb0fba711a1f6de4f0f6336262ba2f8"; + version = "0.2.2"; + sha256 = "fbbe471b65dbeb2e40f04f39c6498fde07d84d2122169c01528bb826a3423ef0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73242,6 +73519,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "google-oauth2-jwt" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL + , RSA, text, unix-time + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.1.1.1"; + sha256 = "dfd2bbee86c1965e8fb06a9933f090464c2432a2e5e0daaefa5093fd37084d12"; + libraryHaskellDepends = [ + base base64-bytestring bytestring HsOpenSSL RSA text unix-time + ]; + homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; + description = "Get a signed JWT for Google Service Accounts"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "google-search" = callPackage ({ mkDerivation, base, free, nats, text, time }: mkDerivation { @@ -77809,6 +78102,21 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "hakyll-shakespeare" = callPackage + ({ mkDerivation, base, blaze-html, containers, hakyll, shakespeare + , text + }: + mkDerivation { + pname = "hakyll-shakespeare"; + version = "0.1.0.0.2"; + sha256 = "ebaa9c1cf33b3c59e91f7000ae4fc320f8b7d6c47c3a0088da9604c91dc9d0ad"; + libraryHaskellDepends = [ + base blaze-html containers hakyll shakespeare text + ]; + description = "Hakyll Hamlet compiler"; + license = stdenv.lib.licenses.mit; + }) {}; + "halberd" = callPackage ({ mkDerivation, base, Cabal, containers, haskell-names , haskell-packages, haskell-src-exts, HUnit, mtl, safe, split, syb @@ -79235,7 +79543,7 @@ self: { description = "Low level bindings for Groonga"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = [ "x86_64-darwin" ]; - }) {groonga = null;}; + }) {inherit (pkgs) groonga;}; "haroonga-httpd" = callPackage ({ mkDerivation, base, directory, haroonga, http-types, old-locale @@ -80328,8 +80636,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.18.1"; - sha256 = "ab6c31a6dca1bd0f7cbf4e51225dd18ef25185f70c2f33fd207968b44157b028"; + version = "0.18.2"; + sha256 = "245b17ab5769fc413f7d10b24ca57efb97962dc7debd6188d3a879454077daa1"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; @@ -82222,6 +82530,7 @@ self: { base data-accessor event-list haskore non-negative numeric-prelude random synthesizer-core synthesizer-filter utility-ht ]; + jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Music rendering coded in Haskell"; license = "GPL"; @@ -83800,6 +84109,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hdevtools_0_1_4_1" = callPackage + ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc + , ghc-boot, ghc-paths, network, process, syb, time, transformers + , unix + }: + mkDerivation { + pname = "hdevtools"; + version = "0.1.4.1"; + sha256 = "3e95943fbd6986800e00c1e49ef97deb83b56a37cc8ffafc00f6192510f8596a"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths + network process syb time transformers unix + ]; + homepage = "https://github.com/hdevtools/hdevtools/"; + description = "Persistent GHC powered background server for FAST haskell development tools"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hdf" = callPackage ({ mkDerivation, base, directory, fgl, fgl-visualize, filepath , hosc, hsc3, murmur-hash, process, split, transformers @@ -86376,7 +86706,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hindent_5_2_0" = callPackage + "hindent_5_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, descriptive , Diff, directory, exceptions, ghc-prim, haskell-src-exts, hspec , monad-loops, mtl, path, path-io, text, transformers, unix-compat @@ -86384,8 +86714,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "5.2.0"; - sha256 = "c2215a684be4287b1218d042c80b7ccb220424069f2d1026b2f6f369b0d07caa"; + version = "5.2.1"; + sha256 = "0c3118ccf087bea9dfaa9cbcb76bd6ed35919acd2fa511c741e97277b6b01c53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88224,8 +88554,8 @@ self: { ({ mkDerivation, base, integer-gmp, mpfr }: mkDerivation { pname = "hmpfr"; - version = "0.4.1"; - sha256 = "76019426328c9c9d8538a893bb865d510434fb94bd77f0ca47a17d0962d15b98"; + version = "0.4.2"; + sha256 = "7b01d747db796fc0ae908872bf9105b773ea8b1d2a5957ea353e22e003b03961"; libraryHaskellDepends = [ base integer-gmp ]; librarySystemDepends = [ mpfr ]; homepage = "https://github.com/michalkonecny/hmpfr"; @@ -93104,8 +93434,8 @@ self: { }: mkDerivation { pname = "hspec-golden-aeson"; - version = "0.2.0.0"; - sha256 = "4654859bfb77434daf4a4b695ec433894a39ae9d85c51d077ff0f5f74c007efd"; + version = "0.2.0.1"; + sha256 = "d8be498a627e2f590da5bfdc59b7f8759b1c672e75e844d5fc08429938ac3f9e"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec QuickCheck quickcheck-arbitrary-adt random transformers @@ -94795,7 +95125,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client" = callPackage + "http-client_0_4_31" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, exceptions, filepath @@ -94823,9 +95153,40 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client_0_5_2" = callPackage + "http-client" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, exceptions, filepath + , ghc-prim, hspec, http-types, mime-types, monad-control, network + , network-uri, random, streaming-commons, text, time, transformers + , zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.4.31.1"; + sha256 = "7032cd356bc5ddd5786b315271174ed510e1a190c4210bd65abe16201b86ce0c"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + exceptions filepath ghc-prim http-types mime-types network + network-uri random streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base base64-bytestring blaze-builder bytestring + case-insensitive containers deepseq directory hspec http-types + monad-control network network-uri streaming-commons text time + transformers zlib + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + license = stdenv.lib.licenses.mit; + }) {}; + + "http-client_0_5_3_1" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -94834,8 +95195,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.2"; - sha256 = "a1697c94f8f777b402f0b274eb58a638facdda16572a3cd5822185e61165288a"; + version = "0.5.3.1"; + sha256 = "0d012a1278b2f2014f0198e38b658fb414e5dafd37388008198ac7a553f84d96"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -95383,8 +95744,8 @@ self: { }: mkDerivation { pname = "http-proxy"; - version = "0.1.0.3"; - sha256 = "d9c7363f375eff74e1eea86c07797f13592d929358cfcb38e725587f842284e6"; + version = "0.1.0.4"; + sha256 = "e5e582a106ead5c3a4a96fa96f95891f67714483e83154a6a3228bba41e756f4"; libraryHaskellDepends = [ async base blaze-builder bytestring bytestring-lexing case-insensitive conduit conduit-extra http-client http-conduit @@ -95875,8 +96236,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "huckleberry"; - version = "0.10.0.0"; - sha256 = "0650de774e6d595ee7888898e655ce78dbbb613ef9bcc16e16fa04bf5aa9a22b"; + version = "0.10.0.2"; + sha256 = "a2c93662cb65817e5415271f7fb0b7cc8fa27d0374d0a90d4c7ec1762dc75e2a"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mitsuji/huckleberry#readme"; description = "Haskell IOT on Intel Edison and other Linux computers"; @@ -99318,8 +99679,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "incremental-sat-solver"; - version = "0.1.7"; - sha256 = "5b30d2e18cb17e22bc3aa9987908e3a044acdd7d367f8d44f328529a021e2cce"; + version = "0.1.8"; + sha256 = "1afd2bc324e3220ed7d2ef539793b608c2d83adb9602c81a97912b44f694e5a8"; libraryHaskellDepends = [ base containers mtl ]; homepage = "http://github.com/sebfisch/incremental-sat-solver"; description = "Simple, Incremental SAT Solving as a Library"; @@ -99846,8 +100207,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.5.6"; - sha256 = "31bd1599b8d278c5be87ef4672d161e75ae057cf553f85396755874f6e412408"; + version = "0.5.5.7"; + sha256 = "b7a0561c37eed9441548baa8bf815bc3fb121504ff5ae4c8f2297ba80c7c54b9"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring containers cryptohash directory filepath hashable mtl parsec parsers QuickCheck @@ -101416,8 +101777,8 @@ self: { ({ mkDerivation, base, irc-fun-types, regex-applicative, text }: mkDerivation { pname = "irc-fun-messages"; - version = "0.3.0.0"; - sha256 = "bfabe5cd9eff9d2e41c7adf0b7729fee4713a133a1f9da6b2b410753c0ecd04f"; + version = "0.4"; + sha256 = "f983bf1cea8f06ac87782d2cc00a38dbc45feb0a3055028170b76a7263422153"; libraryHaskellDepends = [ base irc-fun-types regex-applicative text ]; @@ -101427,12 +101788,12 @@ self: { }) {}; "irc-fun-types" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, hashable, text }: mkDerivation { pname = "irc-fun-types"; - version = "0.1.0.0"; - sha256 = "818255949173d1c4fb982f8bef99d9261b1b7ee77ad3183872d4a0fcbfe5341f"; - libraryHaskellDepends = [ base text ]; + version = "0.2"; + sha256 = "37d2d2d933112e877cd4e8f2b4f8661f715b55206687eb91a4d7e6afaed30997"; + libraryHaskellDepends = [ base hashable text ]; homepage = "http://hub.darcs.net/fr33domlover/irc-fun-types"; description = "Common types for IRC related packages"; license = stdenv.lib.licenses.publicDomain; @@ -102324,18 +102685,16 @@ self: { "jack" = callPackage ({ mkDerivation, array, base, bytestring, enumset, event-list , explicit-exception, libjack2, midi, non-negative, transformers - , unix }: mkDerivation { pname = "jack"; - version = "0.7.0.3"; - sha256 = "33d3c0fa183e590b2bc9323edb4f0d22d202e9ed4ff3892bffe5d6ff583f5789"; + version = "0.7.1"; + sha256 = "9a92d0482acb2647e46955d6ad73ba7cd4a148cd9f6c5263a405296b87a5afd9"; libraryHaskellDepends = [ array base bytestring enumset event-list explicit-exception midi - non-negative transformers unix + non-negative transformers ]; libraryPkgconfigDepends = [ libjack2 ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; @@ -105094,22 +105453,24 @@ self: { }) {}; "keysafe" = callPackage - ({ mkDerivation, argon2, base, binary, bytestring, containers - , deepseq, dice-entropy-conduit, directory, filepath, finite-field - , optparse-applicative, polynomial, process, raaz, random, readline - , split, text, time, unix, utf8-string, vector, zxcvbn-c + ({ mkDerivation, aeson, argon2, base, binary, bytestring + , containers, deepseq, directory, filepath, http-client, network + , optparse-applicative, process, raaz, random, readline + , secret-sharing, servant, servant-client, servant-server, socks + , split, stm, text, time, transformers, unix, utf8-string, wai + , warp, zxcvbn-c }: mkDerivation { pname = "keysafe"; - version = "0.20160819"; - sha256 = "cd6909e3cbbcd8e144ebc8fb75b2fa4068ad6d4330d4ba6d5cf7e81529020704"; + version = "0.20160831"; + sha256 = "bee8f0cd5ff26505b5856185a02baa9b1ca8245b09d59ef7dcb9d0c5b42f8bd9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base binary bytestring containers deepseq dice-entropy-conduit - directory filepath finite-field optparse-applicative polynomial - process raaz random readline split text time unix utf8-string - vector zxcvbn-c + aeson base binary bytestring containers deepseq directory filepath + http-client network optparse-applicative process raaz random + readline secret-sharing servant servant-client servant-server socks + split stm text time transformers unix utf8-string wai warp zxcvbn-c ]; executableSystemDepends = [ argon2 ]; jailbreak = true; @@ -105391,6 +105752,7 @@ self: { libraryHaskellDepends = [ base llvm-extra llvm-tf storable-record storable-tuple utility-ht ]; + jailbreak = true; homepage = "http://hub.darcs.net/thielema/knead/"; description = "Repa array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; @@ -105406,6 +105768,7 @@ self: { libraryHaskellDepends = [ base knead llvm-extra llvm-tf utility-ht ]; + jailbreak = true; homepage = "http://hub.darcs.net/thielema/knead-arithmetic/"; description = "Linear algebra and interpolation using LLVM JIT"; license = stdenv.lib.licenses.bsd3; @@ -106680,7 +107043,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "language-c-quote" = callPackage + "language-c-quote_0_11_6_2" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb @@ -106703,9 +107066,10 @@ self: { homepage = "http://www.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c-quote_0_11_6_3" = callPackage + "language-c-quote" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb @@ -106728,7 +107092,6 @@ self: { homepage = "http://www.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-cil" = callPackage @@ -107279,7 +107642,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-puppet_1_3" = callPackage + "language-puppet_1_3_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting @@ -107293,8 +107656,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3"; - sha256 = "59a06ac062a1825425fabaaf7ec2e5305e4fb2627db4d91cfa2cc996d37728d6"; + version = "1.3.1"; + sha256 = "8aa7558b51825ba3e4b00c92a74f2d98b55430f2d7333501572f491554862ad2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107488,18 +107851,21 @@ self: { }) {}; "language-thrift" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover - , megaparsec, QuickCheck, scientific, text, transformers + ({ mkDerivation, ansi-wl-pprint, base, containers, hspec + , hspec-discover, megaparsec, QuickCheck, scientific, semigroups + , text, transformers }: mkDerivation { pname = "language-thrift"; - version = "0.9.0.1"; - sha256 = "ef8f79e5f2e23b1e160547d9552eae76a0faf0807724ab663832782e33b5bc35"; + version = "0.9.0.2"; + sha256 = "a5c204193572f1272a9e1593f553df6d6471ea01a6432475fff0115b458bd740"; libraryHaskellDepends = [ - ansi-wl-pprint base megaparsec scientific text transformers + ansi-wl-pprint base containers megaparsec scientific semigroups + text transformers ]; testHaskellDepends = [ - ansi-wl-pprint base hspec hspec-discover megaparsec QuickCheck text + ansi-wl-pprint base containers hspec hspec-discover megaparsec + QuickCheck scientific semigroups text transformers ]; homepage = "https://github.com/abhinav/language-thrift#readme"; description = "Parser and pretty printer for the Thrift IDL format"; @@ -107912,12 +108278,12 @@ self: { }) {}; "lbfgs" = callPackage - ({ mkDerivation, array, base }: + ({ mkDerivation, array, base, vector }: mkDerivation { pname = "lbfgs"; - version = "0.0.5"; - sha256 = "0628f41210ccf045e42d37f86535ec9be95b94b39bb5a1caba5ecf510086c948"; - libraryHaskellDepends = [ array base ]; + version = "0.1"; + sha256 = "5d022edd4c7098d0651043cf032f7f611712ec9c10bafe520d51e06b83675338"; + libraryHaskellDepends = [ array base vector ]; description = "L-BFGS optimization"; license = "unknown"; }) {}; @@ -108188,22 +108554,23 @@ self: { }) {}; "legion" = callPackage - ({ mkDerivation, attoparsec, base, binary, binary-conduit - , bytestring, canteven-http, conduit, conduit-extra, containers - , data-default-class, data-dword, directory, exceptions, http-types - , monad-logger, network, Ranged-sets, scotty, scotty-resource, stm - , text, time, transformers, unix, uuid, wai, wai-extra, warp + ({ mkDerivation, aeson, attoparsec, base, binary, binary-conduit + , bytestring, canteven-http, canteven-log, conduit, conduit-extra + , containers, data-default-class, data-dword, directory, exceptions + , http-types, monad-logger, network, Ranged-sets, scotty + , scotty-resource, stm, text, time, transformers, unix, uuid, wai + , wai-extra, warp }: mkDerivation { pname = "legion"; - version = "0.1.0.1"; - sha256 = "f6f04163894726e3d636a4bf23bd427b736ce3341e5e97586c5d20aa34bae081"; + version = "0.2.0.0"; + sha256 = "408e72c7013067a3763ffc7e5db06244ae61db71e89e8b3fbaba1b6e87d39ea0"; libraryHaskellDepends = [ - attoparsec base binary binary-conduit bytestring canteven-http - conduit conduit-extra containers data-default-class data-dword - directory exceptions http-types monad-logger network Ranged-sets - scotty scotty-resource stm text time transformers unix uuid wai - wai-extra warp + aeson attoparsec base binary binary-conduit bytestring + canteven-http canteven-log conduit conduit-extra containers + data-default-class data-dword directory exceptions http-types + monad-logger network Ranged-sets scotty scotty-resource stm text + time transformers unix uuid wai wai-extra warp ]; jailbreak = true; homepage = "https://github.com/taphu/legion"; @@ -108329,6 +108696,8 @@ self: { pname = "lens"; version = "4.13"; sha256 = "3556e7bf69d13fca0e73c5e429c8d25a876931c24ae5aa1f4755acac67078f3c"; + revision = "1"; + editedCabalFile = "4e3ac486c3ffd2166eb8affe3b28e7cd86437031c7e3c72018377871b6c02a1f"; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -108365,6 +108734,8 @@ self: { pname = "lens"; version = "4.14"; sha256 = "70a3cd18ef352950b88d6cac449988b9320704b56dceda80e7de9f2907ee5f4b"; + revision = "1"; + editedCabalFile = "ec2f258fa783b324c6c9177b16b5432e757928b5efec042295c88306148059c4"; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -108652,7 +109023,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "lentil" = callPackage + "lentil_0_1_12_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip , filepath, hspec, natural-sort, optparse-applicative, parsec , regex-tdfa @@ -108675,6 +109046,34 @@ self: { homepage = "http://www.ariis.it/static/articles/lentil/page.html"; description = "frugal issue tracker"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lentil" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip + , filepath, hspec, natural-sort, optparse-applicative, parsec + , pipes, regex-tdfa, terminal-progress-bar, text + }: + mkDerivation { + pname = "lentil"; + version = "1.0.2.0"; + sha256 = "2f1bfc869ce02e052ca02a3d4c9b584cb253c73a7ba1da0ca14238a14c52cdbe"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath natural-sort + optparse-applicative parsec pipes regex-tdfa terminal-progress-bar + text + ]; + testHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath hspec + natural-sort optparse-applicative parsec pipes regex-tdfa + terminal-progress-bar text + ]; + jailbreak = true; + homepage = "http://www.ariis.it/static/articles/lentil/page.html"; + description = "frugal issue tracker"; + license = stdenv.lib.licenses.gpl3; }) {}; "lenz" = callPackage @@ -111252,13 +111651,13 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.6.0.1"; - sha256 = "7e3abaf6f8f75bcfb1c595e200218dfe0bb46635bc166c7884c03577b01ede4f"; + version = "0.7"; + sha256 = "5f2e1fb4a4b8960ff7e10db014de90706e5d10504f88f89dbd8869f9d5921f20"; libraryHaskellDepends = [ base containers cpuid llvm-tf non-empty tfp transformers unsafe utility-ht ]; - homepage = "http://code.haskell.org/~thielema/llvm-extra/"; + homepage = "https://wiki.haskell.org/LLVM"; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -111268,8 +111667,8 @@ self: { ({ mkDerivation, base, enumset, llvm }: mkDerivation { pname = "llvm-ffi"; - version = "3.7.0"; - sha256 = "1d9f2ef4df9d031422b0ad887bcb3bbea041f61e8b105a583e6496168cea83f7"; + version = "3.8.1"; + sha256 = "d636af82033d1fbfa5c05ed66f823afe9081db387f85eae862f97ca6db4e24c9"; libraryHaskellDepends = [ base enumset ]; libraryPkgconfigDepends = [ llvm ]; homepage = "http://haskell.org/haskellwiki/LLVM"; @@ -111446,18 +111845,16 @@ self: { "llvm-tf" = callPackage ({ mkDerivation, base, containers, enumset, fixed-length, llvm-ffi - , non-empty, process, storable-record, tfp, transformers - , utility-ht + , non-empty, storable-record, tfp, transformers, utility-ht }: mkDerivation { pname = "llvm-tf"; - version = "3.0.3.3"; - sha256 = "865822db0079228ac904fd5bf7074ad2433f353c3c87eb0fff3b38f42b812e30"; + version = "3.1"; + sha256 = "e5f7cf1a9bd2c4726718ee7606664f4d16a863c339012cae9da29c1cd54b687c"; libraryHaskellDepends = [ - base containers enumset fixed-length llvm-ffi non-empty process + base containers enumset fixed-length llvm-ffi non-empty storable-record tfp transformers utility-ht ]; - jailbreak = true; description = "Bindings to the LLVM compiler toolkit using type families"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -112817,7 +113214,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lucid" = callPackage + "lucid_2_9_5" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text , transformers, unordered-containers @@ -112836,6 +113233,28 @@ self: { homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lucid" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "lucid"; + version = "2.9.6"; + sha256 = "a8435c73bacc3dc60efd89c21b29c9fbca9a10676ec158d4e810ab751849a8c9"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers hashable mmorph mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + homepage = "https://github.com/chrisdone/lucid"; + description = "Clear to write, read and edit DSL for HTML"; + license = stdenv.lib.licenses.bsd3; }) {}; "lucid-foundation" = callPackage @@ -115821,7 +116240,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "memoize" = callPackage + "memoize_0_7" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "memoize"; @@ -115836,6 +116255,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "memoize" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "memoize"; + version = "0.8.1"; + sha256 = "74d86862257a6f85c5ef9a2938d8bd11f75d89727456541c4ea805a9daa462cd"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "A memoization library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memory" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty , tasty-hunit, tasty-quickcheck @@ -117233,8 +117665,8 @@ self: { }: mkDerivation { pname = "mios"; - version = "1.2.1"; - sha256 = "a64ee6a6ccaa12204eec897cc2bef9122ffe92ec924920d6814f95f5a31e6280"; + version = "1.3.0"; + sha256 = "975fa3ce06cdbd03956dbd238f344f71cd4021b8e4eacd615cf1898013eb157e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122745,14 +123177,13 @@ self: { }: mkDerivation { pname = "netpbm"; - version = "1.0.1"; - sha256 = "cc8d790d0255b2554c62c5df3185c7ff9c6fccc2c55630efcc54c7fa4e3df209"; + version = "1.0.2"; + sha256 = "846a04bca94be31c779888febc390c64cfba93e40f3a7a2f80ff6a6e44fcc2d7"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring storable-record unordered-containers vector vector-th-unbox ]; testHaskellDepends = [ base bytestring hspec HUnit vector ]; - doCheck = false; homepage = "https://github.com/nh2/haskell-netpbm"; description = "Loading PBM, PGM, PPM image files"; license = stdenv.lib.licenses.mit; @@ -124466,13 +124897,16 @@ self: { }) {}; "non-empty" = callPackage - ({ mkDerivation, base, containers, QuickCheck, utility-ht }: + ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht + }: mkDerivation { pname = "non-empty"; - version = "0.2.1"; - sha256 = "e3956b73026647bab019b52b50c94f196df7f64607bbf28a6ae730da09b912dc"; - libraryHaskellDepends = [ base containers QuickCheck utility-ht ]; - homepage = "http://code.haskell.org/~thielema/non-empty/"; + version = "0.3"; + sha256 = "77906c1d4c94738e8b34d9aa28c6a3981edb82df7ee82f2f43aeb57b20bd5be0"; + libraryHaskellDepends = [ + base containers deepseq QuickCheck utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/non-empty/"; description = "List-like structures with static restrictions on the number of elements"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -125539,32 +125973,6 @@ self: { }) {}; "octane" = callPackage - ({ mkDerivation, aeson, base, bimap, binary, binary-bits - , bytestring, containers, data-binary-ieee754, data-default-class - , deepseq, doctest, file-embed, http-client, http-client-tls - , overloaded-records, regex-compat, tasty, tasty-hspec, text - , unordered-containers, vector - }: - mkDerivation { - pname = "octane"; - version = "0.14.0"; - sha256 = "4e51bd02cfe07791d0fc413c26ace571b945ba8d49c14f4ad4355ca791162d3c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bimap binary binary-bits bytestring containers - data-binary-ieee754 data-default-class deepseq file-embed - http-client http-client-tls overloaded-records regex-compat text - unordered-containers vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest tasty tasty-hspec ]; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; - }) {}; - - "octane_0_15_0" = callPackage ({ mkDerivation, aeson, base, bimap, binary, binary-bits , bytestring, containers, data-binary-ieee754, data-default-class , deepseq, file-embed, http-client, http-client-tls @@ -125589,7 +125997,6 @@ self: { homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octohat" = callPackage @@ -126205,8 +126612,8 @@ self: { pname = "opaleye"; version = "0.5.0.0"; sha256 = "8fa68edc8e322f624c704526acbf2c813903bf73beab829849f515a7854415b5"; - revision = "1"; - editedCabalFile = "fc7041c037995e21cb26ff9014fba405e3185ade6f33011dbdac3aad55717b82"; + revision = "2"; + editedCabalFile = "43d127c37fe4ff98db79dfb9c44cbc111aa77e6cbe9f449ef652e7a449b39b03"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -128623,6 +129030,129 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome) pango;}; + "papa" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, papa-lens + , papa-prelude, QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa"; + version = "0.0.1"; + sha256 = "066d3e396e227d3775ab4d636e8c71c67ad2b883053ae593a1f4f7eb128491b3"; + libraryHaskellDepends = [ base papa-lens papa-prelude ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa"; + description = "Reasonable default import"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-lens" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-lens"; + version = "0.0.1"; + sha256 = "b28ec4395f517a599b8632ec6430ef9e566fd5a591041816e3bbbf01bd98a10b"; + libraryHaskellDepends = [ base lens ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-lens"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-prelude" = callPackage + ({ mkDerivation, base, directory, doctest, filepath + , papa-prelude-core, papa-prelude-lens, papa-prelude-semigroupoids + , papa-prelude-semigroups, QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-prelude"; + version = "0.0.1"; + sha256 = "6336946e1164a30f1bb0b21e5b7f316a06488b2b329db7ef9ebb892168b2fc99"; + libraryHaskellDepends = [ + base papa-prelude-core papa-prelude-lens papa-prelude-semigroupoids + papa-prelude-semigroups + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-prelude"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-prelude-core" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-prelude-core"; + version = "0.0.1"; + sha256 = "8b5275a64486a30dc3537b4ad2ed77c602fda1330955d772735b1a889bddad2d"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-prelude-core"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-prelude-lens" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-prelude-lens"; + version = "0.0.1"; + sha256 = "21e8f6ce70fd497b28ba869e7dfef62c5f1813e5d2019d373f2b68ed8e537787"; + libraryHaskellDepends = [ base lens ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-prelude-lens"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-prelude-semigroupoids" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , semigroupoids, template-haskell + }: + mkDerivation { + pname = "papa-prelude-semigroupoids"; + version = "0.0.1"; + sha256 = "0ae3341b29e52eca6bdd2711c72f430222d746ec910243f1687d7df941654848"; + libraryHaskellDepends = [ base semigroupoids ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-prelude-semigroupoids"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-prelude-semigroups" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , semigroups, template-haskell + }: + mkDerivation { + pname = "papa-prelude-semigroups"; + version = "0.0.1"; + sha256 = "dad66f4ae7ac0dae82d5f5d5e13f28d48f2448e85a78dd8c32468e19e9fa20c1"; + libraryHaskellDepends = [ base semigroups ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-prelude-semigroups"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "papillon" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, monads-tf , template-haskell, transformers @@ -128661,6 +129191,29 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "paprika" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , distributed-process, file-embed, http-types, huckleberry, mtl + , network-transport-inmemory, text, wai, wai-app-static + , wai-websockets, warp, websockets, word8 + }: + mkDerivation { + pname = "paprika"; + version = "0.1.0.2"; + sha256 = "2caa082ff041669bd6cd9c3b53b5caf73aab9b330730c20e3bee7ea49be98856"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base huckleberry ]; + executableHaskellDepends = [ + aeson base binary bytestring containers distributed-process + file-embed http-types mtl network-transport-inmemory text wai + wai-app-static wai-websockets warp websockets word8 + ]; + homepage = "https://github.com/mitsuji/paprika#readme"; + description = "The Haskell library and examples for the kids programming robot paprika"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "para" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -129647,17 +130200,13 @@ self: { }: mkDerivation { pname = "pathtype"; - version = "0.7.0.1"; - sha256 = "f63692c829eed50588feb68a4ba1a711354f680553c9788c9c4795f821ff47b4"; - isLibrary = true; - isExecutable = true; + version = "0.8"; + sha256 = "14e3b9d03c222a061ffeb40ecc0940d980e25fddd70339d04ec86dbae6f27897"; libraryHaskellDepends = [ base deepseq directory old-time QuickCheck tagged time transformers utility-ht ]; - executableHaskellDepends = [ base utility-ht ]; testHaskellDepends = [ base random ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/pathtype/"; description = "Type-safe replacement for System.FilePath etc"; license = stdenv.lib.licenses.bsd3; @@ -130637,6 +131186,8 @@ self: { pname = "persistent"; version = "2.6"; sha256 = "42423362de94599581d18be644ba77181e87417087b3953daec2e8512d408e3e"; + revision = "1"; + editedCabalFile = "9a319037770f0dbdb394343aa5efca241680c2854a8d53e74b61debf4b6ded9d"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger http-api-data @@ -131103,6 +131654,8 @@ self: { pname = "persistent-template"; version = "2.5.1.6"; sha256 = "f88a8735173ba197f8d698a9c1fd5c649234fd60efe493f401432926a55e7b44"; + revision = "1"; + editedCabalFile = "85aabe4c402cc78cc71100fd9dc51b84c9e3cd6370c73983ee31a93dc73482ce"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -133772,8 +134325,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.1"; - sha256 = "b7c12470eab0a9390f2de69f8860296cb7260ce57a40cb868aec717720479e7a"; + version = "1.1.1.2"; + sha256 = "5d398b4769b47918df05ef5693c182fb5d070f75414e65e7110b98f1328ba92b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133786,7 +134339,6 @@ self: { array base containers haskell-src-exts HUnit QuickCheck transformers ]; - jailbreak = true; description = "Tool for refactoring expressions into pointfree form"; license = "unknown"; }) {}; @@ -135001,8 +135553,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-migration"; - version = "0.1.6.0"; - sha256 = "f67d4d14970ca4310939238cd1b483a6cd427766384e1b6b4fdf69abd9117e15"; + version = "0.1.7.0"; + sha256 = "10347cc4c34cf0d98b08234ee0c1e05f9064be08769326147eccb1bd135bce93"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135710,6 +136262,28 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "preprocessor" = callPackage + ({ mkDerivation, base, Cabal, directory, extra, filemanip, filepath + , ghc, ghc-paths, haskell-src-exts, hspec, microlens, process + , template-haskell, temporary + }: + mkDerivation { + pname = "preprocessor"; + version = "0.1.0.0"; + sha256 = "f2ed19462f837514f5bca79019f20e50c251d1e876647aac9a37ffde350186ce"; + libraryHaskellDepends = [ + base Cabal directory extra filemanip filepath ghc ghc-paths + microlens process template-haskell + ]; + testHaskellDepends = [ + base directory haskell-src-exts hspec process temporary + ]; + jailbreak = true; + homepage = "http://github.com/meditans/preprocessor#readme"; + description = "Remove cpp annotations to get the source ready for static analysis"; + license = stdenv.lib.licenses.mit; + }) {}; + "preprocessor-tools" = callPackage ({ mkDerivation, base, mtl, parsec, syb }: mkDerivation { @@ -135911,13 +136485,13 @@ self: { }) {}; "pretty-types" = callPackage - ({ mkDerivation, base, hspec, mtl }: + ({ mkDerivation, base, hspec, mtl, tagged }: mkDerivation { pname = "pretty-types"; - version = "0.2.1.0"; - sha256 = "5c174607ef75dade1edb781ae0edadb4da0b66547d1f55967369435f9a4ea452"; - libraryHaskellDepends = [ base mtl ]; - testHaskellDepends = [ base hspec ]; + version = "0.2.3.0"; + sha256 = "82a9a4b3337cc9d07aeef4b9f7af9c9010465fb7a9d258a84802a3b36806341d"; + libraryHaskellDepends = [ base mtl tagged ]; + testHaskellDepends = [ base hspec tagged ]; homepage = "https://github.com/sheyll/pretty-types#readme"; description = "A small pretty printing DSL for complex types"; license = stdenv.lib.licenses.bsd3; @@ -137914,16 +138488,16 @@ self: { }) {inherit (pkgs) libpulseaudio;}; "pulseaudio" = callPackage - ({ mkDerivation, base, containers, pulse, stm, unix }: + ({ mkDerivation, base, containers, libpulseaudio, stm, unix }: mkDerivation { pname = "pulseaudio"; version = "0.0.1.1"; sha256 = "11696b8df21dc010b0792c3b7ded2ea683b4d379657eca39ace2a04fabaf36f0"; libraryHaskellDepends = [ base containers stm unix ]; - librarySystemDepends = [ pulse ]; + librarySystemDepends = [ libpulseaudio ]; description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api"; license = stdenv.lib.licenses.lgpl3; - }) {pulse = null;}; + }) {inherit (pkgs) libpulseaudio;}; "punkt" = callPackage ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text @@ -138194,18 +138768,20 @@ self: { "purescript-bridge" = callPackage ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, lens, mtl, text, transformers + , generic-deriving, hspec, hspec-expectations-pretty-diff, lens + , mtl, text, transformers }: mkDerivation { pname = "purescript-bridge"; - version = "0.7.0.0"; - sha256 = "f80ddb4a613614b775e7636cbb92755a938ffa7b0b6093cfded3d5487bf79e7b"; + version = "0.7.0.1"; + sha256 = "14a2d4e4569b1d36fcef890264326f5e0628ef8cc613fdadaf134bc77d33f613"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers ]; - testHaskellDepends = [ base containers text ]; - jailbreak = true; + testHaskellDepends = [ + base containers hspec hspec-expectations-pretty-diff text + ]; description = "Generate PureScript data types from Haskell data types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -140137,6 +140713,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "random-fu-multivariate" = callPackage + ({ mkDerivation, base, hmatrix, mtl, random-fu }: + mkDerivation { + pname = "random-fu-multivariate"; + version = "0.1.2.0"; + sha256 = "870c6556f66a16e891396b1b02865659a03915fbe6ccc3cf3b212915dad01a86"; + libraryHaskellDepends = [ base hmatrix mtl random-fu ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/fpco/random-fu-multivariate"; + description = "Multivariate distributions for random-fu"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "random-hypergeometric" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, math-functions , mwc-random, QuickCheck, random-fu, vector @@ -149255,19 +149844,20 @@ self: { }) {}; "semver-range" = callPackage - ({ mkDerivation, base, classy-prelude, parsec, text - , unordered-containers + ({ mkDerivation, base, classy-prelude, hspec, parsec, QuickCheck + , text, unordered-containers }: mkDerivation { pname = "semver-range"; - version = "0.1.1"; - sha256 = "162a7149c50908cd1669ecc16193e2a1bc5cee99bf9e78baa985550592b421d7"; - revision = "2"; - editedCabalFile = "aa7748d3f19f1e66e0562c87e0dcfac03bdcb820ce29dde1f97e5e2affb699a9"; + version = "0.2.2"; + sha256 = "45b71ed50c94effdafa31f3b162e3de83eda9fb7b818910ac63dfab7e2a3b466"; libraryHaskellDepends = [ base classy-prelude parsec text unordered-containers ]; - jailbreak = true; + testHaskellDepends = [ + base classy-prelude hspec parsec QuickCheck text + unordered-containers + ]; description = "An implementation of semver and semantic version ranges"; license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" ]; @@ -149777,7 +150367,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_8" = callPackage + "servant_0_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , bytestring-conversion, case-insensitive, directory, doctest , filemanip, filepath, hspec, http-api-data, http-media, http-types @@ -149786,8 +150376,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.8"; - sha256 = "185f989c0cca574bb8142fe627f0b5824004aa1ccf125a580c3aeba953d80d55"; + version = "0.8.1"; + sha256 = "2b5494ceb4d8123c7a92535d0cf109485e165dfc9cba9471b11127e04556d8c1"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring bytestring-conversion case-insensitive http-api-data http-media http-types mmorph mtl @@ -149829,21 +150419,23 @@ self: { "servant-aeson-specs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , doctest, filepath, hspec, hspec-core, mockery, QuickCheck - , quickcheck-instances, random, servant, silently - , string-conversions, temporary, text + , doctest, filepath, hspec, hspec-core, hspec-golden-aeson, mockery + , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances + , random, servant, silently, string-conversions, temporary, text }: mkDerivation { pname = "servant-aeson-specs"; - version = "0.4.1"; - sha256 = "659294fbc3e56202ff886b96f72ea6d3aeb8e6b083e17e9d48e57485ef5eb058"; + version = "0.5.1.0"; + sha256 = "6ddf595d1f02c4515dfef0348893fae8b447fd349b22c61c2844b93ea6da0ee4"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec - QuickCheck random servant + hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random + servant ]; testHaskellDepends = [ aeson aeson-pretty base bytestring directory doctest filepath hspec - hspec-core mockery QuickCheck quickcheck-instances random servant + hspec-core hspec-golden-aeson mockery QuickCheck + quickcheck-arbitrary-adt quickcheck-instances random servant silently string-conversions temporary text ]; homepage = "https://github.com/plow-technologies/servant-aeson-specs#readme"; @@ -149926,8 +150518,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.2.0.1"; - sha256 = "25fe8eaeb71fb33a9406b15c93bac7c342eef6b7d7d939c42865b1f4fae5d6f0"; + version = "0.3.1.0"; + sha256 = "b67564a2f93db0b3b53fc9059f42579b38cebad106b8ac28f344b7a798ffd85f"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl persistent persistent-postgresql persistent-template pwstore-fast @@ -149940,16 +150532,16 @@ self: { }) {}; "servant-auth-token-api" = callPackage - ({ mkDerivation, aeson, aeson-injector, base, lens, servant - , servant-docs, servant-swagger, swagger2, text + ({ mkDerivation, aeson, aeson-injector, base, lens, raw-strings-qq + , servant, servant-docs, servant-swagger, swagger2, text }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.2.1.0"; - sha256 = "c0e5a437cce5e636dbb9a6b4e4d3fafa66ade9d59e0264fe520227796977d33a"; + version = "0.3.1.0"; + sha256 = "f85a81c0c859807ba1ae058ab409ce3e61ce3bfa713621e8e16e7a2bbf6b6241"; libraryHaskellDepends = [ - aeson aeson-injector base lens servant servant-docs servant-swagger - swagger2 text + aeson aeson-injector base lens raw-strings-qq servant servant-docs + servant-swagger swagger2 text ]; homepage = "https://github.com/ncrashed/servant-auth-token-api#readme"; description = "Servant based API for token based authorisation"; @@ -150014,7 +150606,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_8" = callPackage + "servant-client_0_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, deepseq, exceptions, hspec, http-api-data , http-client, http-client-tls, http-media, http-types, HUnit @@ -150024,8 +150616,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.8"; - sha256 = "b1099f2024e6c700f1310b25ef7f62f497a886c6859bb3172282750c6d062c2e"; + version = "0.8.1"; + sha256 = "a007328f261e8d5596fee87cf541d0886bd1d644fb545fbb05fca683d8f8e33a"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring exceptions http-api-data http-client http-client-tls http-media http-types @@ -150096,7 +150688,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "servant-docs_0_8" = callPackage + "servant-docs_0_8_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , bytestring-conversion, case-insensitive, control-monad-omega , hashable, hspec, http-media, http-types, lens, servant @@ -150104,8 +150696,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.8"; - sha256 = "51a5caf554e495f48147af44a98c19b48a4da89869c0586c5be9b19b120395e3"; + version = "0.8.1"; + sha256 = "5a68ef0248da54fddf2fbba0a209a2bbba4144a576c681545b8019041645868d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150212,12 +150804,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-foreign_0_8" = callPackage + "servant-foreign_0_8_1" = callPackage ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.8"; - sha256 = "eeec69a6d32e671b95665939bfaeeb4228af7fe05b0ba669ea1ecd70f9f653f0"; + version = "0.8.1"; + sha256 = "dd70baa384b353912663b7845fb8698d20350eff389b19e6c6d45181ab7b3171"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec ]; jailbreak = true; @@ -150319,15 +150911,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-js_0_8" = callPackage + "servant-js_0_8_1" = callPackage ({ mkDerivation, base, base-compat, charset, hspec , hspec-expectations, language-ecmascript, lens, servant , servant-foreign, text }: mkDerivation { pname = "servant-js"; - version = "0.8"; - sha256 = "dbbfe65d21e04c8d6a7b28a326e6d4e1f17a4ca2ac497e66c234dfd7abab531d"; + version = "0.8.1"; + sha256 = "5f60d692953f9f5f1570c7fd6b1c8c524545e588b3f1c63669ef219dde8c0363"; libraryHaskellDepends = [ base base-compat charset lens servant servant-foreign text ]; @@ -150403,15 +150995,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-mock_0_8" = callPackage + "servant-mock_0_8_1" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server , transformers, wai, warp }: mkDerivation { pname = "servant-mock"; - version = "0.8"; - sha256 = "60c61f210a7e976f21337a93c19a08c349c346ae25a3b25e5100c4b9503fae83"; + version = "0.8.1"; + sha256 = "eb4a6a488ca70c2448b61c6ca373eaf97f4399c75d4e51ccefff502a0f6ba4fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150492,8 +151084,8 @@ self: { }: mkDerivation { pname = "servant-purescript"; - version = "0.3.0.0"; - sha256 = "4baedc50f875564c6eed6e64ba3d49dd2ffb68cf8f0741580e3c5f818b9285cb"; + version = "0.3.1.3"; + sha256 = "626028dfddad07e2eea6214e45b856e9b8e86e413cf6a3560585d45f538f0f02"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -150628,7 +151220,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_8" = callPackage + "servant-server_0_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, bytestring-conversion, containers , directory, doctest, exceptions, filemanip, filepath, hspec @@ -150640,8 +151232,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.8"; - sha256 = "31bc2044922d385dacac0c17cd0d56d99a8614efd972e85474b3ad81d5a1069e"; + version = "0.8.1"; + sha256 = "2a662864df00ce431eb1a6d01245d65c1483847c6228c540e6374108fe84a2b2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150699,8 +151291,8 @@ self: { }: mkDerivation { pname = "servant-subscriber"; - version = "0.4.0.0"; - sha256 = "b539a26ac25739165fd375e4c7fcc7db0e277bcd20d07423e058ff0a852683ce"; + version = "0.5.0.1"; + sha256 = "02cd8b6a85aa20581d16b44a103ec1e520f77fd77ea48d9e0a0b6573721c464b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151068,7 +151660,6 @@ self: { libraryHaskellDepends = [ base containers enummapset psqueues utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/set-cover/"; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = stdenv.lib.licenses.bsd3; @@ -151758,8 +152349,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.11"; - sha256 = "8ea8a21ee989427378844e80b8955e89f4660df3a743df874f11f1cdec0650aa"; + version = "2.0.11.1"; + sha256 = "bc3d6c5bb3cbef9a0aa67bbf5f08b20cf77bc9e29d8e7da5a3768016a0361d5e"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -155634,13 +156225,12 @@ self: { }: mkDerivation { pname = "snaplet-purescript"; - version = "0.5.1.0"; - sha256 = "24ca54a3186394624f76d67cc87ad4323e059b10abc7ea761f09564284d1c6df"; + version = "0.5.2.0"; + sha256 = "e1d00a9f0747f1a59c392e35f863b3b66b997a4140754393b2e89ec152e1a6a5"; libraryHaskellDepends = [ base configurator mtl raw-strings-qq shelly snap snap-core string-conv text transformers ]; - jailbreak = true; description = "Automatic (re)compilation of purescript projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -156776,20 +157366,19 @@ self: { }) {}; "soxlib" = callPackage - ({ mkDerivation, base, containers, explicit-exception + ({ mkDerivation, base, bytestring, containers, explicit-exception , extensible-exceptions, sample-frame, sox, storablevector , transformers, utility-ht }: mkDerivation { pname = "soxlib"; - version = "0.0.2.1"; - sha256 = "91e25a3919149abce1956e46d831c01c6875ad23cb9be79420792e52f9690a0a"; + version = "0.0.3"; + sha256 = "18b555beb0eaafce25550feea23575ec68477728654bd2fbaad67d448f5dcd8b"; libraryHaskellDepends = [ - base containers explicit-exception extensible-exceptions + base bytestring containers explicit-exception extensible-exceptions sample-frame storablevector transformers utility-ht ]; libraryPkgconfigDepends = [ sox ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Sox"; description = "Write, read, convert audio signals using libsox"; license = stdenv.lib.licenses.bsd3; @@ -157459,6 +158048,7 @@ self: { base numeric-prelude soxlib storablevector synthesizer-core transformers utility-ht ]; + jailbreak = true; homepage = "http://code.haskell.org/~thielema/split-record/"; description = "Split a big audio file into pieces at positions of silence"; license = stdenv.lib.licenses.bsd3; @@ -158294,19 +158884,20 @@ self: { "stack-hpc-coveralls" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , docopt, filepath, hlint, hpc, hspec, hspec-contrib, http-client - , HUnit, lens, lens-aeson, process, pureMD5, text, time - , utf8-string, wreq + , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib + , http-client, HUnit, lens, lens-aeson, process, pureMD5, text + , time, unordered-containers, utf8-string, wreq, yaml }: mkDerivation { pname = "stack-hpc-coveralls"; - version = "0.0.3.0"; - sha256 = "b7e0811516216cb5d20294c9371787e5d08663126c224f7a976e90101fd6eb22"; + version = "0.0.4.0"; + sha256 = "cebb6ea6d578ab8cca99348e4982628d717db455a28143562fadb7d89fe5f2f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers filepath hpc http-client lens - lens-aeson process pureMD5 text utf8-string wreq + aeson base bytestring containers directory filepath hpc http-client + lens lens-aeson process pureMD5 text unordered-containers + utf8-string wreq yaml ]; executableHaskellDepends = [ aeson base bytestring docopt ]; testHaskellDepends = [ @@ -159873,20 +160464,20 @@ self: { }) {}; "storablevector" = callPackage - ({ mkDerivation, base, bytestring, non-negative, QuickCheck, random - , syb, transformers, unsafe, utility-ht + ({ mkDerivation, base, bytestring, deepseq, non-negative + , QuickCheck, random, syb, transformers, unsafe, utility-ht }: mkDerivation { pname = "storablevector"; - version = "0.2.10"; - sha256 = "749d29fb3446695ece50f72fd6b17eddc2c81df49c92a89a3c41940b56922505"; + version = "0.2.11"; + sha256 = "b2edb8234ae9de08baa4dc7b292314a2a9edaee5c090cedd7f3db405ab27c65e"; libraryHaskellDepends = [ - base non-negative QuickCheck syb transformers unsafe utility-ht + base deepseq non-negative QuickCheck syb transformers unsafe + utility-ht ]; testHaskellDepends = [ base bytestring QuickCheck random utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; description = "Fast, packed, strict storable arrays with a list interface like ByteString"; license = stdenv.lib.licenses.bsd3; @@ -162190,6 +162781,22 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + "symon" = callPackage + ({ mkDerivation, ansi-terminal, base, monad-loops, random }: + mkDerivation { + pname = "symon"; + version = "0.1"; + sha256 = "aa3698b65c9e043cdb0004ffa9971660575c7d531137a7b952fdce4a053e3b06"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base monad-loops random + ]; + homepage = "https://github.com/simonmichael/symon"; + description = "Minimal implementation(s) of the classic electronic memory game"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "sync" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -162507,8 +163114,8 @@ self: { }: mkDerivation { pname = "synthesizer-alsa"; - version = "0.5.0.3"; - sha256 = "f8f68c297e3e136b221fa1a66e6074c54b7b929f88749213758b7844d6a309ed"; + version = "0.5.0.4"; + sha256 = "2a7966095f5195977c0c70575009ac57a604b16b1c625da4ac23811ef1e447e0"; libraryHaskellDepends = [ alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa non-negative numeric-prelude old-time random sox storablevector @@ -162526,24 +163133,23 @@ self: { , deepseq, event-list, explicit-exception, filepath, non-empty , non-negative, numeric-prelude, numeric-quest, process, QuickCheck , random, sample-frame-np, sox, storable-record, storable-tuple - , storablevector, stream-fusion, transformers, utility-ht + , storablevector, transformers, utility-ht }: mkDerivation { pname = "synthesizer-core"; - version = "0.7.1"; - sha256 = "ee4f7d803ee743dc97c0d6abe61d4d75c702a2faa7edc1a9582d289824916d40"; + version = "0.8.0.1"; + sha256 = "c99bc3c2848d0f3af6d0e928b9a52b22dc47644eab8124f286f970eeb2225070"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude numeric-quest process QuickCheck random sample-frame-np sox - storable-record storable-tuple storablevector stream-fusion - transformers utility-ht + storable-record storable-tuple storablevector transformers + utility-ht ]; testHaskellDepends = [ base containers event-list non-empty non-negative numeric-prelude QuickCheck random storable-tuple storablevector utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing coded in Haskell: Low level part"; license = "GPL"; @@ -162557,8 +163163,8 @@ self: { }: mkDerivation { pname = "synthesizer-dimensional"; - version = "0.7.0.3"; - sha256 = "7bdd848e7657dc45e9afd7307915d666614d8d40d6883b31eb55423a64230b83"; + version = "0.8.0.1"; + sha256 = "bb8b032cb291ef8f8d6dd69e49e871350ee8478961a706365a25541169672c63"; libraryHaskellDepends = [ base bytestring event-list non-negative numeric-prelude random sox storable-record storablevector synthesizer-core transformers @@ -162609,19 +163215,19 @@ self: { }) {UniqueLogicNP = null;}; "synthesizer-llvm" = callPackage - ({ mkDerivation, base, containers, event-list, filepath, llvm-extra - , llvm-tf, midi, non-empty, non-negative, numeric-prelude + ({ mkDerivation, base, containers, event-list, llvm-extra, llvm-tf + , midi, non-empty, non-negative, numeric-prelude, pathtype , QuickCheck, random, sox, storable-record, storable-tuple , storablevector, synthesizer-core, synthesizer-midi, tfp , transformers, unsafe, utility-ht, vault }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.7.0.1"; - sha256 = "626e02e30dcb6e197dc01265d3a7637057623af53e9f4d25b66158e478d3bf12"; + version = "0.8"; + sha256 = "a5acdab56b0789f6ab28421e520296c58001883f417aa3e1eadced388dd08d02"; libraryHaskellDepends = [ - base containers event-list filepath llvm-extra llvm-tf midi - non-empty non-negative numeric-prelude random sox storable-record + base containers event-list llvm-extra llvm-tf midi non-empty + non-negative numeric-prelude pathtype random sox storable-record storable-tuple storablevector synthesizer-core synthesizer-midi tfp transformers unsafe utility-ht vault ]; @@ -162629,7 +163235,6 @@ self: { base llvm-extra llvm-tf numeric-prelude QuickCheck random storablevector synthesizer-core tfp utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Efficient signal processing using runtime compilation"; license = "GPL"; @@ -162645,15 +163250,14 @@ self: { }: mkDerivation { pname = "synthesizer-midi"; - version = "0.6.0.2"; - sha256 = "5dc040c8315bafb042e3efaec5caea4c10a97eef12527a61e6b75b81e0934e77"; + version = "0.6.0.3"; + sha256 = "e1b1597c54265661893b258ea2dccdb6e5776560fb78f47faa7704333af09434"; libraryHaskellDepends = [ array base containers data-accessor data-accessor-transformers deepseq event-list midi non-negative numeric-prelude sox storable-record storablevector synthesizer-core synthesizer-dimensional transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; @@ -166230,6 +166834,19 @@ self: { license = "unknown"; }) {}; + "text-metrics" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, text }: + mkDerivation { + pname = "text-metrics"; + version = "0.1.0"; + sha256 = "b7af083250d9debefa2ef85b53aeab2e90b4939705f5f14df8af5b173d679b4f"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + homepage = "https://github.com/mrkkrp/text-metrics"; + description = "Calculate various string metrics efficiently"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text-normal" = callPackage ({ mkDerivation, base, deepseq, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -166535,8 +167152,8 @@ self: { ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.5"; - sha256 = "e27d2671da0686e14171213f7ed83ba3f0319dedbeb3a2390e6b98cda56c4b9a"; + version = "0.6.1"; + sha256 = "5aef7f26949c9bd05c1b9e72aad084e6fdaf952ad0a3ce9c16f7170a64bc612c"; libraryHaskellDepends = [ base deepseq text vector ]; description = "A text editor zipper library"; license = stdenv.lib.licenses.bsd3; @@ -166550,6 +167167,7 @@ self: { sha256 = "8629d0897046167fa96c9a9ba7292a827845e943e19e45a9b77373474b389b35"; libraryHaskellDepends = [ base mtl text-zipper ]; testHaskellDepends = [ base hspec text-zipper ]; + jailbreak = true; homepage = "https://github.com/kseo/text-zipper-monad#readme"; description = "Monadic interface to the text-zipper package"; license = stdenv.lib.licenses.bsd3; @@ -171725,8 +172343,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "type-level-sets"; - version = "0.7"; - sha256 = "c9ef3826a1589d078fa90810b9e640b3f2e16a5a9995ed46be88ef7fde25d67e"; + version = "0.8.0.0"; + sha256 = "223dfa51d3a740c570f54a880793bea30edc332c7c33365782f703bf944bb74f"; libraryHaskellDepends = [ base ghc-prim ]; description = "Type-level sets and finite maps (with value-level counterparts)"; license = stdenv.lib.licenses.bsd3; @@ -172663,7 +173281,7 @@ self: { "unbound" = callPackage ({ mkDerivation, base, binary, containers, mtl, parsec, pretty - , QuickCheck, RepLib, stdenv, template-haskell, transformers + , QuickCheck, RepLib, template-haskell, transformers }: mkDerivation { pname = "unbound"; @@ -172679,6 +173297,7 @@ self: { homepage = "https://github.com/sweirich/replib"; description = "Generic support for programming with names and binders"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "unbound-generics" = callPackage @@ -174641,7 +175260,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "utility-ht" = callPackage + "utility-ht_0_0_11" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "utility-ht"; @@ -174651,6 +175270,19 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "utility-ht" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "utility-ht"; + version = "0.0.12"; + sha256 = "a4445f436354599c1f3e923dfb3e4463b6f65e7c1dabea1e2d34d11c4a5b05ef"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; + license = stdenv.lib.licenses.bsd3; }) {}; "uu-cco" = callPackage @@ -176770,8 +177402,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.9.1"; - sha256 = "37cbc530767ac0ab6d94d2781f907c76d893aafcb543e4c58dca534eacbcd9c1"; + version = "5.10"; + sha256 = "0485c0beb948ece2dad7def8d0447632491f88c055605f06e06e2cc1ea8ffe35"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176795,6 +177427,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_11" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , data-default, deepseq, directory, filepath, hashable, HUnit + , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec + , QuickCheck, quickcheck-assertions, random, smallcheck, stm + , string-qq, terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.11"; + sha256 = "e6f21d7e62d1368637025eadb1b60d3bf9c58113b91b0510b9352bcc8aab0a32"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers data-default deepseq + directory filepath hashable microlens microlens-mtl microlens-th + mtl parallel parsec stm terminfo text transformers unix utf8-string + vector + ]; + executableHaskellDepends = [ + base containers data-default microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers data-default deepseq + HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions + random smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + homepage = "https://github.com/coreyoconnor/vty"; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -177218,6 +177887,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_17" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, lifted-base, network, old-locale + , resourcet, streaming-commons, stringsearch, text, time + , transformers, unix, unix-compat, vault, void, wai, wai-logger + , word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.17"; + sha256 = "48bbec6a692dac25972f84da1669a69f7c7c7741dd0d978aa9992bbdf809b671"; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types iproute lifted-base network + old-locale resourcet streaming-commons stringsearch text time + transformers unix unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive cookie fast-logger + hspec http-types HUnit resourcet text time transformers wai zlib + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -178537,6 +179236,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-websockets_3_0_1_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , file-embed, http-types, network, text, transformers, wai + , wai-app-static, warp, websockets + }: + mkDerivation { + pname = "wai-websockets"; + version = "3.0.1.1"; + sha256 = "6abeafea574d9e8f4d41de091afec4594489877aa8717f97e91af5543fd38a31"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive http-types network + transformers wai websockets + ]; + executableHaskellDepends = [ + base blaze-builder bytestring case-insensitive file-embed + http-types network text transformers wai wai-app-static warp + websockets + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "Provide a bridge between WAI and the websockets package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wait-handle" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -180950,6 +181675,33 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "writer-cps-mtl" = callPackage + ({ mkDerivation, base, mtl, transformers, writer-cps-transformers + }: + mkDerivation { + pname = "writer-cps-mtl"; + version = "0.1.0.2"; + sha256 = "b77e45607d7bfde15758ae5223f79d846dc6adc7ab73b0d0b0df422daa1c7fce"; + libraryHaskellDepends = [ + base mtl transformers writer-cps-transformers + ]; + homepage = "https://github.com/minad/writer-cps-mtl#readme"; + description = "MonadWriter orphan instances for writer-cps-transformers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "writer-cps-transformers" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "writer-cps-transformers"; + version = "0.1.0.2"; + sha256 = "037e74cb6c2780f151d937e15560a26c59c824f14c2c8f169971c76fcbd1dd4d"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/minad/writer-cps-transformers#readme"; + description = "WriteT and RWST monad transformers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wsdl" = callPackage ({ mkDerivation, base, bytestring, conduit, exceptions, file-embed , hspec, mtl, network-uri, resourcet, text, xml-conduit, xml-types @@ -181132,6 +181884,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.1"; + sha256 = "285d9122bd2da4e6968d7c4f199858ccb2a6ea888f83cf7873f8cc651b755cdf"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + homepage = "https://github.com/tfausak/wuss#readme"; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { @@ -181453,13 +182221,15 @@ self: { }) {}; "x86-64bit" = callPackage - ({ mkDerivation, base, monads-tf, QuickCheck, vector }: + ({ mkDerivation, base, monads-tf, QuickCheck, tardis, vector }: mkDerivation { pname = "x86-64bit"; - version = "0.2"; - sha256 = "03a02c746a87a42db4d6dcf74de5b924d9ef810c2ba1ae93c5ceb796f2b0b4c6"; - libraryHaskellDepends = [ base monads-tf QuickCheck vector ]; - testHaskellDepends = [ base monads-tf QuickCheck vector ]; + version = "0.3"; + sha256 = "cd8115c071ac2e4a9961f9a0ffe2a1733abe44f677f8cce8a0a6fcf6bda69af7"; + libraryHaskellDepends = [ + base monads-tf QuickCheck tardis vector + ]; + testHaskellDepends = [ base monads-tf QuickCheck tardis vector ]; homepage = "https://github.com/divipp/x86-64"; description = "Runtime code generation for x86 64 bit machine code"; license = stdenv.lib.licenses.bsd3; @@ -182690,8 +183460,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.24.2"; - sha256 = "a8aa243ec8d86b88da2c072eeef4d09be00091254ad05eaf517756e20483cd64"; + version = "0.24.3"; + sha256 = "d330079dd60e22004a4cfa271eb9e00a1bb36b8dafcbbf1b1a5980d401dcf510"; configureFlags = [ "-fall_extensions" ]; isLibrary = false; isExecutable = true; @@ -183404,7 +184174,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yaml" = callPackage + "yaml_0_8_18_1" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific @@ -183431,6 +184201,69 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + + "yaml" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat + , bytestring, conduit, containers, directory, enclosed-exceptions + , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific + , semigroups, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.18.4"; + sha256 = "f5bab6f6940ce789e2104525e647318a981e6f5e4e23b9de7b942da82b0c382c"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + enclosed-exceptions filepath resourcet scientific semigroups text + transformers unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring conduit directory hspec + HUnit mockery resourcet text transformers unordered-containers + vector + ]; + doCheck = false; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) libyaml;}; + + "yaml_0_8_18_5" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat + , bytestring, conduit, containers, directory, enclosed-exceptions + , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific + , semigroups, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.18.5"; + sha256 = "90875ae906872f0b2d3cc38f265f11347c80643d4b64a6c5965183e1b700e5c3"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + enclosed-exceptions filepath resourcet scientific semigroups text + transformers unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring conduit directory hspec + HUnit mockery resourcet text transformers unordered-containers + vector + ]; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-config" = callPackage @@ -183978,8 +184811,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.13.4"; - sha256 = "7ccdf087e79e3117ea594891d46798e0f87d8c975c7f846fac53891d778a874b"; + version = "1.4.13.5"; + sha256 = "42bfdfe72f5ef9f9e43d12dcd47f5a3415e6b883d455a7ad4cbfb7e900e760bf"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -184416,6 +185249,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_4_18_3" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, shakespeare, split, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls + , yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.4.18.3"; + sha256 = "404f145f6dc46df6a196002810608715bc192163a2b9a8fc191bcc82e0ce2b13"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify ghc ghc-paths http-client + http-conduit http-reverse-proxy http-types lifted-base network + optparse-applicative parsec process project-template resourcet + shakespeare split streaming-commons tar template-haskell text time + transformers transformers-compat unix-compat unordered-containers + wai wai-extra warp warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, conduit , conduit-extra, containers, either, email-validate @@ -185527,7 +186394,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-static" = callPackage + "yesod-static_1_5_0_3" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra , containers, cryptohash, cryptohash-conduit, css-text @@ -185560,6 +186427,42 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-static" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, byteable, bytestring, conduit, conduit-extra + , containers, cryptohash, cryptohash-conduit, css-text + , data-default, directory, file-embed, filepath, hashable, hjsmin + , hspec, http-types, HUnit, mime-types, old-time, process + , resourcet, template-haskell, text, transformers, unix-compat + , unordered-containers, wai, wai-app-static, wai-extra, yesod-core + , yesod-test + }: + mkDerivation { + pname = "yesod-static"; + version = "1.5.0.4"; + sha256 = "55a91e85739fb3e06de50f34def5929c7bb8b74810b9fe621c4e2e3f3ebc82b0"; + libraryHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder byteable + bytestring conduit conduit-extra containers cryptohash + cryptohash-conduit css-text data-default directory file-embed + filepath hashable hjsmin http-types mime-types old-time process + resourcet template-haskell text transformers unix-compat + unordered-containers wai wai-app-static yesod-core + ]; + testHaskellDepends = [ + async base base64-bytestring byteable bytestring conduit + conduit-extra containers cryptohash cryptohash-conduit data-default + directory file-embed filepath hjsmin hspec http-types HUnit + mime-types old-time process resourcet template-haskell text + transformers unix-compat unordered-containers wai wai-app-static + wai-extra yesod-core yesod-test + ]; + homepage = "http://www.yesodweb.com/"; + description = "Static file serving subsite for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-static-angular" = callPackage @@ -185652,8 +186555,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.5.2"; - sha256 = "e0faf315423fb5043c68c639e0e604b6426143d490cbdf3396238dccae5ef174"; + version = "1.5.3"; + sha256 = "4253af356d95fd1888501a640460a48b1ccc4fa81fdd2fd22dfa3c22dd44ab19"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit From 3d0c9ba59932643778f1bfa3d6adce2db72703d2 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 5 Sep 2016 21:52:04 +0200 Subject: [PATCH 018/195] opencascade: fix build --- .../libraries/opencascade/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 8a7f9970e65..51581bca382 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -9,16 +9,25 @@ stdenv.mkDerivation rec { buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ]; - preUnpack = '' - sourceRoot=`pwd`/ros/adm/cmake - cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype.dev}" - ''; + sourceRoot = "ros/adm/cmake"; + + cmakeFlags = [ + "-D3RDPARTY_TCL_DIR=${tcl}" + "-D3RDPARTY_FREETYPE_DIR=${freetype.dev}" + + # Not used on Linux but must be defined during configuration. + "-D3RDPARTY_FREETYPE_DLL=${freetype.dev}" + ]; # https://bugs.freedesktop.org/show_bug.cgi?id=83631 NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; hardeningDisable = [ "format" ]; + preConfigure = '' + cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out" + ''; + postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} From 21cf4641bfd628980fbd887fd067565f8717f2ad Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Sep 2016 08:18:58 +0200 Subject: [PATCH 019/195] sakura: 3.2.0 -> 3.3.4 --- pkgs/applications/misc/sakura/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 3febcfb17fb..75866cbb971 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte }: +{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib }: stdenv.mkDerivation rec { name = "sakura-${version}"; - version = "3.2.0"; + version = "3.3.4"; src = fetchurl { url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1pfvc35kckrzik5wx8ywhkhclr52rfp2syg46ix2nsdm72q6dl90"; + sha256 = "1fnkrkzf2ysav1ljgi4y4w8kvbwiwgmg1462xhizlla8jqa749r7"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; - buildInputs = [ gtk3 vte ]; + buildInputs = [ gtk3 vte pcre glib ]; meta = with stdenv.lib; { description = "A terminal emulator based on GTK and VTE"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9023d33704c..36519102a5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14654,7 +14654,7 @@ in udevil = callPackage ../applications/misc/udevil {}; sakura = callPackage ../applications/misc/sakura { - vte = gnome3.vte_290; + vte = gnome3.vte; }; sbagen = callPackage ../applications/misc/sbagen { }; From f28fd23d76b4475bbd9c9a79333498260709a507 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Sep 2016 07:54:41 +0200 Subject: [PATCH 020/195] swt: 3.7.2 -> 4.5 --- pkgs/development/libraries/java/swt/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 52d235c6a44..c3053e1f268 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -7,20 +7,20 @@ let platformMap = { "x86_64-linux" = { platform = "gtk-linux-x86_64"; - sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; }; + sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; }; "i686-linux" = { platform = "gtk-linux-x86"; - sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }; + sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; }; "x86_64-darwin" = { platform = "cocoa-macosx-x86_64"; - sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; }; + sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; }; }; metadata = assert platformMap ? ${stdenv.system}; platformMap.${stdenv.system}; in stdenv.mkDerivation rec { - version = "3.7.2"; - fullVersion = "${version}-201202080800"; + version = "4.5"; + fullVersion = "${version}-201506032000"; name = "swt-${version}"; hardeningDisable = [ "format" ]; @@ -29,13 +29,14 @@ in stdenv.mkDerivation rec { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-${metadata.platform}.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${name}-${metadata.platform}.zip"; sha256 = metadata.sha256; }; sourceRoot = "."; - buildInputs = [ unzip jdk pkgconfig gtk libXt libXtst libXi mesa webkit libsoup ]; + nativeBuildInputs = [ unzip pkgconfig ]; + buildInputs = [ jdk gtk libXt libXtst libXi mesa webkit libsoup ]; NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; From c45bf3c43db26455052d822f7ab5984610d36fa7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Sep 2016 07:26:59 +0200 Subject: [PATCH 021/195] openssl-chacha: 2016-01-27 -> 2016-08-22 --- pkgs/development/libraries/openssl/chacha.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 91cd8c6bcac..34721700652 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openssl-chacha-${version}"; - version = "2016-01-27"; + version = "2016-08-22"; src = fetchFromGitHub { owner = "PeterMosmans"; repo = "openssl"; - rev = "4576ede5b08242bcd6749fc284c691ed177842b7"; - sha256 = "1030rs4bdaysxbq0mmck1dn6g5adspzkwsrnhvv16b4ig0r4ncgj"; + rev = "293717318e903b95f4d7e83a98a087282f37efc3"; + sha256 = "134j3anjnj2q99xsd8d47bwvjp73qkdsimdd9riyjxa3hd8ysr00"; }; outputs = [ "bin" "dev" "out" "man" ]; From 875c286ba39a93b36274bb8ccecdd33a5af83b00 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Sep 2016 07:26:00 +0200 Subject: [PATCH 022/195] cipherscan: 2015-12-17 -> 2016-08-16 --- pkgs/tools/security/cipherscan/default.nix | 46 +++++------ pkgs/tools/security/cipherscan/path.patch | 93 ---------------------- 2 files changed, 22 insertions(+), 117 deletions(-) delete mode 100644 pkgs/tools/security/cipherscan/path.patch diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix index eac237f2ff4..859c1fdf49a 100644 --- a/pkgs/tools/security/cipherscan/default.nix +++ b/pkgs/tools/security/cipherscan/default.nix @@ -2,42 +2,40 @@ stdenv.mkDerivation rec { name = "cipherscan-${version}"; - version = "2015-12-17"; - src = fetchFromGitHub { - owner = "jvehent"; - repo = "cipherscan"; - rev = "18b0d1b952d027d20e38f07329817873ec077d26"; - sha256 = "0b6fkfm2y8w04am4krspmapcc5ngn603n5rlwyjly92z2dawc7h8"; - }; - buildInputs = [ makeWrapper python ]; - patches = [ ./path.patch ]; - buildPhase = '' - substituteInPlace cipherscan \ - --replace "@OPENSSLBIN@" \ - "${openssl.bin}/bin/openssl" \ - --replace "@TIMEOUTBIN@" \ - "${coreutils}/bin/timeout" \ - --replace "@READLINKBIN@" \ - "${coreutils}/bin/readlink" + version = "2016-08-16"; - substituteInPlace analyze.py \ - --replace "@OPENSSLBIN@" \ - "${openssl.bin}/bin/openssl" + src = fetchFromGitHub { + owner = "mozilla"; + repo = "cipherscan"; + rev = "74dd82e8ad994a140daf79489d3bd1c5ad928d38"; + sha256 = "16azhlmairnvdz7xmwgvfpn2pzw1p8z7c9b27m07fngqjkpx0mhh"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python ]; + + buildPhase = '' + substituteInPlace cipherscan --replace '$0' 'cipherscan' ''; + installPhase = '' mkdir -p $out/bin cp cipherscan $out/bin cp openssl.cnf $out/bin - cp analyze.py $out/bin + cp analyze.py $out/bin/cipherscan-analyze - wrapProgram $out/bin/analyze.py --set PYTHONPATH "$PYTHONPATH" + wrapProgram $out/bin/cipherscan \ + --set NOAUTODETECT 1 \ + --set TIMEOUTBIN "${coreutils}/bin/timeout" \ + --set OPENSSLBIN "${openssl}/bin/openssl" ''; + meta = with lib; { + inherit (src.meta) homepage; description = "Very simple way to find out which SSL ciphersuites are supported by a target"; - homepage = "https://github.com/jvehent/cipherscan"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan fpletz ]; }; } diff --git a/pkgs/tools/security/cipherscan/path.patch b/pkgs/tools/security/cipherscan/path.patch deleted file mode 100644 index 3b6d8ef8050..00000000000 --- a/pkgs/tools/security/cipherscan/path.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/analyze.py b/analyze.py -index bb62af8..e929253 100755 ---- a/analyze.py -+++ b/analyze.py -@@ -418,13 +418,7 @@ def build_ciphers_lists(opensslbin): - - # use system openssl if not on linux 64 - if not opensslbin: -- if platform.system() == 'Linux' and platform.architecture()[0] == '64bit': -- opensslbin = mypath + '/openssl' -- elif platform.system() == 'Darwin' and platform.architecture()[0] == '64bit': -- opensslbin = mypath + '/openssl-darwin64' -- else: -- opensslbin='openssl' -- print("warning: analyze.py is using system's openssl, which may limit the tested ciphers and recommendations") -+ opensslbin = "@OPENSSLBIN@" - - logging.debug('Loading all ciphers: ' + allC) - all_ciphers = subprocess.Popen([opensslbin, 'ciphers', allC], -diff --git a/cipherscan b/cipherscan -index 236b34f..a240d13 100755 ---- a/cipherscan -+++ b/cipherscan -@@ -30,43 +30,12 @@ if [[ -n $NOAUTODETECT ]]; then - else - case "$(uname -s)" in - Darwin) -- opensslbin_name="openssl-darwin64" -- -- READLINKBIN=$(which greadlink 2>/dev/null) -- if [[ -z $READLINKBIN ]]; then -- echo "greadlink not found. (try: brew install coreutils)" 1>&2 -- exit 1 -- fi -- TIMEOUTBIN=$(which gtimeout 2>/dev/null) -- if [[ -z $TIMEOUTBIN ]]; then -- echo "gtimeout not found. (try: brew install coreutils)" 1>&2 -- exit 1 -- fi -+ READLINKBIN="@READLINKBIN@" -+ TIMEOUTBIN="@TIMEOUTBIN@" - ;; - *) -- opensslbin_name="openssl" -- -- # test that readlink or greadlink (darwin) are present -- READLINKBIN="$(which readlink)" -- -- if [[ -z $READLINKBIN ]]; then -- READLINKBIN="$(which greadlink)" -- if [[ -z $READLINKBIN ]]; then -- echo "neither readlink nor greadlink are present. install coreutils with {apt-get,yum,brew} install coreutils" 1>&2 -- exit 1 -- fi -- fi -- -- # test that timeout or gtimeout (darwin) are present -- TIMEOUTBIN="$(which timeout)" -- -- if [[ -z $TIMEOUTBIN ]]; then -- TIMEOUTBIN="$(which gtimeout)" -- if [[ -z $TIMEOUTBIN ]]; then -- echo "neither timeout nor gtimeout are present. install coreutils with {apt-get,yum,brew} install coreutils" 1>&2 -- exit 1 -- fi -- fi -+ READLINKBIN="@READLINKBIN@" -+ TIMEOUTBIN="@TIMEOUTBIN@" - - # Check for busybox, which has different arguments - TIMEOUTOUTPUT="$($TIMEOUTBIN --help 2>&1)" -@@ -1944,20 +1913,7 @@ do - done - - if [[ -z $OPENSSLBIN ]]; then -- readlink_result=$("$READLINKBIN" -f "$0") -- if [[ -z $readlink_result ]]; then -- echo "$READLINKBIN -f $0 failed, aborting." 1>&2 -- exit 1 -- fi -- REALPATH=$(dirname "$readlink_result") -- if [[ -z $REALPATH ]]; then -- echo "dirname $REALPATH failed, aborting." 1>&2 -- exit 1 -- fi -- OPENSSLBIN="${REALPATH}/${opensslbin_name}" -- if ! [[ -x "${OPENSSLBIN}" ]]; then -- OPENSSLBIN="$(which openssl)" # fallback to generic openssl -- fi -+ OPENSSLBIN="@OPENSSLBIN@" - fi - # use custom config file to enable GOST ciphers - if [[ -e $DIRNAMEPATH/openssl.cnf ]]; then From f4c89ba854eb8e2adca5586b135013062272f7b3 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 25 Aug 2016 21:59:41 +0200 Subject: [PATCH 023/195] strongswan: 5.4.0 -> 5.5.0 --- pkgs/tools/networking/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 1e00157c487..ed67909db67 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "12dy7dfwblihrc2zs0fdvyimvgi2g5mvgh0ksjkxi73axam8ya7q"; + sha256 = "0m449i5s51ikqh36s1sp4rvw60wqyv0j12kyd31yl9b7mjc3jijq"; }; dontPatchELF = true; From ccd5c6e47cd5c29a2b7dccf36dafda7b769c2f32 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Tue, 6 Sep 2016 00:28:42 +0300 Subject: [PATCH 024/195] bsdbuild: init at 3.1 (#18069) --- .../tools/misc/bsdbuild/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/tools/misc/bsdbuild/default.nix diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix new file mode 100644 index 00000000000..0fd9f143ce9 --- /dev/null +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, groff, ed }: + +stdenv.mkDerivation rec { + name = "bsdbuild-${version}"; + version = "3.1"; + + src = fetchurl { + url = "http://stable.hypertriton.com/bsdbuild/${name}.tar.gz"; + sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl"; + }; + + buildInputs = [ perl groff ed ]; + nativeBuildInputs = [ pkgconfig libtool gettext ]; + + prePatch = '' + #ignore unfamiliar flags + substituteInPlace configure \ + --replace '--sbindir=*' '--sbindir=* | --includedir=* | --oldincludedir=*' + #same for packages using bsdbuild + substituteInPlace mkconfigure.pl \ + --replace '--sbindir=*' '--sbindir=* | --includedir=* | --oldincludedir=*' + #insert header for missing NULL macro + for f in db4.pm sdl_ttf.pm mysql.pm uim.pm strlcpy.pm getpwuid.pm \ + getaddrinfo.pm strtoll.pm free_null.pm getpwnam_r.pm \ + gettimeofday.pm gethostbyname.pm xinerama.pm strsep.pm \ + fontconfig.pm gettext.pm pthreads.pm strlcat.pm kqueue.pm wgl.pm \ + alsa.pm crypt.pm cracklib.pm freesg-rg.pm edacious.pm mmap.pm \ + agar.pm x11.pm x11.pm execvp.pm agar-core.pm dyld.pm getopt.pm \ + strtold.pm sdl_image.pm shl_load.pm glx.pm percgi.pm timerfd.pm \ + glob.pm dlopen.pm freesg.pm csidl.pm perl.pm select.pm \ + portaudio.pm etubestore.pm; + do +ed -s -v BSDBuild/$f << EOF +/#include +i +#include +. +w +EOF + done + ''; + + configureFlags = [ + "--with-libtool=${libtool}/bin/libtool" + "--enable-nls=yes" + "--with-gettext=${gettext}" + "--with-manpages=yes" + ]; + + meta = { + homepage = http://bsdbuild.hypertriton.com; + description = "A cross-platform build system."; + + longDescription = '' + BSDBuild is a cross-platform build system. Derived from the + traditional 4.4BSD make libraries, BSDBuild allows BSD-style + Makefiles (without BSD make extensions), and works natively + under most operating systems and make flavors. Since BSDBuild + is implemented as a library (as opposed to a macro package), + Makefiles are edited directly, as opposed to being compiled + (however, if the build directory is separate from the source + directory, BSDBuild will produce the required Makefiles in place). + ''; + + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36519102a5f..48a28c169af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -966,6 +966,8 @@ in bogofilter = callPackage ../tools/misc/bogofilter { }; + bsdbuild = callPackage ../development/tools/misc/bsdbuild { }; + bsdiff = callPackage ../tools/compression/bsdiff { }; btar = callPackage ../tools/backup/btar { From e8b15555247eff53d718ac7c13871e3ff4d3d8dc Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 17:33:46 -0400 Subject: [PATCH 025/195] yubico-piv-tool: add description fields (#18322) --- pkgs/tools/misc/yubico-piv-tool/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 20c1170a805..6ff08e4ac3f 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -14,7 +14,17 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubico-piv-tool/; - description = ""; + description = '' + Used for interacting with the Privilege and Identification Card (PIV) + application on a YubiKey + ''; + longDescription = '' + The Yubico PIV tool is used for interacting with the Privilege and + Identification Card (PIV) application on a YubiKey. + With it you may generate keys on the device, importing keys and + certificates, and create certificate requests, and other operations. + A shared library and a command-line tool is included. + ''; maintainers = with maintainers; [ wkennington ]; license = licenses.bsd2; platforms = platforms.all; From b04cdae902398aa76fb81a0470e18fd527c6ba3d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Sep 2016 17:55:49 -0400 Subject: [PATCH 026/195] nixBufferBuilders.withPackages: Make more legible, special-case proof-general. There's some bigger changes coming, but thought I'd push this first... --- pkgs/build-support/emacs/buffer.nix | 31 ++++++++++++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 2f7f536d5e7..5632eae944c 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -1,20 +1,23 @@ # Functions to build elisp files to locally configure emcas buffers. # See https://github.com/shlevy/nix-buffer -{ runCommand }: +{ lib, writeText }: { - withPackages = pkgs: runCommand "dir-locals.el" { inherit pkgs; } '' - echo "(make-local-variable 'process-environment)" >> $out - echo "(setenv \"PATH\" (concat" >> $out - for pkg in $pkgs; do - echo " \"$pkg/bin:$pkg/sbin\"" >> $out - done - echo " (getenv \"PATH\")))" >> $out - echo -n "(setq-local exec-path (append '(" >> $out - for pkg in $pkgs; do - echo -en "\n \"$pkg/bin\" \"$pkg/sbin\"" >> $out - done - echo -e ")\\n exec-path))" >> $out - ''; + withPackages = pkgs: let + coqs = builtins.filter (x: (builtins.parseDrvName x.name).name == "coq") pkgs; + coq = builtins.head coqs; + pg-setup = if builtins.length coqs == 0 then "" else '' + (setq-local coq-prog-name "${coq}/bin/coqtop") + (setq-local coq-dependency-analyzer "${coq}/bin/coqdep") + (setq-local coq-compiler "${coq}/bin/coqc") + (setq-local coq-library-directory (get-coq-library-directory)) + (coq-prog-args) + ''; + in writeText "dir-locals.el" '' + (make-local-variable 'process-environment) + (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) + (setq-local exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) + ${pg-setup} + ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48a28c169af..654f49cb956 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -285,7 +285,7 @@ in inherit kernel rootModules allowMissing; }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) runCommand; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; From 3beacc4dbe24be54dd63258897d69545ffd52e6a Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 00:09:11 +0200 Subject: [PATCH 027/195] fstar: remove workaround (#18331) As the comment indicates this was a workaround that has since been fixed upstream. --- pkgs/development/compilers/fstar/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 70aa22569a3..3f16667d155 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -64,10 +64,6 @@ stdenv.mkDerivation rec { installFlags = "-C src/ocaml-output"; postInstall = '' - # Workaround for FStarLang/FStar#456 - mv $out/lib/fstar/* $out/lib/ - rmdir $out/lib/fstar - wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" ''; From 53c400355947f4b93c201e30473a652250544e2c Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 00:52:21 +0200 Subject: [PATCH 028/195] linphone: 3.8.5 -> 3.9.1 3.10.2 is available from github but there is no autoconfigured tarball and they added a dependency that's not packaged for nix (bctoolbox) --- .../networking/instant-messengers/linphone/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 781d10cbc4f..2df428a1eb4 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -5,11 +5,13 @@ }: stdenv.mkDerivation rec { - name = "linphone-3.8.5"; + name = "linphone-${version}"; + major = "3.9"; + version = "${major}.1"; src = fetchurl { - url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz"; - sha256 = "10brlbwkk61nhd5v2sim1vfv11xm138l1cqqh3imhs2sigmzzlax"; + url = "mirror://savannah/linphone/${major}.x/sources/${name}.tar.gz"; + sha256 = "1b14gwq36d0sbn1125if9zydll9kliigk19zchbqiy9n2gjymrl4"; }; buildInputs = [ From 273898f4ba945216a803c7188265a76c67be3b73 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 00:53:33 +0200 Subject: [PATCH 029/195] linphone: remove lime support linphone stil uses polarssl, which was replaced by mbedTLS and is no more available on NixOS. Until this is fixed upstream we disable LIME (IM encryption). --- .../networking/instant-messengers/linphone/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 2df428a1eb4..e46151f1c0e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp -, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev +, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip , mediastreamer-openh264, makeWrapper }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 - polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip + libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip ]; nativeBuildInputs = [ intltool pkgconfig makeWrapper ]; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ldap" "--with-ffmpeg=${ffmpeg.dev}" - "--with-polarssl=${polarssl}" - "--enable-lime" "--enable-external-ortp" "--enable-external-mediastreamer" ]; From c7a5edcb7c071d5f06f383ed241fcf750a776767 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:08:10 -0400 Subject: [PATCH 030/195] honcho: md5->sha256 --- pkgs/tools/system/honcho/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index 5aca54ad918..566d9e168ec 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -7,7 +7,7 @@ let honcho = buildPythonApplication rec { src = fetchzip { url = "https://github.com/nickstenning/honcho/archive/v${version}.tar.gz"; - md5 = "f5e6a7f6c1d0c167d410d7f601b4407e"; + sha256 = "1ishyzvq19hdln2nn3bjlk0kwfqsbddpypp28n88jp3px6832w02"; }; buildInputs = with pythonPackages; [ nose mock jinja2 ]; From 66f05a9b7236347101c13d96a1eb28ed5a086f52 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:08:31 -0400 Subject: [PATCH 031/195] dell-530cdn: md5->sha256 --- pkgs/misc/drivers/dell-530cdn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/dell-530cdn/default.nix b/pkgs/misc/drivers/dell-530cdn/default.nix index 9b2f8bd47b3..9cabd8fa339 100644 --- a/pkgs/misc/drivers/dell-530cdn/default.nix +++ b/pkgs/misc/drivers/dell-530cdn/default.nix @@ -3,7 +3,7 @@ src = fetchurl { url = "http://downloads.dell.com/printer/Dell-5130cdn-Color-Laser-${version}.noarch.rpm"; - md5 = "7fb7122e67e40b99deb9665d88df62d1"; + sha256 = "0pj32sj6jcdnpa5v75af0hnvx4z0ky0m1k2522cfdx4cb1r2lna9"; }; in runCommand "Dell-5130cdn-Color-Laser-1.3-1" {} '' mkdir -p usr/share/cups/model From a2c0fdc50328fdc5f7a63e43bf20ffea81888f4b Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:09:46 -0400 Subject: [PATCH 032/195] eclipse-sdk-35: md5->sha256 --- pkgs/applications/editors/eclipse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 95be75dbe51..776d771f9b0 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -19,12 +19,12 @@ rec { if stdenv.system == "x86_64-linux" then fetchurl { url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz; - md5 = "54e2ce0660b2b1b0eb4267acf70ea66d"; + sha256 = "1ndvanxw62b5ywi6ww0dyimabfmjdsw9q3xpy95zd8d5ygj2qsgq"; } else fetchurl { url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz; - md5 = "bde55a2354dc224cf5f26e5320e72dac"; + sha256 = "0y5n0cyr9lgjmmzkfmav7j5w66rc1jq3300hcw3vrfjiv1k6ng3w"; }; }; eclipse_sdk_35 = eclipse-sdk-35; # backward compatibility, added 2016-01-30 From e7477c64996cc4105f5c1b2b90e49704bb5486be Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:14:47 -0400 Subject: [PATCH 033/195] gqvieq: md5->sha256 --- pkgs/applications/graphics/gqview/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index d2a819c1a3c..80391ae061e 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/gqview/gqview-2.1.5.tar.gz; - md5 = "4644187d9b14b1dc11ac3bb146f262ea"; + sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; buildInputs = [pkgconfig gtk libpng]; From 23d605d4ce550d1a922fee069f3c7c743dc2985d Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:20:38 -0400 Subject: [PATCH 034/195] ktikz: md5->sha256 --- pkgs/applications/graphics/ktikz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index ea4826ffaf8..e351534f9e6 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -61,7 +61,7 @@ let inherit version; src = fetchurl { url = "http://www.hackenberger.at/ktikz/ktikz_${version}.tar.gz"; - md5 = "e8f0826cba2447250bcdcd389a71a2ac"; + sha256 = "19jl49r7dw3vb3hg52man8p2lszh71pvnx7d0xawyyi0x6r8ml9i"; }; enableParallelBuilding = true; From 77fe797525301968ff0d2afdb800a876f052283b Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:25:15 -0400 Subject: [PATCH 035/195] icu 54.1: md5->sha256 --- pkgs/development/libraries/icu/54.1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix index 4d780341b3a..cd4398b3cc0 100644 --- a/pkgs/development/libraries/icu/54.1.nix +++ b/pkgs/development/libraries/icu/54.1.nix @@ -6,7 +6,7 @@ in stdenv.lib.overrideDerivation icu (attrs: { src = fetchurl { url = "http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz"; - md5 = "e844caed8f2ca24c088505b0d6271bc0"; + sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; }; }) From 1dca12c21d24ee33197143ada659c213dc228c0a Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:30:06 -0400 Subject: [PATCH 036/195] sane-frontends: update source url --- pkgs/applications/graphics/sane/frontends.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 7e9e6fc0099..3532a943928 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sane-frontends-1.0.14"; src = fetchurl { - url = "ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/${name}.tar.gz"; + url = "https://alioth.debian.org/frs/download.php/file/1140/${name}.tar.gz"; md5 = "c63bf7b0bb5f530cf3c08715db721cd3"; }; From d197498b8f2a1cc41c7203b40927635787015f07 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:30:54 -0400 Subject: [PATCH 037/195] sane-frontends: md5->sha256 --- pkgs/applications/graphics/sane/frontends.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 3532a943928..b5abe34581a 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://alioth.debian.org/frs/download.php/file/1140/${name}.tar.gz"; - md5 = "c63bf7b0bb5f530cf3c08715db721cd3"; + sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7"; }; preConfigure = '' From 7ae2f5817bbca0a815cbec546485345692360ab0 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:41:12 -0400 Subject: [PATCH 038/195] javasvn: md5->sha256 --- pkgs/development/libraries/java/javasvn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/javasvn/default.nix b/pkgs/development/libraries/java/javasvn/default.nix index b698de6d5a7..2ad9a33879c 100644 --- a/pkgs/development/libraries/java/javasvn/default.nix +++ b/pkgs/development/libraries/java/javasvn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://tmate.org/svn/org.tmatesoft.svn_1.0.6.standalone.zip; - md5 = "459cae849eceef04cd65fd6fb54affcc"; + sha256 = "0l2s3jqi5clzj5jz962i7gmy8ims51ma60mm5iflsl00dwbmgrqf"; }; inherit unzip; From 06e8b84a3f817f2085787efd6311148e3655c0b6 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:42:33 -0400 Subject: [PATCH 039/195] libb64: md5->sha256 --- pkgs/development/libraries/libb64/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index c02e345346d..09c5444a644 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.draios.com/dependencies/libb64-1.2.src.zip"; - md5 = "a609809408327117e2c643bed91b76c5"; + sha256 = "1lxzi6v10qsl2r6633dx0zwqyvy0j19nmwclfd0d7qybqmhqsg9l"; }; buildInputs = [ unzip ]; From 5c73b31a62b1dbb2726bced89a7ed735ebec316e Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:45:43 -0400 Subject: [PATCH 040/195] libcdaudio: md5->sha256 --- pkgs/development/libraries/libcdaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index aca2d056f8f..5ae17fe78f0 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libcdaudio-0.99.12"; src = fetchurl { url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz ; - md5 = "63b49cf14d53eed31e7a87cca17a3963" ; + sha256 = "1g3ba1n12g8h7pps0vlxx8di6cmf108mbcvbl6hj8x71ndkglygb" ; }; meta = { From 3127d1a0f4013bd50d7c6b239a61b81d381a4857 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 5 Sep 2016 20:49:46 -0400 Subject: [PATCH 041/195] libjpeg-6b: md5->sha256 --- pkgs/development/libraries/libjpeg/62.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjpeg/62.nix b/pkgs/development/libraries/libjpeg/62.nix index 40e2ae62de7..3ae8cfac39c 100644 --- a/pkgs/development/libraries/libjpeg/62.nix +++ b/pkgs/development/libraries/libjpeg/62.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz; - md5 = "dbd5f3b47ed13132f04c685d608a7547"; + sha256 = "0pg34z6rbkk5kvdz6wirf7g4mdqn5z8x97iaw17m15lr3qjfrhvm"; }; inherit libtool; From 36e8df19e12363627a25c4dc6e96e99bb66233eb Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 03:59:25 +0200 Subject: [PATCH 042/195] tomcat5: remove since it's end of life (#18341) Source is not available anymore. --- pkgs/servers/http/tomcat/5.0.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 19 deletions(-) delete mode 100644 pkgs/servers/http/tomcat/5.0.nix diff --git a/pkgs/servers/http/tomcat/5.0.nix b/pkgs/servers/http/tomcat/5.0.nix deleted file mode 100644 index c15604cb0ae..00000000000 --- a/pkgs/servers/http/tomcat/5.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, jdk}: - -stdenv.mkDerivation { - - name = "jakarta-tomcat-5.0.27"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://apache.essentkabel.com/jakarta/tomcat-5/v5.0.27/bin/jakarta-tomcat-5.0.27.tar.gz; - md5 = "b802ee042677e284bcf65738c7bdc3b6"; - }; - - inherit jdk; -} - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8701c933266..cbb2207e929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10725,8 +10725,6 @@ in slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); - tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; - tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { }; tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { }; From 9a2065ff2a44791ebe0886a2dba3904bf4dc7a9d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 5 Sep 2016 19:02:57 +0200 Subject: [PATCH 043/195] batman-adv: 2016.2 -> 2016.3 --- pkgs/os-specific/linux/batman-adv/alfred.nix | 8 ++++---- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/default.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index b58beab94b3..885aec52dc7 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gpsd, libcap }: +{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2016.2"; + ver = "2016.3"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "19025arn926lhn54ss4gmmdss9z4a3yxk4ja5kyv17mi5i4yg7j6"; + sha256 = "0a92n570hrsh58ivr29c0lkjs7y6zxi1hk0l5mvaqs7k3w7z691l"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gpsd libcap ]; + buildInputs = [ gpsd libcap libnl ]; preBuild = '' makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 5dafc3d2668..279261745fb 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2016.2"; + ver = "2016.3"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0bf5zlpwxvq4blcgpwjgh8ms4lfapwjpjl4sczwf3i1rv7f4p05q"; + sha256 = "0ckh11dw9l6kljwa953384y295jd36x4kwzcw5wpplnx7rkg42cj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 65fcd07a6e0..3170569d563 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,14 +2,14 @@ #assert stdenv.lib.versionOlder kernel.version "3.17"; -let base = "batman-adv-2016.2"; in +let base = "batman-adv-2016.3"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0pj6jans75pxw9arp1747kmmk72zbc2vgkf2a0w565pj98x1nlk1"; + sha256 = "0rzhgj0g2hwlrzr8l9ymj6s60vk2zpk1a8x1lm4lhnhsqs9qj4kf"; }; hardeningDisable = [ "pic" ]; From 0b469a6725a932456bea616a42bc8fdd313db80c Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Tue, 6 Sep 2016 05:22:06 +0300 Subject: [PATCH 044/195] man-db: set troff command correctly (#18333) Signed-off-by: Ram Kromberg --- pkgs/tools/misc/man-db/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 21ce5289486..9724278b608 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpipeline db groff ]; + troff="${groff}/bin/groff"; configureFlags = [ "--disable-setuid" From c442c7172da26802c311e67d4e27399f7cb6dfee Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 6 Sep 2016 11:25:18 +0800 Subject: [PATCH 045/195] ledger-web: do not make our own wrapper --- pkgs/applications/office/ledger-web/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index b7ba10a730f..95f91351a54 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, bundlerEnv, ruby +{ stdenv, lib, fetchFromGitHub, bundlerEnv, ruby , withPostgresql ? true, postgresql , withSqlite ? false, sqlite }: @@ -8,7 +8,7 @@ let cmd = "ledger_web"; env = bundlerEnv { - name = _name; + name = "${_name}-env"; inherit ruby; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { name = "${_name}-${version}"; version = "1.5.2"; - buildInputs = [ env ruby makeWrapper ] + buildInputs = [ env ruby ] ++ lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; @@ -39,14 +39,10 @@ in stdenv.mkDerivation rec { dontStrip = true; installPhase = '' - mkdir -p $out + mkdir -p $out/bin - cp --no-preserve=mode -r bin lib $out + cp --no-preserve=mode -r lib $out - chmod 0755 $out/bin/${cmd} - - wrapProgram $out/bin/${cmd} \ - --set BUNDLE_BIN ${env.bundler}/bin/bundle \ - --set GEM_PATH ${env}/${env.ruby.gemPath} + ln -s ${env}/bin/${cmd} $out/bin/${cmd} ''; } From 47e6d7d88cd1dba06ce0fe8fbf810c9439c1c13f Mon Sep 17 00:00:00 2001 From: Sheena Artrip Date: Tue, 6 Sep 2016 00:16:42 -0400 Subject: [PATCH 046/195] minizinc: init at 2.0.14 (#18308) --- pkgs/development/tools/minizinc/default.nix | 35 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/tools/minizinc/default.nix diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix new file mode 100644 index 00000000000..cd9bf94b904 --- /dev/null +++ b/pkgs/development/tools/minizinc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, flex, bison }: +let + version = "2.0.14"; +in +stdenv.mkDerivation { + name = "minizinc-${version}"; + + buildInputs = [ cmake flex bison ]; + + src = fetchFromGitHub { + rev = "${version}"; + owner = "MiniZinc"; + repo = "libminizinc"; + sha256 = "02wy91nv79lrvvhhimcxp7sqz5wd457n1n68zl7qcsm5vfn1hm4q"; + }; + + # meta is all the information about the package.. + meta = with stdenv.lib; { + homepage = "http://www.minizinc.org/"; + description = "MiniZinc is a medium-level constraint modelling language."; + + longDescription = '' + MiniZinc is a medium-level constraint modelling + language. It is high-level enough to express most + constraint problems easily, but low-level enough + that it can be mapped onto existing solvers easily and consistently. + It is a subset of the higher-level language Zinc. + ''; + + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = [ maintainers.sheenobu ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbb2207e929..bce6aaca50b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6567,6 +6567,8 @@ in minify = callPackage ../development/web/minify { }; + minizinc = callPackage ../development/tools/minizinc { }; + mk = callPackage ../development/tools/build-managers/mk { }; msitools = callPackage ../development/tools/misc/msitools { }; From 3d03d3e6155983155109bb2a3b4cbce1080ff858 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 5 Sep 2016 14:40:22 +0000 Subject: [PATCH 047/195] libvirt and pythonPackages.libvirt: 2.1.0 -> 2.2.0 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 0f9b5b5155b..fd9fd168db7 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,11 +9,11 @@ # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0sriasjc573c519yqw1hcfb3qqjcsm9hm8vayw0anwkl6di9ay8s"; + sha256 = "168ng4k5sik2jiylrlpmqdj3g8hnmsmvh84y8nvfgc7fdbbah5g3"; }; patches = [ ./build-on-bsd.patch ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4ac1b8afa9..34302b1f522 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26969,13 +26969,13 @@ in modules // { }; libvirt = let - version = "2.1.0"; + version = "2.2.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "1jxsxnhy303l3wpxzkyip39yq65zwc0pxni6ww0jgnv0pshpz23l"; + sha256 = "0xpamw9gjmahvrbfkxjlplgdbhjr35vpp3a942bmw9qqy2rjwsxs"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; From 6c6ebf5d33fea5dd55e6753840372837d40f2477 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 6 Sep 2016 15:17:14 +0800 Subject: [PATCH 048/195] syncthing: 0.14.5 -> 0.14.6 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 276550e3afd..99a9e7462c2 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.14.5"; + version = "0.14.6"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "172ca3xgc3dp9yiqm3fmq696615jnclgfg521sh5mk78na1r4mgz"; + sha256 = "1w8a46c6r3rddfl9xbx7j2mavai4dm9h8flpm4qr0bsd6whf60hz"; }; buildInputs = [ go ]; From 28ceb0f31a32f70ac90ac68fe405438ae1498ad3 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 6 Sep 2016 10:26:18 +0200 Subject: [PATCH 049/195] haskellPackages.lens: Fix dependencies for ghc7.10.x --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index aebbf4934b6..211817baa9e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -219,6 +219,7 @@ self: super: { # also tests require bytestring>=0.10.8.1 cereal = dontCheck (addBuildDepend super.cereal self.fail); cereal_0_5_2_0 = dontCheck (addBuildDepend super.cereal_0_5_2_0 self.fail); + lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; From e7afac83c95c7ac03a1d82c5bdd94feebb44aec8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 6 Sep 2016 04:58:34 -0400 Subject: [PATCH 050/195] ffmpeg3: fix darwin build (#18350) --- pkgs/development/libraries/ffmpeg/3.1.nix | 3 ++- .../development/libraries/ffmpeg/sdk_detection.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/ffmpeg/sdk_detection.patch diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix index c0e70f1f348..fd5ce7c19d8 100644 --- a/pkgs/development/libraries/ffmpeg/3.1.nix +++ b/pkgs/development/libraries/ffmpeg/3.1.nix @@ -1,4 +1,4 @@ -{ callPackage +{ stdenv, callPackage # Darwin frameworks , Cocoa, CoreMedia , ... @@ -9,4 +9,5 @@ callPackage ./generic.nix (args // rec { branch = "3.1"; sha256 = "0f4ajs0c4088nkal4gqagx05wfyhd1izfxmzxxsdh56ibp38kg2q"; darwinFrameworks = [ Cocoa CoreMedia ]; + patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; }) diff --git a/pkgs/development/libraries/ffmpeg/sdk_detection.patch b/pkgs/development/libraries/ffmpeg/sdk_detection.patch new file mode 100644 index 00000000000..f0b8789c66b --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/sdk_detection.patch @@ -0,0 +1,12 @@ +diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c +--- a/libavcodec/audiotoolboxdec.c ++++ b/libavcodec/audiotoolboxdec.c +@@ -32,7 +32,7 @@ + #include "libavutil/opt.h" + #include "libavutil/log.h" + +-#ifndef __MAC_10_11 ++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 + #define kAudioFormatEnhancedAC3 'ec-3' + #endif + From 3f1ceae281b0800ab6e65342ae347edeae84cebb Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 6 Sep 2016 11:45:19 +0100 Subject: [PATCH 051/195] Partially revert "Revert "nixos: remove rsync from base install and add explicit path in nixos-install"" This partially reverts commit 0aa75206705afc71b991cceeede644c87088d583. Fine for rsync to be in system path but we still need the explicit path in nixos-install in case it is invoked from non-NixOS systems and also to fix OVA test failure See also https://github.com/NixOS/nixpkgs/commit/0aa75206705afc71b991cceeede644c87088d583 cc @edolstra --- nixos/modules/installer/tools/nixos-install.sh | 2 +- nixos/modules/installer/tools/tools.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index f1d2e69b28c..0a452b86018 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -169,7 +169,7 @@ if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> / for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do echo " $i" chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit - rsync -a $i $mountPoint/nix/store/ + @rsync@/bin/rsync -a $i $mountPoint/nix/store/ done # Register the paths in the Nix closure as valid. This is necessary diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index d7302269890..fc39a653abd 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -21,7 +21,7 @@ let name = "nixos-install"; src = ./nixos-install.sh; - inherit (pkgs) perl pathsFromGraph; + inherit (pkgs) perl pathsFromGraph rsync; nix = config.nix.package.out; cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; root_uid = config.ids.uids.root; From c91dcacf1bc5b608761d0334c2c55a4fc7e33beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 5 Sep 2016 15:43:00 -0300 Subject: [PATCH 052/195] qtcreator: 3.6.1 -> 4.1.0 --- pkgs/development/qtcreator/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index db7da228dee..32caf419b4c 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -6,8 +6,8 @@ with stdenv.lib; let - baseVersion = "3.6"; - revision = "1"; + baseVersion = "4.1"; + revision = "0"; version = "${baseVersion}.${revision}"; in @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; - sha256 = "1qjxy5l76dij3wqakd66prn1i0k1gd3gi4cv38bivk9j0gw12dp5"; + sha256 = "00xlzw01ngza54ssmwz2ryahjlrbniy2q3p174xri1pxvcih4b21"; }; - buildInputs = [ makeWrapper qtbase qtscript qtquickcontrols qtdeclarative ]; + buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; - nativeBuildInputs = [ qmakeHook makeQtWrapper ]; + nativeBuildInputs = [ qmakeHook makeQtWrapper makeWrapper ]; doCheck = false; From 288cf9fa2add18a5f1d91643dc4cccaa55c0f8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 6 Sep 2016 08:59:03 -0300 Subject: [PATCH 053/195] qtcreator: enable checking --- pkgs/development/qtcreator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 32caf419b4c..339ecab870a 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmakeHook makeQtWrapper makeWrapper ]; - doCheck = false; + doCheck = true; enableParallelBuilding = true; From 5cbfbb1553e02c27c40387130384019652dcce2b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 6 Sep 2016 12:33:48 +0200 Subject: [PATCH 054/195] unifont: 9.0.01 -> 9.0.02 See http://lists.gnu.org/archive/html/info-gnu/2016-09/msg00002.html for release announcement --- pkgs/data/fonts/unifont/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 76537c89571..f18305ea3e6 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "9.0.01"; + version = "9.0.02"; ttf = fetchurl { url = "http://fossies.org/linux/unifont/font/precompiled/${name}.ttf"; - sha256 = "0n2vdzrp86bjxfyqgmryrqckmjiiz4jvsfz9amgg3dv2p42y0dhd"; + sha256 = "14a254gpfyr2ssmbxqwfvh6166vc4klnx2vgz4nybx52bnr9qfkm"; }; pcf = fetchurl { url = "http://fossies.org/linux/unifont/font/precompiled/${name}.pcf.gz"; - sha256 = "1n3zff46pk6s2x5y7h76aq7h9wfq2acv77gpmxkhz5iwvbpxgb4z"; + sha256 = "07wn2hlx1x22d2nil0zgsrlgy9b2hdhwly37sr70shp8lkba7wn2"; }; buildInputs = [ mkfontscale mkfontdir ]; From 314c30cbf14088d397e9777acafa659bce7c715a Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 6 Sep 2016 22:53:15 +0900 Subject: [PATCH 055/195] input-methods modules: fix engine description --- nixos/modules/i18n/input-method/fcitx.nix | 7 +++---- nixos/modules/i18n/input-method/ibus.nix | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nixos/modules/i18n/input-method/fcitx.nix b/nixos/modules/i18n/input-method/fcitx.nix index e97bb9f80eb..440f13b4152 100644 --- a/nixos/modules/i18n/input-method/fcitx.nix +++ b/nixos/modules/i18n/input-method/fcitx.nix @@ -20,10 +20,9 @@ in example = literalExample "with pkgs.fcitx-engines; [ mozc hangul ]"; description = let - engines = - lib.concatStringsSep ", " - (map (name: "${name}") - (lib.attrNames pkgs.fcitx-engines)); + enginesDrv = filterAttrs (const isDerivation) pkgs.fcitx-engines; + engines = concatStringsSep ", " + (map (name: "${name}") (attrNames enginesDrv)); in "Enabled Fcitx engines. Available engines are: ${engines}."; }; diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index 097a662c3c6..d64cf2f283b 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -30,10 +30,9 @@ in example = literalExample "with pkgs.ibus-engines; [ mozc hangul ]"; description = let - engines = - lib.concatStringsSep ", " - (map (name: "${name}") - (lib.attrNames pkgs.ibus-engines)); + enginesDrv = filterAttrs (const isDerivation) pkgs.ibus-engines; + engines = concatStringsSep ", " + (map (name: "${name}") (attrNames enginesDrv)); in "Enabled IBus engines. Available engines are: ${engines}."; }; From 1fef99942e47e9e9e37e6c4f16726d2ce85a3eef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Sep 2016 16:07:24 +0200 Subject: [PATCH 056/195] nixos-rebuild: Move the Nix fallback store paths into a separate file --- .../modules/installer/tools/nix-fallback-paths.nix | 5 +++++ nixos/modules/installer/tools/nixos-rebuild.sh | 4 ++-- nixos/modules/installer/tools/tools.nix | 14 +++++++++----- 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 nixos/modules/installer/tools/nix-fallback-paths.nix diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix new file mode 100644 index 00000000000..67a34d8a8dd --- /dev/null +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -0,0 +1,5 @@ +{ + x86_64-linux = "/nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10"; + i686-linux = "/nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10"; +} + diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 80398978983..36700d2bf56 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -261,9 +261,9 @@ fi prebuiltNix() { machine="$1" if [ "$machine" = x86_64 ]; then - echo /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10 + echo @nix_x86_64_linux@ elif [[ "$machine" =~ i.86 ]]; then - echo /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10 + echo @nix_i686_linux@ else echo "$0: unsupported platform" exit 1 diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index fc39a653abd..a35f6ad8ae5 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -32,11 +32,15 @@ let "cp refs $out"; }; - nixos-rebuild = makeProg { - name = "nixos-rebuild"; - src = ./nixos-rebuild.sh; - nix = config.nix.package.out; - }; + nixos-rebuild = + let fallback = import ./nix-fallback-paths.nix; in + makeProg { + name = "nixos-rebuild"; + src = ./nixos-rebuild.sh; + nix = config.nix.package.out; + nix_x86_64_linux = fallback.x86_64-linux; + nix_i686_linux = fallback.i686-linux; + }; nixos-generate-config = makeProg { name = "nixos-generate-config"; From f2ddf2a9be551e5c1baa8b653e1677e0f06e812f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Sep 2016 16:15:22 +0200 Subject: [PATCH 057/195] nix: 1.11.3 -> 1.11.4 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++--- pkgs/tools/package-management/nix/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 67a34d8a8dd..747d9d2bcec 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10"; - i686-linux = "/nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10"; + x86_64-linux = "/nix/store/i4mwf2gpvar7dqvlpp5m86llbq3ahbvb-nix-1.11.4"; + i686-linux = "/nix/store/a3gjrbspb0q4hs3sv5g1y2nza43i8nzv-nix-1.11.4"; + x86_64-darwin = "/nix/store/7v21yd3qpv0nclcy5cqr5njj9bril12s-nix-1.11.4"; } - diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 57d4cd181d2..1563af1374c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -89,10 +89,10 @@ in rec { nix = nixStable; nixStable = common rec { - name = "nix-1.11.3"; + name = "nix-1.11.4"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "054fya7q60nv4mcpnd5pxj4hxafrikdimjknpj46w4jd2fg61237"; + sha256 = "937779ed2efaa3dec210250635401980acb99a6fea6d7374fbaea78231b36d34"; }; }; From b1c83e8928288044d110528642d8af24389ac73b Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Tue, 6 Sep 2016 10:52:01 -0400 Subject: [PATCH 058/195] vagrant: make patches a list (#18364) This has more correct semantics, allows for multiple patches, and makes using overrideDerivation to add/remove patches work as expected. --- pkgs/development/tools/vagrant/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 3f3fd88580f..c9987aea832 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -33,11 +33,13 @@ in stdenv.mkDerivation rec { "-p1" "-d ./opt/vagrant/embedded/gems/gems/vagrant-${version}" ]; - patches = (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mitchellh/vagrant/pull/7611.diff"; - name = "fix_incorrect_ssh_keys_permissions.patch"; - sha256 = "0lqa9xpg79ggp9fc8gzb5lv675ydj2p8l55bx4hs1hf8zz2c1hjf"; - }); + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/mitchellh/vagrant/pull/7611.diff"; + name = "fix_incorrect_ssh_keys_permissions.patch"; + sha256 = "0lqa9xpg79ggp9fc8gzb5lv675ydj2p8l55bx4hs1hf8zz2c1hjf"; + }) + ]; meta = with stdenv.lib; { description = "A tool for building complete development environments"; From 9ab141ce273940e65f5243022d34740e4aa005d0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 6 Sep 2016 16:48:02 +0200 Subject: [PATCH 059/195] vp: fix build --- pkgs/applications/misc/vp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix index c40df820b33..e794b82e2f6 100644 --- a/pkgs/applications/misc/vp/default.nix +++ b/pkgs/applications/misc/vp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, SDL, SDL_image }: +{ stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }: stdenv.mkDerivation rec { name = "vp-${version}"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "08q6xrxsyj6vj0sz59nix9isqz84gw3x9hym63lz6v8fpacvykdq"; }; - buildInputs = [ SDL autoconf automake SDL_image ]; + nativeBuildInputs = [ autoreconfHook ]; - preConfigure = '' - autoreconf -i - ''; + buildInputs = [ SDL SDL_image ]; + + NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; meta = with stdenv.lib; { homepage = http://brlcad.org/~erik/; From 98102ebd92ab52e198271dce02515023baa7d6d5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Sep 2016 17:23:27 +0200 Subject: [PATCH 060/195] Enable the runuser command from util-linux Fixes #14701. --- nixos/modules/programs/shadow.nix | 1 - nixos/modules/security/pam.nix | 21 ++++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 878c9cc0cf0..ce4d46e19bf 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -99,7 +99,6 @@ in groupdel = { rootOK = true; }; login = { startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; }; chpasswd = { rootOK = true; }; - chgpasswd = { rootOK = true; }; }; security.setuidPrograms = [ "su" "chfn" ] diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 77815cd6dcc..814dd21b53d 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -105,6 +105,16 @@ let ''; }; + setEnvironment = mkOption { + type = types.bool; + default = true; + description = '' + Whether the service should set the environment variables + listed in + using pam_env.so. + ''; + }; + setLoginUid = mkOption { type = types.bool; description = '' @@ -284,7 +294,9 @@ let "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"} # Session management. - session required pam_env.so envfile=${config.system.build.pamEnvironment} + ${optionalString cfg.setEnvironment '' + session required pam_env.so envfile=${config.system.build.pamEnvironment} + ''} session required pam_unix.so ${optionalString cfg.setLoginUid "session ${ @@ -477,6 +489,13 @@ in vlock = {}; xlock = {}; xscreensaver = {}; + + runuser = { rootOK = true; unixAuth = false; setEnvironment = false; }; + + /* FIXME: should runuser -l start a systemd session? Currently + it complains "Cannot create session: Already running in a + session". */ + runuser-l = { rootOK = true; unixAuth = false; }; }; }; From 7f98dca782b50e685ee49415a126a32b1e0cb4d8 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 17:39:46 +0200 Subject: [PATCH 061/195] security.acme: the client really needs networking Actually this can be improved since the client only needs network connectivity if it needs to renew the certificate. --- nixos/modules/security/acme.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 3dac558b953..45e8f64046b 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -166,7 +166,8 @@ in ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); acmeService = { description = "Renew ACME Certificate for ${cert}"; - after = [ "network.target" ]; + after = [ "network.target" "network-online.target" ]; + wants = [ "network-online.target" ]; serviceConfig = { Type = "oneshot"; SuccessExitStatus = [ "0" "1" ]; From e84b803300033a030907f351b5a5c6fa671b7bf6 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 17:45:57 +0200 Subject: [PATCH 062/195] security.acme: remove loop when no fallbackHost is given --- nixos/modules/services/web-servers/nginx/default.nix | 7 ++++--- nixos/modules/services/web-servers/nginx/vhost-options.nix | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 6e62606f323..94c442e165b 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -114,17 +114,18 @@ let port = if vhost.port != null then vhost.port else (if ssl then 443 else 80); listenString = toString port + optionalString ssl " ssl http2" + optionalString vhost.default " default"; - acmeLocation = optionalString vhost.enableACME '' + acmeLocation = optionalString vhost.enableACME ('' location /.well-known/acme-challenge { - try_files $uri @acme-fallback; + ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"} root ${vhost.acmeRoot}; auth_basic off; } + '' + (optionalString (vhost.acmeFallbackHost != null) '' location @acme-fallback { auth_basic off; proxy_pass http://${vhost.acmeFallbackHost}; } - ''; + '')); in '' ${optionalString vhost.forceSSL '' server { diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index ee3f68bf805..dcebbc9229f 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -39,8 +39,8 @@ with lib; }; acmeFallbackHost = mkOption { - type = types.str; - default = "0.0.0.0"; + type = types.nullOr types.str; + default = null; description = '' Host which to proxy requests to if acme challenge is not found. Useful if you want multiple hosts to be able to verify the same domain name. From 9d1d0dd546e37b1b71ad83138fe6e8d58270344f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 5 Sep 2016 21:50:47 +0200 Subject: [PATCH 063/195] neural-style: restrict to 64-bit Linux because it wants too much RAM --- pkgs/tools/graphics/neural-style/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/neural-style/default.nix b/pkgs/tools/graphics/neural-style/default.nix index 3eb9a16880a..99421cfde17 100644 --- a/pkgs/tools/graphics/neural-style/default.nix +++ b/pkgs/tools/graphics/neural-style/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { description = ''A torch implementation of the paper A Neural Algorithm of Artistic Style''; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + # Eats a lot of RAM + platforms = ["x86_64-linux"]; }; } From 4ae17801aff4549e7b30d1c38e46f12589349367 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 5 Sep 2016 22:14:04 +0200 Subject: [PATCH 064/195] mbedtls_1_3; init at 1.3.17 --- pkgs/development/libraries/mbedtls/1.3.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/mbedtls/1.3.nix diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix new file mode 100644 index 00000000000..9bb7a5fa003 --- /dev/null +++ b/pkgs/development/libraries/mbedtls/1.3.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "mbedtls-1.3.17"; + + src = fetchurl { + url = "https://tls.mbed.org/download/${name}-gpl.tgz"; + sha256 = "10nviv3d8w6sp3kn3yzdpssvzqxdbr4kg38g7rg930q2hlzb9gpm"; + }; + + nativeBuildInputs = [ perl ]; + + postPatch = '' + patchShebangs . + ''; + + makeFlags = [ + "SHARED=1" + ]; + + installFlags = [ + "DESTDIR=\${out}" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://tls.mbed.org/; + description = "Portable cryptographic and SSL/TLS library, aka polarssl"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62b06879341..1c41e5c8937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8766,6 +8766,7 @@ in matio = callPackage ../development/libraries/matio { }; mbedtls = callPackage ../development/libraries/mbedtls { }; + mbedtls_1_3 = callPackage ../development/libraries/mbedtls/1.3.nix { }; mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds_0_12_1 = callPackage ../development/libraries/mdds/0.12.1.nix { }; From b30ead6e54039b7f8e5e093d351ea8e678d75b19 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 00:10:15 +0200 Subject: [PATCH 065/195] cunit: 2.1-2 -> 2.1-3 --- pkgs/tools/misc/cunit/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 3bfb7bf65f1..dfa6bf71bb4 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: stdenv.mkDerivation rec { - name = "CUnit-2.1-2"; + name = "CUnit-${version}"; + version = "2.1-3"; + + buildInputs = [autoconf automake libtool autoreconfHook]; src = fetchurl { - url = "mirror://sourceforge/cunit/${name}-src.tar.bz2"; - sha256 = "1slb2sybv886ys0qqikb8lzn0h9jcqfrv64lakdxmqbgncq5yw0z"; + url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2"; + sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm"; }; meta = { From bcd3dcfc2bdb554ebc078cfea94ee9fafda06afc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 00:15:24 +0200 Subject: [PATCH 066/195] bcunit: init at 3.0 --- pkgs/tools/misc/bcunit/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/misc/bcunit/default.nix diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix new file mode 100644 index 00000000000..b1ca28a7ca9 --- /dev/null +++ b/pkgs/tools/misc/bcunit/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchFromGitHub, cmake}: +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + baseName = "bcunit"; + version = "3.0"; + buildInputs = [cmake]; + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "1kdq9w8i3nypfz7d43rmv1csqrqpip9p8xfa7vyp52aqkmhrby9l"; + }; + + meta = { + inherit version; + description = ''A fork of CUnit test framework''; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c41e5c8937..000c8dabaf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1262,6 +1262,7 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; cunit = callPackage ../tools/misc/cunit { }; + bcunit = callPackage ../tools/misc/bcunit { }; curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; From 308f85a42e99115d4b7a5a0dc17dcd7fab04f438 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 00:16:45 +0200 Subject: [PATCH 067/195] bctoolbox: init at 0.2.0 --- .../libraries/bctoolbox/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/bctoolbox/default.nix diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix new file mode 100644 index 00000000000..69faf913abf --- /dev/null +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchFromGitHub, cmake, mbedtls, bcunit, srtp}: +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + baseName = "bctoolbox"; + version = "0.2.0"; + buildInputs = [cmake mbedtls bcunit srtp]; + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "09mjqdfjxy4jy1z68b2i99hgkbnhhk7vnbfhj9sdpd1p3jk2ha33"; + }; + + meta = { + inherit version; + description = ''Utilities library for Linphone''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 000c8dabaf8..bafe3635910 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6935,6 +6935,10 @@ in babl = callPackage ../development/libraries/babl { }; + bctoolbox = callPackage ../development/libraries/bctoolbox { + mbedtls = mbedtls_1_3; + }; + beecrypt = callPackage ../development/libraries/beecrypt { }; beignet = callPackage ../development/libraries/beignet { From 8f284c0a941a402039266d1fb07edde55635dceb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 09:57:19 +0200 Subject: [PATCH 068/195] antlr3_5: init at 3.5.2 --- pkgs/development/tools/parsing/antlr/3.5.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/parsing/antlr/3.5.nix diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix new file mode 100644 index 00000000000..5e10003dd6f --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, jre}: + +stdenv.mkDerivation rec { + name = "antlr-${version}"; + version = "3.5.2"; + src = fetchurl { + url ="http://www.antlr3.org/download/antlr-${version}-complete.jar"; + sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6"; + }; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p "$out"/{lib/antlr,bin} + cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" + + echo "#! ${stdenv.shell}" >> "$out/bin/antlr" + echo "'${jre}/bin/java' -cp '$out/lib/antlr/antlr-${version}-complete.jar' -Xms200M -Xmx400M org.antlr.Tool \"\$@\"" >> "$out/bin/antlr" + + chmod a+x "$out/bin/antlr" + ln -s "$out/bin/antlr"{,3} + ''; + + inherit jre; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bafe3635910..b5597918c71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6130,6 +6130,7 @@ in antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3 = callPackage ../development/tools/parsing/antlr { }; + antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; ant = self.apacheAnt; From 592e265caae8ec156b6b3a6a3b96f082a5368e18 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 10:07:14 +0200 Subject: [PATCH 069/195] antlr3_4: init at 3.4 --- pkgs/development/tools/parsing/antlr/3.4.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/parsing/antlr/3.4.nix diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix new file mode 100644 index 00000000000..a92e8aa7251 --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, jre}: + +stdenv.mkDerivation rec { + name = "antlr-${version}"; + version = "3.4"; + src = fetchurl { + url ="http://www.antlr3.org/download/antlr-${version}-complete.jar"; + sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx"; + }; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p "$out"/{lib/antlr,bin} + cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" + + echo "#! ${stdenv.shell}" >> "$out/bin/antlr" + echo "'${jre}/bin/java' -cp '$out/lib/antlr/antlr-${version}-complete.jar' -Xms200M -Xmx400M org.antlr.Tool \"\$@\"" >> "$out/bin/antlr" + + chmod a+x "$out/bin/antlr" + ln -s "$out/bin/antlr"{,3} + ''; + + inherit jre; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5597918c71..ceccce80100 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6130,6 +6130,7 @@ in antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3 = callPackage ../development/tools/parsing/antlr { }; + antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; ant = self.apacheAnt; From e662a8ee6d38e111c118a1a41010979425e76bb9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 10:07:52 +0200 Subject: [PATCH 070/195] belle-sip: 1.4.2 -> 1.5.0 --- .../libraries/belle-sip/default.nix | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 4711a8baa36..b055b2358a5 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -1,35 +1,26 @@ -{ stdenv, fetchurl, libantlr3c, jre, polarssl }: +{ stdenv, fetchurl, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub + , cmake, zlib, bctoolbox +}: -let - # We must use antlr-3.4 with belle-sip-1.4.0 - # We might be able to use antlr-3.5+ in the future - antlr = fetchurl { - url = "http://www.antlr3.org/download/antlr-3.4-complete.jar"; - sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx"; - }; -in stdenv.mkDerivation rec { - name = "belle-sip-1.4.2"; + baseName = "belle-sip"; + version = "1.5.0"; + name = "${baseName}-${version}"; - src = fetchurl { - url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz"; - sha256 = "0c48jh3kjz58swvx1m63ijx5x0c0hf37d803d99flk2l10kbfb42"; + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "0hnm64hwgq003wicz6c485fryjfhi820fgin8ndknq60kvwxsrzn"; }; - nativeBuildInputs = [ jre ]; + nativeBuildInputs = [ jre cmake ]; + + buildInputs = [ zlib ]; NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - # belle-sip.pc doesn't have a library path for antlr3c or polarssl - propagatedBuildInputs = [ libantlr3c polarssl ]; - - postPatch = '' - mkdir -p $TMPDIR/share/java - cp ${antlr} $TMPDIR/share/java/antlr.jar - - sed -i "s,\(antlr_java_prefixes=\).*,\1\"$TMPDIR/share/java\"," configure - cat configure | grep antlr_java - ''; + propagatedBuildInputs = [ antlr3_4 libantlr3c polarssl bctoolbox ]; configureFlags = [ "--with-polarssl=${polarssl}" From 599653de5412d4aa36366aa33fb9e2af512fcecc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 11:16:14 +0200 Subject: [PATCH 071/195] ortp: 0.25.0 -> 0.27.0 --- pkgs/development/libraries/ortp/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 15bd39a031f..f05811f3481 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }: stdenv.mkDerivation rec { - name = "ortp-${version}"; - version = "0.25.0"; + baseName = "ortp"; + version = "0.27.0"; + name = "${baseName}-${version}"; - src = fetchurl { - url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz"; - sha256 = "16ldzrn1268dr6kdl8mibg2knd6w75a1v0iqfsgk5zdig5mq5sqd"; + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "0gjaaph4pamay9gn1yn7ky5wyzhj93r53rwak7h8s48vf08fqyv7"; }; + buildInputs = [ bctoolbox ]; + nativeBuildInputs = [ cmake ]; + meta = with stdenv.lib; { description = "A Real-Time Transport Protocol (RFC3550) stack"; homepage = http://www.linphone.org/index.php/eng/code_review/ortp; From 0bfe4bb9e8a7ab9475c4a86b02b27ef66949d83d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 11:28:54 +0200 Subject: [PATCH 072/195] mediastreamer2: 2.12.1 -> 2.14.0 --- .../libraries/mediastreamer/default.nix | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 164960a5283..06cc53abb56 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,39 +1,34 @@ { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp -, ortp, libv4l, libpcap, srtp, vim +, ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen +, python, libXext, libmatroska, openssl }: stdenv.mkDerivation rec { - name = "mediastreamer-2.12.1"; + baseName = "mediastreamer2"; + version = "2.14.0"; + name = "${baseName}-${version}"; - src = fetchurl { - url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz"; - sha256 = "1rzjh2ln8qd6jvfmxlnbrcx2vbajx2j9hblqq2gdn10sf97qvgqd"; + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "1b59rzsaw54mhy4pz9hndmim4rgidkn7s6c4iyl34mz58lwxpmqp"; }; patches = [ ./plugins_dir.patch ]; - postPatch = '' - sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure - ''; - - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ]; propagatedBuildInputs = [ alsaLib libpulseaudio speex gsm libopus ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp - ortp libv4l libpcap srtp - vim + ortp libv4l libpcap srtp bctoolbox libXext libmatroska + openssl ]; - configureFlags = [ - "--enable-external-ortp" - "--with-srtp=${srtp}" - "--enable-xv" - "--enable-glx" - ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = " -DGIT_VERSION=\"v2.14.0\" -Wno-error=deprecated-declarations "; + NIX_LDFLAGS = " -lXext -lssl "; meta = with stdenv.lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; From 13092a7ff9747aa18ab755986afc5d75f55ce87a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 17:40:10 +0200 Subject: [PATCH 073/195] mediastreamer-openh264: 1.0.0 -> git version from Belledonne Communications fork (Linphone upstream) 2016-08-01 --- .../libraries/mediastreamer/msopenh264.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index e312c730ab2..47b7029927c 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 +, fetchgit, cmake +}: stdenv.mkDerivation rec { name = "mediastreamer-openh264-${version}"; - version = "1.0.0"; + version = "0.0pre20160801"; - src = fetchurl { - url = "http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/msopenh264-${version}.tar.gz"; - sha256 = "1622ma8g4yqvxa8pqwddsmhlpwak31i8zfl88f60k71k4dplw845"; + src = fetchgit { + url = "git://git.linphone.org/msopenh264.git"; + rev = "4cb4b134bf0f1538fd0c2c928eee2d5388115abc"; + sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k"; }; buildInputs = [ autoreconfHook pkgconfig mediastreamer openh264 ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "H.264 encoder/decoder plugin for mediastreamer2"; From 5c686923de8f947627cd4580fbf718fc24c5021f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 18:17:14 +0200 Subject: [PATCH 074/195] linphone: 3.8.5 -> 3.10.2 --- .../instant-messengers/linphone/default.nix | 34 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index e46151f1c0e..55187f33598 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,32 +1,36 @@ { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip -, mediastreamer-openh264, makeWrapper +, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake +, libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl }: stdenv.mkDerivation rec { - name = "linphone-${version}"; - major = "3.9"; - version = "${major}.1"; + baseName = "linphone"; + version = "3.10.2"; + name = "${baseName}-${version}"; - src = fetchurl { - url = "mirror://savannah/linphone/${major}.x/sources/${name}.tar.gz"; - sha256 = "1b14gwq36d0sbn1125if9zydll9kliigk19zchbqiy9n2gjymrl4"; + src = fetchFromGitHub { + owner = "BelledonneCommunications"; + repo = "${baseName}"; + rev = "${version}"; + sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p"; }; buildInputs = [ readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 - libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip + polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip + bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango ]; - nativeBuildInputs = [ intltool pkgconfig makeWrapper ]; + nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ]; - configureFlags = [ - "--enable-ldap" - "--with-ffmpeg=${ffmpeg.dev}" - "--enable-external-ortp" - "--enable-external-mediastreamer" - ]; + NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0 + -I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/ + -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 + -I${gtk2}/lib/gtk-2.0/include + -DLIBLINPHONE_GIT_VERSION=\"v${version}\" + "; postInstall = '' for i in $(cd $out/bin && ls); do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ceccce80100..97d6dbe741d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13881,7 +13881,7 @@ in links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/instant-messengers/linphone rec { - ffmpeg = ffmpeg_2; + polarssl = mbedtls_1_3; }; linuxsampler = callPackage ../applications/audio/linuxsampler { From 472ac50f5b10f4b3b4bfc03399dc2e34425f18b6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 18:26:58 +0200 Subject: [PATCH 075/195] octave: forbid 32-bit builds of the octaveFull version, looks like too much memory needed --- pkgs/development/interpreters/octave/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 68365b27a44..f9afb190f66 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -2,7 +2,7 @@ , libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null -, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null +, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, platforms ? null }: let @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = http://octave.org/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with stdenv.lib.platforms; if platforms == null then linux ++ darwin else platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97d6dbe741d..9fc8932fe65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5874,6 +5874,7 @@ in }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { qt = qt4; + platforms = ["x86_64-linux" "x86_64-darwin"]; })); ocropus = callPackage ../applications/misc/ocropus { }; From 71fe391ac1e3199475b4bf601ddfbae37f48509e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 19:09:54 +0200 Subject: [PATCH 076/195] baresip: fix build by manually forcing feature flags for fresh glibc time.h --- .../networking/instant-messengers/baresip/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index e4a732ba66d..c671ea0a586 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; - NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm ''; + NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm + -DHAVE_INTTYPES_H -D__GLIBC__ + -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; From 6b075ee8b1f8d758596c8144870382dbef340a5e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 19:31:38 +0200 Subject: [PATCH 077/195] openlibm: 0.4.1 -> 0.5.4 --- .../libraries/science/math/openlibm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index e38e6c9e31f..f77ac7d89a3 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "openlibm-0.4.1"; +stdenv.mkDerivation rec { + name = "openlibm-${version}"; + version = "0.5.4"; src = fetchurl { - url = "https://github.com/JuliaLang/openlibm/archive/v0.4.1.tar.gz"; + url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; sha256 = "0cwqqqlblj3kzp9aq1wnpfs1fl0qd1wp1xzm5shb09w06i4rh9nn"; }; From d0c2c9957126aec9c8c615ea999e45ff70acbad1 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 6 Sep 2016 19:27:25 +0200 Subject: [PATCH 078/195] ugarit: bump aes input from 1.3 to 1.5 --- pkgs/tools/backup/ugarit/eggs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/tools/backup/ugarit/eggs.nix index 25260674f1f..cd7cde778fa 100644 --- a/pkgs/tools/backup/ugarit/eggs.nix +++ b/pkgs/tools/backup/ugarit/eggs.nix @@ -1,12 +1,12 @@ { pkgs, stdenv, eggDerivation, fetchegg }: rec { aes = eggDerivation { - name = "aes-1.3"; + name = "aes-1.5"; src = fetchegg { name = "aes"; - version = "1.3"; - sha256 = "0zhkqdms2f9if1j5v8myay2mfiislvpj3bcqawb4s4dw0qcp20kb"; + version = "1.5"; + sha256 = "0gjlvz5nk0fnaclljpyfk21rkf0nidjj6wcv3jbnpmfafgjny5fi"; }; buildInputs = [ From d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Sep 2016 19:56:58 +0200 Subject: [PATCH 079/195] octave: fix overridePlatforms (was just platforms) name collision, thanks to @bjornfor for catching --- pkgs/development/interpreters/octave/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index f9afb190f66..3389620cdd9 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -2,7 +2,7 @@ , libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null -, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, platforms ? null +, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null }: let @@ -70,6 +70,8 @@ stdenv.mkDerivation rec { homepage = http://octave.org/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; - platforms = with stdenv.lib.platforms; if platforms == null then linux ++ darwin else platforms; + platforms = if overridePlatforms == null then + (with stdenv.lib.platforms; linux ++ darwin) + else overridePlatforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fc8932fe65..5bc36f9b828 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5874,7 +5874,7 @@ in }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { qt = qt4; - platforms = ["x86_64-linux" "x86_64-darwin"]; + overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; })); ocropus = callPackage ../applications/misc/ocropus { }; From 3877ec5b2ff7436f4962ac0fe3200833cf78cb8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 6 Sep 2016 17:14:50 +0200 Subject: [PATCH 080/195] Make /var/empty immutable Fixes #14910 and #18358 Deployed to an existing server, restarted sshd and polkit to verify they don't fail. --- .../system/activation/activation-script.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 1c587413121..47550ae76a6 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -12,11 +12,14 @@ let ''; }); - path = map getBin - [ pkgs.coreutils pkgs.gnugrep pkgs.findutils - pkgs.glibc # needed for getent - pkgs.shadow - pkgs.nettools # needed for hostname + path = with pkgs; map getBin + [ coreutils + gnugrep + findutils + glibc # needed for getent + shadow + nettools # needed for hostname + e2fsprogs # needed for chattr ]; in @@ -137,8 +140,13 @@ in mkdir -m 1777 -p /var/tmp + # Make sure it's really empty + chattr -i /var/empty + rm -rf /var/empty + # Empty, read-only home directory of many system accounts. mkdir -m 0555 -p /var/empty + chattr +i /var/empty ''; system.activationScripts.usrbinenv = if config.environment.usrbinenv != null From 28e378d462e65d66f7cbb333487068c95c904164 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 6 Sep 2016 18:22:05 +0000 Subject: [PATCH 081/195] nodePackages.elasticdump: init at 2.4.2 --- .../node-packages/node-packages-v4.nix | 157 ++++++++++++++++++ .../node-packages/node-packages-v5.nix | 107 ++++++++++++ .../node-packages/node-packages.json | 1 + 3 files changed, 265 insertions(+) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 64546ff70a4..b506ea1d269 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -22041,6 +22041,163 @@ in }; production = true; }; + elasticdump = nodeEnv.buildNodePackage { + name = "elasticdump"; + packageName = "elasticdump"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz"; + sha1 = "757c98aea05ee8714f0de2a33224c4136414633e"; + }; + dependencies = [ + (sources."JSONStream-1.1.4" // { + dependencies = [ + sources."jsonparse-1.2.0" + sources."through-2.3.8" + ]; + }) + (sources."async-2.0.1" // { + dependencies = [ + sources."lodash-4.15.0" + ]; + }) + sources."aws4-1.4.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + ]; + }) + (sources."request-2.74.0" // { + dependencies = [ + sources."aws-sign2-0.6.0" + (sources."bl-1.1.2" // { + dependencies = [ + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."inherits-2.0.1" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + sources."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { + dependencies = [ + sources."delayed-stream-1.0.0" + ]; + }) + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-1.0.1" + (sources."har-validator-2.0.6" // { + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."is-my-json-valid-2.13.1" // { + dependencies = [ + sources."generate-function-2.0.0" + (sources."generate-object-property-1.2.0" // { + dependencies = [ + sources."is-property-1.0.2" + ]; + }) + sources."jsonpointer-2.0.0" + sources."xtend-4.0.1" + ]; + }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.0" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.2" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.0" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.13.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + (sources."bcrypt-pbkdf-1.0.0" // { + dependencies = [ + sources."tweetnacl-0.14.3" + ]; + }) + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.1" + sources."tunnel-agent-0.4.3" + ]; + }) + ]; + meta = { + description = "import and export tools for elasticsearch"; + homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; + license = "Apache-2.0"; + }; + production = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; diff --git a/pkgs/development/node-packages/node-packages-v5.nix b/pkgs/development/node-packages/node-packages-v5.nix index f1d7fa59105..8527dbf02e1 100644 --- a/pkgs/development/node-packages/node-packages-v5.nix +++ b/pkgs/development/node-packages/node-packages-v5.nix @@ -19567,6 +19567,113 @@ in }; production = true; }; + elasticdump = nodeEnv.buildNodePackage { + name = "elasticdump"; + packageName = "elasticdump"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz"; + sha1 = "757c98aea05ee8714f0de2a33224c4136414633e"; + }; + dependencies = [ + sources."JSONStream-1.1.4" + sources."async-2.0.1" + sources."aws4-1.4.1" + sources."optimist-0.6.1" + sources."request-2.74.0" + sources."jsonparse-1.2.0" + sources."through-2.3.8" + sources."lodash-4.15.0" + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + sources."aws-sign2-0.6.0" + sources."bl-1.1.2" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-1.0.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.11" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.1" + sources."tunnel-agent-0.4.3" + sources."readable-stream-2.0.6" + sources."core-util-is-1.0.2" + sources."inherits-2.0.1" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."delayed-stream-1.0.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.13.1" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-2.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.0" + (sources."sshpk-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.2" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.13.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + (sources."bcrypt-pbkdf-1.0.0" // { + dependencies = [ + sources."tweetnacl-0.14.3" + ]; + }) + sources."mime-db-1.23.0" + ]; + meta = { + description = "import and export tools for elasticsearch"; + homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; + license = "Apache-2.0"; + }; + production = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 48225ecdb09..650f2642013 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -9,6 +9,7 @@ , "cordova" , "dnschain" , "docker-registry-server" +, "elasticdump" , "eslint" , "fetch-bower" , "forever" From 2bf421d197564ce728f9636e237976f5590c71d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 1 Sep 2016 17:01:00 +0200 Subject: [PATCH 082/195] mcelog: add utillinux as dependency Fixes this: $ sudo mcelog ... unknown-error-trigger: line 21: logger: command not found unknown-error-trigger: line 22: logger: command not found --- pkgs/os-specific/linux/mcelog/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 2d743035e14..f9969fa79fd 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, utillinux }: stdenv.mkDerivation rec { name = "mcelog-${version}"; @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { touch mcelog.conf.5 # avoid regeneration requiring Python substituteInPlace Makefile --replace '"unknown"' '"${version}"' + + for i in triggers/*; do + substituteInPlace $i --replace 'logger' '${utillinux}/bin/logger' + done ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bc36f9b828..ce7a23579ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -908,7 +908,9 @@ in mstflint = callPackage ../tools/misc/mstflint { }; - mcelog = callPackage ../os-specific/linux/mcelog { }; + mcelog = callPackage ../os-specific/linux/mcelog { + utillinux = utillinuxMinimal; + }; apparix = callPackage ../tools/misc/apparix { }; From 81eb0c20f8b5af2da92ef126f304cd1bb32b1621 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 6 Sep 2016 21:58:42 +0300 Subject: [PATCH 083/195] honcho: Fix hash --- pkgs/tools/system/honcho/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index 566d9e168ec..7c33d2e166d 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchzip, pythonPackages, buildPythonApplication }: +{ stdenv, fetchFromGitHub, pythonPackages, buildPythonApplication }: let honcho = buildPythonApplication rec { name = "honcho-${version}"; version = "0.6.6"; namePrefix = ""; - src = fetchzip { - url = "https://github.com/nickstenning/honcho/archive/v${version}.tar.gz"; - sha256 = "1ishyzvq19hdln2nn3bjlk0kwfqsbddpypp28n88jp3px6832w02"; + src = fetchFromGitHub { + owner = "nickstenning"; + repo = "honcho"; + rev = "v${version}"; + sha256 = "0lawwcyrrsd9z9jcr94qn1yabl9bzc529jkpc51jq720fhdlfcr0"; }; buildInputs = with pythonPackages; [ nose mock jinja2 ]; From 2ae5fb27239cbf75cee83c1396809d7acc6bbd8d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 6 Sep 2016 22:01:17 +0300 Subject: [PATCH 084/195] pythonPackages.keystoneclient: Disable tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ```` run_tests.sh: interpreter directive changed from "/bin/bash" to "/nix/store/nyj6xd7s1n1w8c0xdwk5ddhi7bjcyi9x-bash-4.3-p46/bin/bash" No virtual environment found...create one? (Y/n) builder for ‘/nix/store/qcrhq2f7llvzyc37ili94ff50z7vlgn3-python2.7-keystoneclient-1.8.1.drv’ failed with exit code 1 error: build of ‘/nix/store/qcrhq2f7llvzyc37ili94ff50z7vlgn3-python2.7-keystoneclient-1.8.1.drv’ failed ```` --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34302b1f522..350843e3df7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23750,7 +23750,7 @@ in modules // { sed -i 's@python@${python.interpreter}@' .testr.conf ''; - doCheck = true; + doCheck = false; # The checkPhase below is broken checkPhase = '' patchShebangs run_tests.sh From 29aac270898118a446255ec00540e5ef258f802c Mon Sep 17 00:00:00 2001 From: asildnes Date: Sat, 3 Sep 2016 14:30:22 +0200 Subject: [PATCH 085/195] st: 0.6 -> 0.7 --- lib/maintainers.nix | 1 + pkgs/applications/misc/st/default.nix | 23 +++++++++---------- .../misc/st/st-fix-deletekey.patch | 15 ++++++++++++ 3 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/misc/st/st-fix-deletekey.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4f46636c860..006a5d36b67 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -33,6 +33,7 @@ anderspapitto = "Anders Papitto "; andres = "Andres Loeh "; andrewrk = "Andrew Kelley "; + andsild = "Anders Sildnes "; aneeshusa = "Aneesh Agrawal "; antono = "Antono Vasiljev "; ardumont = "Antoine R. Dumont "; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index deceba0ea55..704262da5bf 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,33 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft, fontconfig -, conf ? null, patches ? []}: +{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft +, fontconfig, conf ? null, patches ? []}: with stdenv.lib; -stdenv.mkDerivation rec { - name = "st-0.6"; - +let patches' = if isNull patches then [] else patches; +in stdenv.mkDerivation rec { + name = "st-0.7"; + src = fetchurl { url = "http://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"; + sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000"; }; - inherit patches; + patches = patches' ++ [ ./st-fix-deletekey.patch ]; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - - buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; - NIX_LDFLAGS = "-lfontconfig"; + buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out ''; - + meta = { homepage = http://st.suckless.org/; license = stdenv.lib.licenses.mit; - maintainers = with maintainers; [viric]; + maintainers = with maintainers; [viric andsild]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/st/st-fix-deletekey.patch b/pkgs/applications/misc/st/st-fix-deletekey.patch new file mode 100644 index 00000000000..cf009322053 --- /dev/null +++ b/pkgs/applications/misc/st/st-fix-deletekey.patch @@ -0,0 +1,15 @@ +diff --git a/config.def.h b/config.def.h +index 1896246..b41747f 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -315,8 +315,8 @@ static Key key[] = { + { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, + { XK_Delete, ShiftMask, "\033[2K", -1, 0, 0}, + { XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0}, +- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0}, +- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0}, ++ { XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0}, ++ { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0}, + { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0}, + { XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0}, + { XK_Home, ShiftMask, "\033[2J", 0, -1, 0}, From c5e9049ac30948529114f3495d0145d3ac2689de Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 6 Sep 2016 22:28:33 +0300 Subject: [PATCH 086/195] qt5: Fix qt5X.full Use dev outputs explicitly since they aren't the first output since the recent changes. --- pkgs/development/libraries/qt-5/qt-env.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index 11c6ac74d5f..b2b7121d51d 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -1,6 +1,6 @@ -{ runCommand, lndir, qtbase }: name: paths: +{ lib, runCommand, lndir, qtbase }: name: paths: -runCommand name { inherit paths qtbase; } '' +runCommand name { qtbase = qtbase.dev; paths = lib.chooseDevOutputs paths; } '' mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share" From 5100db559a38374e537197185dc9775234b36071 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 6 Sep 2016 23:04:17 +0200 Subject: [PATCH 087/195] rkt: 1.12.0 -> 1.14.0 (#18360) --- pkgs/applications/virtualization/rkt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index f5a6991dc80..d41002d30dc 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -4,15 +4,15 @@ let # Always get the information from # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1097.0.0"; - coreosImageSystemdVersion = "229"; + coreosImageRelease = "1151.0.0"; + coreosImageSystemdVersion = "231"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. stage1Flavours = [ "coreos" "fly" ]; stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.14.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,12 +20,12 @@ in stdenv.mkDerivation rec { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "0fkjhmssxyx2q699zcif5fvnpcs50l9pqrvy680dw670wsl3b7s7"; + sha256 = "0wniknmsv6xml3cp6ggjlqvcpwhp4bw1dqdnbm561mchvm69zhc2"; }; stage1BaseImage = fetchurl { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "0dzp0vsjbipx8mcikrc5l7k3qjrg4y7h63r2nx6cycy7qhcmj85a"; + sha256 = "1j75ad1g217aqar84m9ycl2m71g821hq9yahl4bgjaipx9xnj23g"; }; buildInputs = [ From 247c54e374882443492b19a2275c707b5c25174d Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 6 Sep 2016 17:44:41 -0400 Subject: [PATCH 088/195] souffle: init at 1.0.0 --- lib/licenses.nix | 5 +++ .../development/compilers/souffle/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 48 insertions(+) create mode 100644 pkgs/development/compilers/souffle/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index 3708b1eb15c..a106e072726 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -470,6 +470,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "The Unlicense"; }; + upl = { + fullName = "Universal Permissive License"; + url = "https://oss.oracle.com/licenses/upl/"; + }; + vim = spdx { spdxId = "Vim"; fullName = "Vim License"; diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix new file mode 100644 index 00000000000..68353e6a5d4 --- /dev/null +++ b/pkgs/development/compilers/souffle/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + name = "souffle-${version}"; + + src = fetchFromGitHub { + owner = "souffle-lang"; + repo = "souffle"; + rev = version; + sha256 = "13j14227dgxcm25z9iizcav563wg2ak9338pb03aqqz8yqxbmz4n"; + }; + + buildInputs = [ + autoconf automake boost bison flex openjdk + # Used for docs + doxygen perl graphviz + ]; + + patchPhase = '' + substituteInPlace configure.ac \ + --replace "m4_esyscmd([git describe --tags --abbrev=0 | tr -d '\n'])" "${version}" + ''; + + # Without this, we get an obscure error about not being able to find a library version + # without saying what library it's looking for. Turns out it's searching global paths + # for boost and failing there, so we tell it what's what here. + configureFlags = [ "--with-boost-libdir=${boost}/lib" ]; + + preConfigure = "./bootstrap"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A translator of declarative Datalog programs into the C++ language"; + homepage = "http://souffle-lang.github.io/"; + platforms = platforms.unix; + maintainers = with maintainers; [ copumpkin ]; + license = licenses.upl; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce7a23579ea..acad02a206b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5582,6 +5582,8 @@ in solc = callPackage ../development/compilers/solc { }; + souffle = callPackage ../development/compilers/souffle { }; + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; squeak = callPackage ../development/compilers/squeak { }; From 598ccfdec996a9040f8bdf2cd59f98e591a6212a Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Tue, 6 Sep 2016 08:14:52 -0700 Subject: [PATCH 089/195] transcrypt: 0.9.7 -> 0.9.9 --- .../git-and-tools/transcrypt/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 2f42705c2b8..3047ca02342 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchurl, git, openssl }: +{ stdenv, fetchFromGitHub, git, makeWrapper, openssl }: stdenv.mkDerivation rec { - name = "transcrypt-0.9.7"; + name = "transcrypt-${version}"; + version = "0.9.9"; - src = fetchurl { - url = https://github.com/elasticdog/transcrypt/archive/v0.9.7.tar.gz; - sha256 = "0pgrf74wdc7whvwz7lkkq6qfk38n37dc5668baq7czgckibvjqdh"; + src = fetchFromGitHub { + owner = "elasticdog"; + repo = "transcrypt"; + rev = "v${version}"; + sha256 = "0brsgj3qmvkgxzqqamk8krwyarwff1dlb3jjd09snnbfl0kdq1a5"; }; - buildInputs = [ git openssl ]; + buildInputs = [ git makeWrapper openssl ]; installPhase = '' install -m 755 -D transcrypt $out/bin/transcrypt install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1 install -m 644 -D contrib/bash/transcrypt $out/share/bash-completion/completions/transcrypt install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt + + wrapProgram $out/bin/transcrypt \ + --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl ]}" ''; meta = with stdenv.lib; { From 9d3172f140b42d1d27aaa840690a2095830fdfa6 Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Tue, 6 Sep 2016 23:43:10 +0200 Subject: [PATCH 090/195] adb-sync: Make platforms correspond to those of androidsdk (main dependency). --- pkgs/development/mobile/adb-sync/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index f4adad3ba2b..834460748ca 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d"; }; - preferLocalBuild = true; - buildInputs = [ python androidsdk makeWrapper ]; phases = "installPhase"; @@ -27,7 +25,8 @@ stdenv.mkDerivation rec { description = "A tool to synchronise files between a PC and an Android devices using ADB (Android Debug Bridge)"; homepage = "https://github.com/google/adb-sync"; license = licenses.asl20; - platforms = platforms.all; + platforms = platforms.unix; + hydraPlatforms = []; maintainers = with maintainers; [ scolobb ]; }; } From 9a0535248891e8104f53a7098241900eff8beb3f Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 6 Sep 2016 23:11:27 +0000 Subject: [PATCH 091/195] souffle: work around hardening bug on linux --- pkgs/development/compilers/souffle/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 68353e6a5d4..217b2aecd33 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # See https://github.com/souffle-lang/souffle/issues/176 + hardeningDisable = [ "fortify" ]; + meta = with stdenv.lib; { description = "A translator of declarative Datalog programs into the C++ language"; homepage = "http://souffle-lang.github.io/"; From aed2cd32f8069ae114a82b25648c5e67c060ae39 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 7 Sep 2016 02:55:26 +0300 Subject: [PATCH 092/195] nixos containers: hopefully fix test failures Closes #18377. --- nixos/modules/tasks/filesystems.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index a66ece1020f..3c822c8716d 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -286,11 +286,15 @@ in # Sync mount options with systemd's src/core/mount-setup.c: mount_table. boot.specialFileSystems = { "/proc" = { fsType = "proc"; options = [ "nosuid" "noexec" "nodev" ]; }; - "/sys" = { fsType = "sysfs"; options = [ "nosuid" "noexec" "nodev" ]; }; "/run" = { fsType = "tmpfs"; options = [ "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; }; "/dev" = { fsType = "devtmpfs"; options = [ "nosuid" "strictatime" "mode=755" "size=${config.boot.devSize}" ]; }; "/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; }; "/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "gid=${toString config.ids.gids.tty}" ]; }; + } // optionalAttrs (!config.boot.isContainer) { + # systemd-nspawn populates /sys by itself, and remounting it causes all + # kinds of weird issues (most noticeably, waiting for host disk device + # nodes). + "/sys" = { fsType = "sysfs"; options = [ "nosuid" "noexec" "nodev" ]; }; }; }; From d9db8a9bf55bbc15579358ffca27c576784071ce Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 7 Sep 2016 01:27:23 +0100 Subject: [PATCH 093/195] seq24: fix build failures due to name clash in "mutex" class --- pkgs/applications/audio/seq24/default.nix | 2 + .../audio/seq24/mutex_no_nameclash.patch | 58 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/audio/seq24/mutex_no_nameclash.patch diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index d1de6f1abd4..73fa58a46c4 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1qpyb7355s21sgy6gibkybxpzx4ikha57a8w644lca6qy9mhcwi3"; }; + patches = [ ./mutex_no_nameclash.patch ]; + buildInputs = [ alsaLib gtkmm libjack2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/seq24/mutex_no_nameclash.patch b/pkgs/applications/audio/seq24/mutex_no_nameclash.patch new file mode 100644 index 00000000000..dd82b1b0e09 --- /dev/null +++ b/pkgs/applications/audio/seq24/mutex_no_nameclash.patch @@ -0,0 +1,58 @@ +--- a/src/mutex.cpp ++++ b/src/mutex.cpp +@@ -20,23 +20,23 @@ + + #include "mutex.h" + +-const pthread_mutex_t mutex::recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++const pthread_mutex_t mutex_no_nameclash::recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; + const pthread_cond_t condition_var::cond = PTHREAD_COND_INITIALIZER; + +-mutex::mutex( ) ++mutex_no_nameclash::mutex_no_nameclash( ) + { + m_mutex_lock = recmutex; + } + + void +-mutex::lock( ) ++mutex_no_nameclash::lock( ) + { + pthread_mutex_lock( &m_mutex_lock ); + } + + + void +-mutex::unlock( ) ++mutex_no_nameclash::unlock( ) + { + pthread_mutex_unlock( &m_mutex_lock ); + } +--- a/src/mutex.h ++++ b/src/mutex.h +@@ -24,7 +24,7 @@ + + #include + +-class mutex { ++class mutex_no_nameclash { + + private: + +@@ -37,14 +37,14 @@ + + public: + +- mutex(); ++ mutex_no_nameclash(); + + void lock(); + void unlock(); + + }; + +-class condition_var : public mutex { ++class condition_var : public mutex_no_nameclash { + + private: + From 973fd1aae15a9187e32dbf01d0fdc448a068b0cc Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 7 Sep 2016 01:34:52 +0100 Subject: [PATCH 094/195] haskellPackages.haste-Cabal: mark as broken --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cc13b5ee52c..69acb5c4dba 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -896,7 +896,7 @@ self: super: { dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; }; # Haste stuff - haste-Cabal = self.callPackage ../tools/haskell/haste/haste-Cabal.nix {}; + haste-Cabal = markBroken (self.callPackage ../tools/haskell/haste/haste-Cabal.nix {}); haste-cabal-install = self.callPackage ../tools/haskell/haste/haste-cabal-install.nix { Cabal = self.haste-Cabal; }; haste-compiler = self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; }; From 39e197ab1ccad9f1b57c10afe4cfe592a9e40270 Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 7 Sep 2016 02:27:39 +0100 Subject: [PATCH 095/195] uhub: 0.4.1 -> 0.5.0 (fixes build) @ehmry: please have a look so that we can cherry-pick in release-16.09 and move forward on #18209 --- pkgs/servers/uhub/default.nix | 19 ++-- pkgs/servers/uhub/plugin-dir.patch | 24 ++--- pkgs/servers/uhub/systemd.patch | 164 ----------------------------- 3 files changed, 23 insertions(+), 184 deletions(-) delete mode 100644 pkgs/servers/uhub/systemd.patch diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 0d276c18f2d..8871c01e1a1 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -3,13 +3,13 @@ assert tlsSupport -> openssl != null; -let version = "0.4.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "uhub-${version}"; + version = "0.5.0"; src = fetchurl { url = "http://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2"; - sha256 = "1q0n74fb0h5w0k9fhfkznxb4r46qyfb8g2ss3wflivx4l0m1f9x2"; + sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5"; }; buildInputs = [ cmake sqlite pkgconfig systemd ] ++ stdenv.lib.optional tlsSupport openssl; @@ -19,14 +19,21 @@ stdenv.mkDerivation { "mod_welcome" "mod_logging" "mod_auth_simple" - "mod_auth_sqlite" "mod_chat_history" "mod_chat_only" "mod_topic" "mod_no_guest_downloads" ]; - patches = [ ./plugin-dir.patch ./systemd.patch ]; + patches = [ + ./plugin-dir.patch + + # Fixed compilation on systemd > 210 + (fetchurl { + url = "https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.diff"; + sha256 = "1jp8fvw6f9jh0sdjml9mahkk6p6b96p6rzg2y601mnnbcdj8y8xp"; + }) + ]; cmakeFlags = '' -DSYSTEMD_SUPPORT=ON @@ -40,4 +47,4 @@ stdenv.mkDerivation { maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch index 95ebfd6706f..01cbcbb31cf 100644 --- a/pkgs/servers/uhub/plugin-dir.patch +++ b/pkgs/servers/uhub/plugin-dir.patch @@ -1,23 +1,19 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40e996e..d3b7e6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -185,10 +185,16 @@ else() - # add_definitions(-DDEBUG) - endif() +@@ -241,8 +241,14 @@ -+set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads ) -+ if (UNIX) - install( TARGETS uhub RUNTIME DESTINATION bin ) -- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL ) + install( TARGETS uhub uhub-passwd RUNTIME DESTINATION bin ) +- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_history_sqlite mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL ) - install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL ) + -+ foreach( PLUGIN ${PLUGINS} ) -+ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL ) -+ endforeach( PLUGIN ) ++ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads ) ++ ++ foreach( PLUGIN ${PLUGINS} ) ++ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL ) ++ endforeach( PLUGIN ) + + install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION doc/ OPTIONAL ) + endif() + - if (SQLITE_SUPPORT) - install( TARGETS uhub-passwd RUNTIME DESTINATION bin ) diff --git a/pkgs/servers/uhub/systemd.patch b/pkgs/servers/uhub/systemd.patch deleted file mode 100644 index 05e7571d18d..00000000000 --- a/pkgs/servers/uhub/systemd.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40e996e..fc4fb01 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,6 +19,7 @@ option(LINK_SUPPORT "Allow hub linking" OFF) - option(SSL_SUPPORT "Enable SSL support" ON) - option(USE_OPENSSL "Use OpenSSL's SSL support" ON ) - option(SQLITE_SUPPORT "Enable SQLite support" ON) -+option(SYSTEMD_SUPPORT "Enable systemd notify and journal logging" OFF) - option(ADC_STRESS "Enable the stress tester client" OFF) - - find_package(Git) -@@ -34,6 +35,12 @@ if (SSL_SUPPORT) - endif() - endif() - -+if (SYSTEMD_SUPPORT) -+ INCLUDE(FindPkgConfig) -+ pkg_search_module(SD_DAEMON REQUIRED libsystemd-daemon) -+ pkg_search_module(SD_JOURNAL REQUIRED libsystemd-journal) -+endif() -+ - if (MSVC) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - endif() -@@ -175,6 +182,18 @@ if(SSL_SUPPORT) - endif() - endif() - -+if (SYSTEMD_SUPPORT) -+ target_link_libraries(uhub ${SD_DAEMON_LIBRARIES}) -+ target_link_libraries(uhub ${SD_JOURNAL_LIBRARIES}) -+ target_link_libraries(test ${SD_DAEMON_LIBRARIES}) -+ target_link_libraries(test ${SD_JOURNAL_LIBRARIES}) -+ target_link_libraries(uhub-passwd ${SD_JOURNAL_LIBRARIES}) -+ target_link_libraries(uhub-admin ${SD_JOURNAL_LIBRARIES}) -+ include_directories(${SD_DAEMON_INCLUDE_DIRS}) -+ include_directories(${SD_JOURNAL_INCLUDE_DIRS}) -+ add_definitions(-DSYSTEMD) -+endif() -+ - configure_file ("${PROJECT_SOURCE_DIR}/version.h.in" "${PROJECT_SOURCE_DIR}/version.h") - - mark_as_advanced(FORCE CMAKE_BUILD_TYPE) -diff --git a/src/core/main.c b/src/core/main.c -index bb78672..ac2d2a8 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -19,6 +19,10 @@ - - #include "uhub.h" - -+#ifdef SYSTEMD -+#include -+#endif -+ - static int arg_verbose = 5; - static int arg_fork = 0; - static int arg_check_config = 0; -@@ -145,7 +149,16 @@ int main_loop() - } - #if !defined(WIN32) - setup_signal_handlers(hub); --#endif -+#ifdef SYSTEMD -+ /* Notify the service manager that this daemon has -+ * been successfully initalized and shall enter the -+ * main loop. -+ */ -+ sd_notifyf(0, "READY=1\n" -+ "MAINPID=%lu", (unsigned long) getpid()); -+#endif /* SYSTEMD */ -+ -+#endif /* ! WIN32 */ - } - - hub_set_variables(hub, &acl); -@@ -216,13 +229,17 @@ void print_usage(char* program) - " -q Quiet mode - no output\n" - " -f Fork to background\n" - " -l Log messages to given file (default: stderr)\n" -- " -L Log messages to syslog\n" - " -c Specify configuration file (default: " SERVER_CONFIG ")\n" - " -C Check configuration and return\n" - " -s Show configuration parameters\n" - " -S Show configuration parameters, but ignore defaults\n" - " -h This message\n" - #ifndef WIN32 -+#ifdef SYSTEMD -+ " -L Log messages to journal\n" -+#else -+ " -L Log messages to syslog\n" -+#endif - " -u Run as given user\n" - " -g Run with given group permissions\n" - " -p Store pid in file (process id)\n" -diff --git a/src/util/log.c b/src/util/log.c -index 42badb3..2d97528 100644 ---- a/src/util/log.c -+++ b/src/util/log.c -@@ -21,7 +21,15 @@ - #include - - #ifndef WIN32 -+ -+#ifdef SYSTEMD -+#define SD_JOURNAL_SUPPRESS_LOCATION -+#include -+ -+#else - #include -+#endif -+ - static int use_syslog = 0; - #endif - -@@ -83,7 +91,9 @@ void hub_log_initialize(const char* file, int syslog) - if (syslog) - { - use_syslog = 1; -+ #ifndef SYSTEMD - openlog("uhub", LOG_PID, LOG_USER); -+ #endif - } - #endif - -@@ -132,7 +142,9 @@ void hub_log_shutdown() - if (use_syslog) - { - use_syslog = 0; -+ #ifndef SYSTEMD - closelog(); -+ #endif - } - #endif - } -@@ -212,7 +224,12 @@ void hub_log(int log_verbosity, const char *format, ...) - case log_fatal: level = LOG_CRIT; break; - case log_error: level = LOG_ERR; break; - case log_warning: level = LOG_WARNING; break; -- case log_user: level = LOG_INFO | LOG_AUTH; break; -+ #ifdef SYSTEMD -+ case log_user: level = LOG_INFO; break; -+ -+ #else -+ case log_user: level = LOG_INFO | LOG_AUTH; break; -+ #endif - case log_info: level = LOG_INFO; break; - case log_debug: level = LOG_DEBUG; break; - -@@ -224,8 +241,13 @@ void hub_log(int log_verbosity, const char *format, ...) - if (level == 0) - return; - -+ #ifdef SYSTEMD -+ sd_journal_print(level, "%s", logmsg); -+ -+ #else - level |= (LOG_USER | LOG_DAEMON); - syslog(level, "%s", logmsg); -+ #endif - } - #endif - From 492a90f1c94fca326e60ac1e722eb8bb3cf62bb4 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Wed, 7 Sep 2016 01:39:18 +0000 Subject: [PATCH 096/195] dovecot service: require mail{User,Group} with sieveScripts fixes #17702. --- nixos/modules/services/mail/dovecot.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index f239dda564a..e79d5dadd82 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -271,6 +271,9 @@ in { assertion = cfg.showPAMFailure -> cfg.enablePAM; message = "dovecot is configured with showPAMFailure while enablePAM is disabled"; } + { assertion = (cfg.sieveScripts != {}) -> ((cfg.mailUser != null) && (cfg.mailGroup != null)); + message = "dovecot requires mailUser and mailGroup to be set when sieveScripts is set"; + } ]; }; From d4eac0278ca188aa236b6a7f0fbb15f8ee4273d0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 7 Sep 2016 10:32:06 +0800 Subject: [PATCH 097/195] calibre: 2.64.0 -> 2.66.0 (#18311) A few additional changes: 1. We load patches from debian for improving privacy and security 2. Now with QT 5.6 instead of 5.5 3. We strip bundled python code and use proper upstream instead --- pkgs/applications/misc/calibre/default.nix | 49 +++++++++++++------ .../misc/calibre/no_updates_dialog.patch | 16 ------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 36 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/misc/calibre/no_updates_dialog.patch diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 32759600609..fe5227e395b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,29 +1,50 @@ -{ stdenv, fetchurl, python, pyqt5, sip, poppler_utils, pkgconfig, libpng +{ stdenv, fetchurl, fetchpatch, python, pyqt5, sip, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite , makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils, makeDesktopItem }: stdenv.mkDerivation rec { - version = "2.64.0"; + version = "2.66.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0jjbkhd3n7rh5q6cl6yy51hyjbxmgm6xj7i2a1d3h2ggrip1zmr9"; + sha256 = "1dbv6p9cq9zj51zvhfy2b7aic2zqa44lmfmq7k7fkqcgb6wmanic"; }; inherit python; patches = [ - # Patch from Debian that switches the version update change from - # enabled by default to disabled by default. - ./no_updates_dialog.patch + # Patches from Debian that: + # - disable plugin installation (very insecure) + # - disables loading of web bug for privacy + # - switches the version update from enabled to disabled by default + (fetchpatch { + name = "disable_plugins.patch"; + url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/disable_plugins.py-20111220183043-dcl08ccfagjxt1dv-1/disable_plugins.py"; + sha256 = "19spdx52dhbrfn9lm084yl3cfwm6f90imd51k97sf7flmpl569pk"; + }) + (fetchpatch { + name = "links_privacy.patch"; + url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/linksprivacy.patch-20160417214308-6hvive72pc0r4awc-1/links-privacy.patch"; + sha256 = "0f6pq2b7q56pxrq2j8yqd7bksc623q2zgq29qcli30f13vga1w60"; + }) + (fetchpatch { + name = "no_updates_dialog.patch"; + url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/no_updates_dialog.pa-20081231120426-rzzufl0zo66t3mtc-16/no_updates_dialog.patch"; + sha256 = "16xwa2fa47jvs954fjrwr8rhh89aljgi1d1wrfxa40sknlmfwxif"; + }) + # the unrar patch is not from debian ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip/PyQt5':" \ setup/build_environment.py + + # Remove unneeded files and libs + rm -rf resources/calibre-portable.* \ + src/{chardet,cherrypy,html5lib,odf,routes} ''; dontUseQmakeConfigure = true; @@ -34,14 +55,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; - buildInputs = - [ python pyqt5 sip poppler_utils libpng imagemagick libjpeg - fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils - pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil - pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow - pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw - pythonPackages.cssselect - ]; + buildInputs = [ + python pyqt5 sip poppler_utils libpng imagemagick libjpeg + fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils + ] ++ (with pythonPackages; [ + apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow sqlite3 + # the following are distributed with calibre, but we use upstream instead + chardet cherrypy html5lib odfpy routes + ]); installPhase = '' export HOME=$TMPDIR/fakehome diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch deleted file mode 100644 index 52364f64dac..00000000000 --- a/pkgs/applications/misc/calibre/no_updates_dialog.patch +++ /dev/null @@ -1,16 +0,0 @@ -# Description: Disable update check by default. -Index: calibre/src/calibre/gui2/main.py -=================================================================== ---- calibre.orig/src/calibre/gui2/main.py 2014-02-02 10:41:28.470954623 +0100 -+++ calibre/src/calibre/gui2/main.py 2014-02-02 10:41:56.546954247 +0100 -@@ -37,8 +37,8 @@ - help=_('Start minimized to system tray.')) - parser.add_option('-v', '--verbose', default=0, action='count', - help=_('Ignored, do not use. Present only for legacy reasons')) -- parser.add_option('--no-update-check', default=False, action='store_true', -- help=_('Do not check for updates')) -+ parser.add_option('--update-check', dest='no_update_check', default=True, action='store_false', -+ help=_('Check for updates')) - parser.add_option('--ignore-plugins', default=False, action='store_true', - help=_('Ignore custom plugins, useful if you installed a plugin' - ' that is preventing calibre from starting')) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb2e5b8decf..2e6dc1f8b02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12527,7 +12527,7 @@ in calcurse = callPackage ../applications/misc/calcurse { }; - calibre = qt55.callPackage ../applications/misc/calibre { + calibre = qt5.callPackage ../applications/misc/calibre { inherit (pythonPackages) pyqt5 sip; }; From 7949e69382e825243141b5233c88524953a21e9d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Sep 2016 00:14:07 +0200 Subject: [PATCH 098/195] chromium: update to latest channel releases (security) Fixes the following security problems: - CVE-2016-5147: Universal XSS in Blink - CVE-2016-5148: Universal XSS in Blink - CVE-2016-5149: Script injection in extensions - CVE-2016-5150: Use after free in Blink - CVE-2016-5151: Use after free in PDFium - CVE-2016-5152: Heap overflow in PDFium - CVE-2016-5153: Use after destruction in Blink - CVE-2016-5154: Heap overflow in PDFium - CVE-2016-5155: Address bar spoofing - CVE-2016-5156: Use after free in event bindings - CVE-2016-5157: Heap overflow in PDFium - CVE-2016-5158: Heap overflow in PDFium - CVE-2016-5159: Heap overflow in PDFium - CVE-2016-5160: Extensions web accessible resources bypass - CVE-2016-5161: Type confusion in Blink. - CVE-2016-5162: Extensions web accessible resources bypass - CVE-2016-5163: Address bar spoofing - CVE-2016-5164: Universal XSS using DevTools - CVE-2016-5165: Script injection in DevTools - CVE-2016-5166: SMB Relay Attack via Save Page As - CVE-2016-5167: Various fixes from internal audits, fuzzing and other initiatives --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d7b9c74130b..5645f02d8fe 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 = "0brpkjg1rcq8c0h5hnzqg3bg4jj805dph67zzramlcvbr44a06r6"; - sha256bin64 = "0zqa40xz0v715ggb1g2hc2085k65m24mf8xl1n2fzj7k21hf7bkc"; - version = "53.0.2785.34"; + sha256 = "1w7h24jblbpvg49iap1cpsd0gwal1p7m7i2yqw12rcn0hqz4hc31"; + sha256bin64 = "006pksc1ibdqcshsal55ps4qizj706zh1jrph6152znafl5hjb7i"; + version = "53.0.2785.92"; }; dev = { - sha256 = "1c73jfy11l4qiy553a3lvmd8kb29i25az6i5a4azmfc1abriwhjn"; - sha256bin64 = "06r53fnwp8v5drh3ilplqbwcak954gcgclc8mqq3mlx5530fp6fv"; - version = "54.0.2816.0"; + sha256 = "1n6cq9fani9cl4qxx82iaiv40n4d6y5ns9mk63na1m5pdcjbaqhw"; + sha256bin64 = "0iypx2p7xqc03i5mc85ilf162gdpn4x2vkb1kgzhlzhq8nvq0y9d"; + version = "54.0.2840.8"; }; stable = { - sha256 = "00d16yr8d9280b2rcjmjxkqvdzgy6a7l7fmnsjrj8404vcgax551"; - sha256bin64 = "0knlxgcv3wfvpgysaxb83agmp88n4ljmyx40j4r8wb5cisnl6cs8"; - version = "52.0.2743.116"; + sha256 = "1w7h24jblbpvg49iap1cpsd0gwal1p7m7i2yqw12rcn0hqz4hc31"; + sha256bin64 = "0nma1h5npx6vp5fww50xdznadq7yf5604w02w8h5mq3an4pn4g1j"; + version = "53.0.2785.92"; }; } From 222d08492798d535e7cd15f2d52418f2766f7145 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 7 Sep 2016 11:06:50 +0800 Subject: [PATCH 099/195] ledger-web: we have bundlerEnv, let us use it --- .../office/ledger-web/default.nix | 59 ++++++------------- 1 file changed, 18 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 95f91351a54..6be5ad525db 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -1,48 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, bundlerEnv, ruby +{ lib, bundlerEnv, ruby , withPostgresql ? true, postgresql , withSqlite ? false, sqlite }: -let - _name = "ledger-web"; - cmd = "ledger_web"; +bundlerEnv rec { + name = "ledger-web-${version}"; - env = bundlerEnv { - name = "${_name}-env"; - inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - meta = with lib; { - homepage = https://github.com/peterkeen/ledger-web; - platforms = platforms.linux; - maintainers = [ peterhoeg ]; - license = licenses.mit; - }; + version = (import gemset).ledger_web.version; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = lib.optional withPostgresql postgresql + ++ lib.optional withSqlite sqlite; + + meta = with lib; { + description = "A web frontend to the Ledger CLI tool"; + homepage = https://github.com/peterkeen/ledger-web; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; - -in stdenv.mkDerivation rec { - name = "${_name}-${version}"; - version = "1.5.2"; - - buildInputs = [ env ruby ] - ++ lib.optional withPostgresql postgresql - ++ lib.optional withSqlite sqlite; - - src = fetchFromGitHub { - owner = "peterkeen"; - repo = _name; - rev = "v${version}"; - sha256 = "0an4d46h3pp7a8s96jl0dnw1imwdgnb2j474b9wrbidwc6cmfrm7"; - }; - - dontStrip = true; - - installPhase = '' - mkdir -p $out/bin - - cp --no-preserve=mode -r lib $out - - ln -s ${env}/bin/${cmd} $out/bin/${cmd} - ''; } From 7163bab78f7945fa2664a72aef12e67fa9bf0781 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sat, 30 Jul 2016 11:58:31 -0700 Subject: [PATCH 100/195] ruby: 2.2.3 -> 2.2.5 --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 11 ++++------- pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 51f16360f8b..491d43f4c98 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -198,14 +198,14 @@ in { }; }; - ruby_2_2_3 = generic { + ruby_2_2_5 = generic { majorVersion = "2"; minorVersion = "2"; - teenyVersion = "3"; + teenyVersion = "5"; patchLevel = "0"; sha256 = { - src = "1kpdf7f8pw90n5bckpl2idzggk0nn0240ah92sj4a1w6k4pmyyfz"; - git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; + src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h"; + git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index bf848aba582..b5a60f6e13f 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -50,13 +50,10 @@ rec { "${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch" ]; - "2.2.3" = [ - ./ssl_v3.patch - ./ruby22-rand-egd.patch - ] ++ ops useRailsExpress [ - "${patchSet}/patches/ruby/2.2.3/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch" + "2.2.5" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch" ]; "2.3.1" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 238a70b5d80..bbe1038bab2 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "84d0634ce5639781c4d8e9396ec20341d6524901"; - sha256 = "06x2r43i8kpcmk6s5idrc3z49p8vy18b2lsh1jdqla69i5z2vqlf"; + rev = "951e47ca1022cd1e41de9177fa87438cfb72d127"; + sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb2e5b8decf..feacd0694df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6005,7 +6005,7 @@ in ruby_1_9_3 ruby_2_0_0 ruby_2_1_7 - ruby_2_2_3 + ruby_2_2_5 ruby_2_3_1; # Ruby aliases @@ -6013,7 +6013,7 @@ in ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_7; - ruby_2_2 = ruby_2_2_3; + ruby_2_2 = ruby_2_2_5; ruby_2_3 = ruby_2_3_1; scsh = callPackage ../development/interpreters/scsh { }; From 3b9b8726bdbb5405919c40920d9693c5eae246b5 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sat, 30 Jul 2016 15:15:52 -0700 Subject: [PATCH 101/195] ruby: 2.1.7 -> 2.1.10 --- .../development/interpreters/ruby/default.nix | 9 ++++---- .../interpreters/ruby/patchsets.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 491d43f4c98..bdeb5d02065 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -147,6 +147,7 @@ let license = stdenv.lib.licenses.ruby; homepage = http://www.ruby-lang.org/en/; description = "The Ruby language"; + maintainers = [ stdenv.lib.maintainers.vrthra ]; platforms = stdenv.lib.platforms.all; }; @@ -187,14 +188,14 @@ in { }; }; - ruby_2_1_7 = generic { + ruby_2_1_10 = generic { majorVersion = "2"; minorVersion = "1"; - teenyVersion = "7"; + teenyVersion = "10"; patchLevel = "0"; sha256 = { - src = "10fxlqmpbq9407zgsx060q22yj4zq6c3czbf29h7xk1rmjb1b77m"; - git = "1fmbqd943akqjwsfbj9bg394ac46qmpavm8s0kv2w87rflrjcjfb"; + src = "086x66w51lg41abjn79xb7f6xsryymkcc3nvakmkjnjyg96labpv"; + git = "133phd5r5y0np5lc9nqif93l7yb13yd52aspyl6c46z5jhvhyvfi"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index b5a60f6e13f..4c1321b5b87 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -36,19 +36,19 @@ rec { "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" ]; - "2.1.7" = [ - ./ssl_v3.patch + "2.1.10" = [ ./rand-egd.patch ] ++ ops useRailsExpress [ - "${patchSet}/patches/ruby/2.1.7/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/03-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/05-funny-falcon-stc-density.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/06-funny-falcon-stc-pool-allocation.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/07-aman-opt-aset-aref-str.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch" - "${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch" + # 2.1.10 patchsets are not available, but 2.1.8 patchsets apply + "${patchSet}/patches/ruby/2.1.8/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/03-display-more-detailed-stack-trace.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/05-funny-falcon-stc-density.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/06-funny-falcon-stc-pool-allocation.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/07-aman-opt-aset-aref-str.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" + "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; "2.2.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feacd0694df..030f7854991 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6004,7 +6004,7 @@ in inherit (callPackage ../development/interpreters/ruby {}) ruby_1_9_3 ruby_2_0_0 - ruby_2_1_7 + ruby_2_1_10 ruby_2_2_5 ruby_2_3_1; @@ -6012,7 +6012,7 @@ in ruby = ruby_2_3; ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; - ruby_2_1 = ruby_2_1_7; + ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5; ruby_2_3 = ruby_2_3_1; From e051ac665ce07a0325fd0b5e95b68d8faa21026b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 7 Sep 2016 06:47:11 +0200 Subject: [PATCH 102/195] android-studio: add 32bit zlib for api 22 --- pkgs/applications/editors/android-studio/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index eea686d691d..85b9e7c4368 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -54,6 +54,7 @@ let pkgsi686Linux.stdenv.cc.cc.lib # aapt wants libz.so.1 zlib + pkgsi686Linux.zlib # Support multiple monitors libXrandr ]}" From 592939952762009fd941670316746d391e6b366e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 7 Sep 2016 04:54:34 +0200 Subject: [PATCH 103/195] graphicsmagick: 1.3.24 -> 1.3.25 (security) Includes some security fixes, see http://www.graphicsmagick.org/NEWS.html#september-5-2016 --- pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index b780067823a..70d8feaa275 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz , libX11, libwebp, quantumdepth ? 8}: -let version = "1.3.24"; in +let version = "1.3.25"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "1q40w5hcl8rcpszm0r7rpr3a9lj390p39zfvavkvlgxyyk7bmgsj"; + sha256 = "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn"; }; patches = [ ./disable-popen.patch ]; From 5f6557d43769230dce07bd873c17c1180f7eddc1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 7 Sep 2016 08:12:02 +0200 Subject: [PATCH 104/195] charybdis: 3.5.1 -> 3.5.3 (security) Fixes CVE-2016-7143 (certificate fingerprint spoofing through crafted SASL messages). --- pkgs/servers/irc/charybdis/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 89eeeaecb34..46e4b755e5c 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, bison, flex, openssl }: stdenv.mkDerivation rec { - name = "charybdis-3.5.1"; + name = "charybdis-3.5.3"; src = fetchFromGitHub { owner = "charybdis-ircd"; repo = "charybdis"; rev = name; - sha256 = "12lwfcgszama7140l1qhmhf1v05csipswrvqzmg8pkaazbag4ka7"; + sha256 = "1s8p26lrc5vm08gi6hc5gqidgyj7v5bzm4d2g81v4xk387f85lnc"; }; patches = [ @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { "--with-program-prefix=charybdis-" ]; - hardeningDisable = [ "format" ]; - buildInputs = [ bison flex openssl ]; meta = with stdenv.lib; { From ab9537ca22ce3fd4efc1795c58105504022d0c48 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 7 Sep 2016 07:38:35 +0000 Subject: [PATCH 105/195] nixos: Generalise the container tests in stage-2 boot This way, stage-2 behaves correctly also for libvirt-lxc containers. Some more discussion on this: https://github.com/NixOS/nixpkgs/commit/a7a08188bf650ababa36300a9a6f34169e2a73bf https://github.com/NixOS/nixpkgs/commit/bfe46a653ba2f8ff9902128f485cbd87c49cbca7 --- nixos/modules/system/boot/stage-2-init.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 704150e77d7..590c2b9a141 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -29,14 +29,14 @@ setPath "@path@" # Normally, stage 1 mounts the root filesystem read/writable. # However, in some environments, stage 2 is executed directly, and the # root is read-only. So make it writable here. -if [ "$container" != systemd-nspawn ]; then +if [ -z "$container" ]; then mount -n -o remount,rw none / fi # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a # stage 1, we need to do that here. -if [ ! -e /proc/1 ]; then +if [ ! -e /proc/1 ] || [ -n "$container" ]; then specialMount() { local device="$1" local mountPoint="$2" From 8f95e6f6aa8ac62e809a5d1cba6af2b6707d90dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Sep 2016 10:41:56 +0200 Subject: [PATCH 106/195] hardcode e2fsprogs, idempotent chmod, remove care condition --- .../modules/system/activation/activation-script.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 47550ae76a6..60298362d76 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -19,7 +19,6 @@ let glibc # needed for getent shadow nettools # needed for hostname - e2fsprogs # needed for chattr ]; in @@ -140,13 +139,13 @@ in mkdir -m 1777 -p /var/tmp + # Empty, immutable home directory of many system accounts. + mkdir -p /var/empty # Make sure it's really empty - chattr -i /var/empty - rm -rf /var/empty - - # Empty, read-only home directory of many system accounts. - mkdir -m 0555 -p /var/empty - chattr +i /var/empty + ${pkgs.e2fsprogs}/bin/chattr -i /var/empty + find /var/empty -mindepth 1 -delete + chmod 0555 /var/empty + ${pkgs.e2fsprogs}/bin/chattr +i /var/empty ''; system.activationScripts.usrbinenv = if config.environment.usrbinenv != null From da24fbd0ec9380ee323bd43d1d8468e1bb229bf1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Sep 2016 11:18:09 +0200 Subject: [PATCH 107/195] qtkeychain: Fix install of translations The following doesn't seem to be quite right and I have missed this when I was introducing qtkeychain in the first place: -- Installing: /nix/store/...-qtkeychain-0.4.0/$out/share/qt/translations/qtkeychain_de.qm -- Installing: /nix/store/...-qtkeychain-0.4.0/$out/share/qt/translations/qtkeychain_ro.qm Signed-off-by: aszlig --- pkgs/development/libraries/qtkeychain/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 329cea9ff2a..2e390ced9ec 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10msaylisbwmgpwd59vr4dfgml75kji8mlfwnwq8yp29jikj5amq"; }; - cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=$out/share/qt/translations" ]; + cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; buildInputs = [ cmake qt4 ]; From eeebc13e033800bbbe394d358550a4989a2167c6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Sep 2016 11:21:13 +0200 Subject: [PATCH 108/195] qtkeychain: 0.4.0 -> 0.7.0 Upstream changes since version 0.4.0: * version 0.5.0 (release 2015-05-04): - Added support for KWallet5 (KDE5/KF) * version 0.6.0 (release 2016-03-18) - Added support for the Windows Credential Store * version 0.6.1 (release 2016-03-31) - Fix KWallet not working (regressions in 0.6.0) * version 0.6.2 (release 2016-04-04) - KWallet: Fixes a crash when storing passwords, seen on Debian/KDE4 * version 0.7.0 (release 2016-05-23) - Bump SO version due to 0.6 being binary-incompatible to previous releases Tomahawk and owncloud-client depend on this library, both are still building fine after this update. Signed-off-by: aszlig --- pkgs/development/libraries/qtkeychain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 2e390ced9ec..18f53d45834 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qtkeychain-${version}"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = "v${version}"; - sha256 = "10msaylisbwmgpwd59vr4dfgml75kji8mlfwnwq8yp29jikj5amq"; + sha256 = "04v6ymkw7qd1pf9lwijgqrl89w2hhsnqgz7dm4cdrh8i8dffpn52"; }; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; From 1187b00e5872c8b65919158f2f908efb29117649 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Sep 2016 11:36:24 +0200 Subject: [PATCH 109/195] qtkeychain: Allow building with Qt 5 So far we don't yet need the Qt 5 build for qtkeychain because the two packages that depend on it are still using Qt 4. However, the next upstream version of Tomahawk for example already uses Qt 5, so let's prepare for that. Tested building against Tomahawk Git master with qt5.qtkeychain. Signed-off-by: aszlig --- pkgs/development/libraries/qtkeychain/default.nix | 13 ++++++++++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 18f53d45834..f0e7f958e40 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -1,7 +1,12 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 }: +{ stdenv, fetchFromGitHub, cmake, qt4 ? null +, withQt5 ? false, qtbase ? null, qttools ? null +}: + +assert withQt5 -> qtbase != null; +assert withQt5 -> qttools != null; stdenv.mkDerivation rec { - name = "qtkeychain-${version}"; + name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; version = "0.7.0"; src = fetchFromGitHub { @@ -13,7 +18,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; - buildInputs = [ cmake qt4 ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]; meta = { description = "Platform-independent Qt API for storing passwords securely"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86fa34a3b43..23c071673c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9288,6 +9288,10 @@ in qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qtkeychain = callPackage ../development/libraries/qtkeychain { + withQt5 = true; + }; + quazip = callPackage ../development/libraries/quazip { qt = qtbase; }; From c57d6821aa0bd43e950c4172e91c0d55db983bcf Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 7 Sep 2016 13:00:56 +0300 Subject: [PATCH 110/195] perlPackages.MozillaLdap: Reference correct output of openldap --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5934e0dd681..8b04e1ea06a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9214,7 +9214,7 @@ let self = _self // overrides; _self = with self; { name = "Mozilla-Ldap-${version}"; version = "1.5.3"; USE_OPENLDAP = 1; - LDAPSDKDIR = pkgs.openldap; + LDAPSDKDIR = pkgs.openldap.dev; LDAPSDKLIBDIR = "${pkgs.openldap.out}/lib"; src = fetchurl { url = "https://ftp.mozilla.org/pub/directory/perldap/releases/${version}/src/perl-mozldap-${version}.tar.gz"; From bc2b19867ed061869b7117bdef6dcf2eb2e3d226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 7 Sep 2016 07:40:58 -0300 Subject: [PATCH 111/195] clion: 2016.2.1 -> 2016.2.2 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 99c656d75cb..9f10c6f7f67 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -120,12 +120,12 @@ in { clion = buildClion rec { name = "clion-${version}"; - version = "2016.2.1"; + version = "2016.2.2"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "01a8qylfw8bsyywlxgysghjd7d2rlp9x3myd6nqhn7c1803pcks4"; + sha256 = "06aq3lfccki9203gjvibzj3gn9d82pc6s5z0m3fnf049zxk58ndi"; }; wmClass = "jetbrains-clion"; }; From 3ddf76c00aaae64bb6fd384bd41763636618524f Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Wed, 7 Sep 2016 00:48:30 -0700 Subject: [PATCH 112/195] mono: init at 4.6 --- pkgs/development/compilers/mono/4.6.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/compilers/mono/4.6.nix diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix new file mode 100644 index 00000000000..03ccd776c60 --- /dev/null +++ b/pkgs/development/compilers/mono/4.6.nix @@ -0,0 +1,7 @@ +{ stdenv, callPackage, Foundation, libobjc }: + +callPackage ./generic.nix (rec { + inherit Foundation libobjc; + version = "4.6.0.182"; + sha256 = "1sajwl7fqhkcmh697qqjj4z6amzkay7xf7npsvpm10gm071s5qi6"; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23c071673c8..3fab7fee083 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4991,6 +4991,11 @@ in inherit (darwin.apple_sdk.frameworks) Foundation; }); + mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }); + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; From b7237abc08f10586fc4d87d65b10ad881e856b39 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Wed, 7 Sep 2016 14:21:45 +0300 Subject: [PATCH 113/195] avahi-daemon: remove default browse-domains These domains are not actually default but examples. See https://github.com/lathiat/avahi/blob/master/avahi-daemon/avahi-daemon.conf#L24 for default config. --- nixos/modules/services/networking/avahi-daemon.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 7650f45c557..2d3ce34a4e3 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -75,7 +75,8 @@ in }; browseDomains = mkOption { - default = [ "0pointer.de" "zeroconf.org" ]; + default = [ ]; + example = [ "0pointer.de" "zeroconf.org" ]; description = '' List of non-local DNS domains to be browsed. ''; From d0857bb1e6c8e221228f2d71fa8d6c29cbe09460 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 10:59:40 +0200 Subject: [PATCH 114/195] openresolv: 3.7.0 -> 3.8.1 --- pkgs/tools/networking/openresolv/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 4b9f868bf1b..7d9062c08db 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "openresolv-3.7.0"; + name = "openresolv-3.8.1"; src = fetchurl { - url = "mirror://roy/openresolv/${name}.tar.bz2"; - sha256 = "1pimiipic4m90f832rgw3ayqrh457qfymcpfpj9iidb5c4phnz4b"; + url = "mirror://roy/openresolv/${name}.tar.xz"; + sha256 = "0hqxvrhc4r310hr59bwi1vbl16my27pdlnbrnbqqihiav67xfnfj"; }; buildInputs = [ makeWrapper ]; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { SYSCONFDIR=/etc SBINDIR=$out/sbin LIBEXECDIR=$out/libexec/resolvconf - VARDIR=/var/run/resolvconf + VARDIR=/run/resolvconf MANDIR=$out/share/man - RESTARTCMD="false \1" + RESTARTCMD=false EOF ''; From 015c984537990d0f8d89b8f5a2e53f516caa5b94 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 14:06:04 +0200 Subject: [PATCH 115/195] nfs module: Improve descriptions --- nixos/modules/tasks/filesystems/nfs.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index e454eca3a0e..f3b3470cd12 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -38,15 +38,17 @@ in default = null; example = 4000; description = '' - Use fixed port for rpc.statd, useful if NFS server is behind firewall. + Use a fixed port for rpc.statd. This is + useful if the NFS server is behind a firewall. ''; }; lockdPort = mkOption { default = null; example = 4001; description = '' - Use fixed port for NFS lock manager kernel module (lockd/nlockmgr), - useful if NFS server is behind firewall. + Use a fixed port for the NFS lock manager kernel module + (lockd/nlockmgr). This is useful if the + NFS server is behind a firewall. ''; }; }; From 58b028f9ee24dc403ee83ee744bfa1cf859960a8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 14:06:19 +0200 Subject: [PATCH 116/195] nfs module: Fix dependency on statd and idmapd http://hydra.nixos.org/build/40038016 --- nixos/modules/tasks/filesystems/nfs.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index f3b3470cd12..e9a7ccc721a 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -70,13 +70,16 @@ in boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ]; + # FIXME: should use upstream units from nfs-utils. + systemd.services.statd = { description = "NFSv3 Network Status Monitor"; path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ]; - wantedBy = [ "remote-fs-pre.target" ]; + wants = [ "remote-fs-pre.target" ]; before = [ "remote-fs-pre.target" ]; + wantedBy = [ "remote-fs.target" ]; requires = [ "basic.target" "rpcbind.service" ]; after = [ "basic.target" "rpcbind.service" ]; @@ -102,8 +105,9 @@ in path = [ pkgs.sysvtools pkgs.utillinux ]; - wantedBy = [ "remote-fs-pre.target" ]; + wants = [ "remote-fs-pre.target" ]; before = [ "remote-fs-pre.target" ]; + wantedBy = [ "remote-fs.target" ]; requires = [ "rpcbind.service" ]; after = [ "rpcbind.service" ]; From d8625f6d25a6d510b588dfb28538155973806055 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 14:12:47 +0200 Subject: [PATCH 117/195] Make the NFSv4 tests release-critical We can probably drop NFSv3... --- nixos/release-combined.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index f2ca6af7e3a..2eb40416bd0 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -88,6 +88,7 @@ in rec { (all nixos.tests.networking.scripted.sit) (all nixos.tests.networking.scripted.vlan) (all nixos.tests.nfs3) + (all nixos.tests.nfs4) (all nixos.tests.openssh) (all nixos.tests.printing) (all nixos.tests.proxy) From b6be650608084455c64111718de235efccec030c Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 21:08:42 +0200 Subject: [PATCH 118/195] gazebo.sdformat: fix cmake file --- pkgs/development/libraries/sdformat/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix index a81ba17a3f5..692de29afd7 100644 --- a/pkgs/development/libraries/sdformat/default.nix +++ b/pkgs/development/libraries/sdformat/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { inherit name; + prePatch = '' + substituteInPlace cmake/sdf_config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@" "@LIB_INSTALL_DIR@" + ''; + enableParallelBuilding = true; buildInputs = [ cmake boost ruby ignition.math2 tinyxml From 7a623aec4700edb1fa410607aadf6ce238f6d5dd Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Wed, 7 Sep 2016 14:24:18 +0200 Subject: [PATCH 119/195] ignition-transport: fix cmake file --- pkgs/development/libraries/ignition-transport/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 0b10c2cdb52..5edbf9e4551 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cppzmq ]; + postPatch = '' + substituteInPlace cmake/ignition-config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_" "@CMAKE_INSTALL_" + ''; + meta = with stdenv.lib; { homepage = http://ignitionrobotics.org/libraries/math; description = "Math library by Ingition Robotics, created for the Gazebo project"; From abdc5961c3cdf9f5893ea1e91ba08ff5089f53a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 14:24:54 +0200 Subject: [PATCH 120/195] Fix starting the firewall Probably as a result of 992c514a20cf2da897db68169d7dcab721e8c7b7, it was not being started anymore. My understanding of systemd.special(7) (section "Special passive system units") is that the firewall should want network-pre.target, rather than the other way around (not very intuitive...). This in itself does not cause the firewall to be wanted, which is why the wanted-by relationship with multi-user.target is necessary. http://hydra.nixos.org/build/39965589 --- nixos/modules/services/networking/firewall.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 138153306dd..254e8c08e7d 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -490,7 +490,8 @@ in systemd.services.firewall = { description = "Firewall"; - wantedBy = [ "network-pre.target" ]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-pre.target" ]; before = [ "network-pre.target" ]; after = [ "systemd-modules-load.service" ]; From e090701e2d09aec3e8866ab9a8e53c37973ffeb4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 14:42:30 +0200 Subject: [PATCH 121/195] firewall: Order before sysinit Suggested by @aszlig. --- nixos/modules/services/networking/firewall.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 254e8c08e7d..4e0d6bef431 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -490,7 +490,7 @@ in systemd.services.firewall = { description = "Firewall"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" "sysinit.target" ]; wants = [ "network-pre.target" ]; before = [ "network-pre.target" ]; after = [ "systemd-modules-load.service" ]; From 445a39a23b189e03607bd0445be5b0cb44ab1014 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 14:42:55 +0200 Subject: [PATCH 122/195] chatzilla: 0.9.91 -> 0.9.92 --- pkgs/applications/networking/irc/chatzilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index 82d9912192e..e11f4c65c49 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, firefox-unwrapped, makeWrapper }: stdenv.mkDerivation rec { - name = "chatzilla-0.9.91"; + name = "chatzilla-0.9.92"; src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp"; - sha256 = "1bmjw2wvp8gh7fdl8czkxc55iari6dy672446hps20xixrh8hl8r"; + sha256 = "09asg7ixjrin46xd19ri71g4jdrgb1gg0pk0lwk0dlb1qjxyf1xy"; }; buildInputs = [ unzip makeWrapper ]; From 8c3e9ea53e40e9bc5033d9e81b9b6ef98a066e3e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 14:43:29 +0200 Subject: [PATCH 123/195] xulrunner: Remove --- .../interpreters/xulrunner/default.nix | 81 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 86 deletions(-) delete mode 100644 pkgs/development/interpreters/xulrunner/default.nix diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix deleted file mode 100644 index 459e77467d8..00000000000 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite -, hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu, firefox-unwrapped -, debugBuild ? false -}: - -assert stdenv.cc ? libc && stdenv.cc.libc != null; - -let version = firefox-unwrapped.version; in - -stdenv.mkDerivation rec { - name = "xulrunner-${version}"; - - src = firefox-unwrapped.src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xorg.libXi - xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - alsaLib nspr nss libnotify xorg.pixman yasm mesa - xorg.libXScrnSaver xorg.scrnsaverproto pysqlite - xorg.libXext xorg.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - "--with-system-libevent" - "--with-system-libvpx" - # "--with-system-png" # needs APNG support - # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 - "--enable-system-ffi" - "--enable-system-hunspell" - "--enable-system-pixman" - "--enable-system-sqlite" - "--enable-system-cairo" - "--enable-gstreamer" - "--enable-startup-notification" - # "--enable-content-sandbox" # available since 26.0, but not much info available - # "--enable-content-sandbox-reporter" # keeping disabled for now - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - "--disable-pulseaudio" - "--disable-gconf" - ] - ++ (if debugBuild - then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" "--enable-strip" - "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" ]); - - enableParallelBuilding = true; - - preConfigure = - '' - configureScript=$(pwd)/configure - mkdir ../objdir - cd ../objdir - ''; - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; - }; - - passthru = { inherit gtk version; }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fab7fee083..5de657b2eb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6050,11 +6050,6 @@ in wasm = callPackage ../development/interpreters/wasm { }; - xulrunner = callPackage ../development/interpreters/xulrunner { - inherit (gnome) libIDL; - inherit (pythonPackages) pysqlite; - }; - ### DEVELOPMENT / MISC From 10b335992e3757a06f483248582c4f81ecbcb8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 7 Sep 2016 15:08:13 +0200 Subject: [PATCH 124/195] Fix eval (due to xulrunner removal) --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5de657b2eb2..5b24c0ea4fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13407,6 +13407,7 @@ in gnash = callPackage ../applications/video/gnash { inherit (gnome) gtkglext; + xulrunner = firefox-unwrapped; }; gnome_mplayer = callPackage ../applications/video/gnome-mplayer { @@ -14300,7 +14301,9 @@ in omxplayer = callPackage ../applications/video/omxplayer { }; - oneteam = callPackage ../applications/networking/instant-messengers/oneteam {}; + oneteam = callPackage ../applications/networking/instant-messengers/oneteam { + xulrunner = firefox-unwrapped; + }; openbox = callPackage ../applications/window-managers/openbox { }; From fb46df8a9a4102e265f4b14af48a5df90d5b06c3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Sep 2016 14:18:32 +0200 Subject: [PATCH 125/195] nixos: Fix ordering of firewall.service Follow-up to the following commits: abdc5961c3cdf9f5893ea1e91ba08ff5089f53a4: Fix starting the firewall e090701e2d09aec3e8866ab9a8e53c37973ffeb4: Order before sysinit Solely use sysinit.target here instead of multi-user.target because we want to make sure that the iptables rules are applied *before* any socket units are started. The reason I've dropped the wantedBy on multi-user.target is that sysinit.target is already a part of the dependency chain of multi-user.target. To make sure that this holds true, I've added a small test case to ensure that during switch of the configuration the firewall.service is considered as well. Tested using the firewall NixOS test. Signed-off-by: aszlig Cc: @edolstra --- .../modules/services/networking/firewall.nix | 3 +- nixos/tests/firewall.nix | 53 ++++++++++++------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 4e0d6bef431..942fcc03f59 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -490,7 +490,7 @@ in systemd.services.firewall = { description = "Firewall"; - wantedBy = [ "multi-user.target" "sysinit.target" ]; + wantedBy = [ "sysinit.target" ]; wants = [ "network-pre.target" ]; before = [ "network-pre.target" ]; after = [ "systemd-modules-load.service" ]; @@ -501,6 +501,7 @@ in # containers don't have CAP_SYS_MODULE. So the host system had # better have all necessary modules already loaded. unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + unitConfig.DefaultDependencies = false; reloadIfChanged = true; diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 8f2cb27b60f..1119a5312eb 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -15,6 +15,16 @@ import ./make-test.nix ( { pkgs, ... } : { services.httpd.adminAddr = "foo@example.org"; }; + # Dummy configuration to check whether firewall.service will be honored + # during system activation. This only needs to be different to the + # original walled configuration so that there is a change in the service + # file. + walled2 = + { config, pkgs, nodes, ... }: + { networking.firewall.enable = true; + networking.firewall.rejectPackets = true; + }; + attacker = { config, pkgs, ... }: { services.httpd.enable = true; @@ -23,28 +33,33 @@ import ./make-test.nix ( { pkgs, ... } : { }; }; - testScript = - { nodes, ... }: - '' - startAll; + testScript = { nodes, ... }: let + newSystem = nodes.walled2.config.system.build.toplevel; + in '' + $walled->start; + $attacker->start; - $walled->waitForUnit("firewall"); - $walled->waitForUnit("httpd"); - $attacker->waitForUnit("network.target"); + $walled->waitForUnit("firewall"); + $walled->waitForUnit("httpd"); + $attacker->waitForUnit("network.target"); - # Local connections should still work. - $walled->succeed("curl -v http://localhost/ >&2"); + # Local connections should still work. + $walled->succeed("curl -v http://localhost/ >&2"); - # Connections to the firewalled machine should fail, but ping should succeed. - $attacker->fail("curl --fail --connect-timeout 2 http://walled/ >&2"); - $attacker->succeed("ping -c 1 walled >&2"); + # Connections to the firewalled machine should fail, but ping should succeed. + $attacker->fail("curl --fail --connect-timeout 2 http://walled/ >&2"); + $attacker->succeed("ping -c 1 walled >&2"); - # Outgoing connections/pings should still work. - $walled->succeed("curl -v http://attacker/ >&2"); - $walled->succeed("ping -c 1 attacker >&2"); + # Outgoing connections/pings should still work. + $walled->succeed("curl -v http://attacker/ >&2"); + $walled->succeed("ping -c 1 attacker >&2"); - # If we stop the firewall, then connections should succeed. - $walled->stopJob("firewall"); - $attacker->succeed("curl -v http://walled/ >&2"); - ''; + # If we stop the firewall, then connections should succeed. + $walled->stopJob("firewall"); + $attacker->succeed("curl -v http://walled/ >&2"); + + # Check whether activation of a new configuration reloads the firewall. + $walled->succeed("${newSystem}/bin/switch-to-configuration test 2>&1" . + " | grep -qF firewall.service"); + ''; }) From b8022cad3cb75aa55e45a111d5e53ce82be43818 Mon Sep 17 00:00:00 2001 From: Brandon Dimcheff Date: Wed, 7 Sep 2016 09:15:38 -0400 Subject: [PATCH 126/195] atom: 1.9.9 -> 1.10.1 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index e76d1028ebf..6cbd3dea825 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.9.9"; + version = "1.10.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1rgqajqc1z1n8ckwkxg61j0k6ridps25am54qdwjm25w53bd0z1x"; + sha256 = "0v03a93qa57ajji4sfz7hyr06n20jnlq87103nr7wqycv1v4dm85"; name = "${name}.deb"; }; From 5041cae5b767573faf286abfe6b1c76db2873626 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 15:17:32 +0200 Subject: [PATCH 127/195] Revert "xulrunner: Remove" This reverts commit 8c3e9ea53e40e9bc5033d9e81b9b6ef98a066e3e. --- .../interpreters/xulrunner/default.nix | 81 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 86 insertions(+) create mode 100644 pkgs/development/interpreters/xulrunner/default.nix diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix new file mode 100644 index 00000000000..459e77467d8 --- /dev/null +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, hunspell, libevent, libstartup_notification, libvpx +, cairo, gstreamer, gst_plugins_base, icu, firefox-unwrapped +, debugBuild ? false +}: + +assert stdenv.cc ? libc && stdenv.cc.libc != null; + +let version = firefox-unwrapped.version; in + +stdenv.mkDerivation rec { + name = "xulrunner-${version}"; + + src = firefox-unwrapped.src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification libvpx cairo + gstreamer gst_plugins_base icu + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + "--with-system-libevent" + "--with-system-libvpx" + # "--with-system-png" # needs APNG support + # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" + "--enable-system-sqlite" + "--enable-system-cairo" + "--enable-gstreamer" + "--enable-startup-notification" + # "--enable-content-sandbox" # available since 26.0, but not much info available + # "--enable-content-sandbox-reporter" # keeping disabled for now + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + "--disable-pulseaudio" + "--disable-gconf" + ] + ++ (if debugBuild + then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" "--enable-strip" + "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" ]); + + enableParallelBuilding = true; + + preConfigure = + '' + configureScript=$(pwd)/configure + mkdir ../objdir + cd ../objdir + ''; + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + }; + + passthru = { inherit gtk version; }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b24c0ea4fe..c27e3a710db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6050,6 +6050,11 @@ in wasm = callPackage ../development/interpreters/wasm { }; + xulrunner = callPackage ../development/interpreters/xulrunner { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; + ### DEVELOPMENT / MISC From 75efdc65022f71b9a61f9347d353022d46055f4d Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Sep 2016 16:25:28 +0200 Subject: [PATCH 128/195] nixos/tests/blivet: Fix btrfs-related tests The loopback-based tests use a storage size of 102400 blocks (one block is 1024 bytes), which doesn't seem to fit for btrfs volumes in recent btrfs versions. I'm setting this to 409600 (400 MB) now so that it should be enough for later versions in case they need even more space for subvolumes. Signed-off-by: aszlig --- nixos/tests/blivet.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/blivet.nix b/nixos/tests/blivet.nix index 33a79e65efe..a7b836ce99a 100644 --- a/nixos/tests/blivet.nix +++ b/nixos/tests/blivet.nix @@ -69,6 +69,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec { sed -i \ -e '1i import tempfile' \ -e 's|_STORE_FILE_PATH = .*|_STORE_FILE_PATH = tempfile.gettempdir()|' \ + -e 's|DEFAULT_STORE_SIZE = .*|DEFAULT_STORE_SIZE = 409600|' \ tests/loopbackedtestcase.py PYTHONPATH=".:$(< "${pkgs.stdenv.mkDerivation { From 4c22a048d74a3f328bd668a504989bfaf54a7a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Sep 2016 16:51:38 +0200 Subject: [PATCH 129/195] Revert "Revert "xulrunner: Remove"" This reverts commit 5041cae5b767573faf286abfe6b1c76db2873626. This is fixed in follow up commit. --- .../interpreters/xulrunner/default.nix | 81 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 86 deletions(-) delete mode 100644 pkgs/development/interpreters/xulrunner/default.nix diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix deleted file mode 100644 index 459e77467d8..00000000000 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite -, hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu, firefox-unwrapped -, debugBuild ? false -}: - -assert stdenv.cc ? libc && stdenv.cc.libc != null; - -let version = firefox-unwrapped.version; in - -stdenv.mkDerivation rec { - name = "xulrunner-${version}"; - - src = firefox-unwrapped.src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xorg.libXi - xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - alsaLib nspr nss libnotify xorg.pixman yasm mesa - xorg.libXScrnSaver xorg.scrnsaverproto pysqlite - xorg.libXext xorg.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - "--with-system-libevent" - "--with-system-libvpx" - # "--with-system-png" # needs APNG support - # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 - "--enable-system-ffi" - "--enable-system-hunspell" - "--enable-system-pixman" - "--enable-system-sqlite" - "--enable-system-cairo" - "--enable-gstreamer" - "--enable-startup-notification" - # "--enable-content-sandbox" # available since 26.0, but not much info available - # "--enable-content-sandbox-reporter" # keeping disabled for now - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - "--disable-pulseaudio" - "--disable-gconf" - ] - ++ (if debugBuild - then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" "--enable-strip" - "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" ]); - - enableParallelBuilding = true; - - preConfigure = - '' - configureScript=$(pwd)/configure - mkdir ../objdir - cd ../objdir - ''; - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; - }; - - passthru = { inherit gtk version; }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c27e3a710db..5b24c0ea4fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6050,11 +6050,6 @@ in wasm = callPackage ../development/interpreters/wasm { }; - xulrunner = callPackage ../development/interpreters/xulrunner { - inherit (gnome) libIDL; - inherit (pythonPackages) pysqlite; - }; - ### DEVELOPMENT / MISC From 1697f9c130037f62a4aee4cac2c1907b75acc069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Sep 2016 16:49:17 +0200 Subject: [PATCH 130/195] xulrunner: set to firefox-unwrapped MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit ef9e2154e278c8a8c2ad76b2898e7bd44506daf9) Signed-off-by: Domen Kožar --- pkgs/top-level/all-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b24c0ea4fe..0f32f1a44f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4787,12 +4787,10 @@ in icedtea7_web = callPackage ../development/compilers/icedtea-web { jdk = jdk7; - xulrunner = firefox-unwrapped; }; icedtea8_web = callPackage ../development/compilers/icedtea-web { jdk = jdk8; - xulrunner = firefox-unwrapped; }; icedtea_web = self.icedtea8_web; @@ -14301,9 +14299,7 @@ in omxplayer = callPackage ../applications/video/omxplayer { }; - oneteam = callPackage ../applications/networking/instant-messengers/oneteam { - xulrunner = firefox-unwrapped; - }; + oneteam = callPackage ../applications/networking/instant-messengers/oneteam { }; openbox = callPackage ../applications/window-managers/openbox { }; @@ -14362,7 +14358,6 @@ in pekwm = callPackage ../applications/window-managers/pekwm { }; pencil = callPackage ../applications/graphics/pencil { - xulrunner = firefox-unwrapped; }; perseus = callPackage ../applications/science/math/perseus {}; @@ -17690,4 +17685,6 @@ in zuki-themes = callPackage ../misc/themes/zuki { }; zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {}; + + xulrunner = firefox-unwrapped; } From 241060881414cb5af364876fe340f2f6237d496e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 7 Sep 2016 15:05:00 +0000 Subject: [PATCH 131/195] NixOS 17.03 will be called Gorilla --- nixos/modules/misc/version.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 2ecdbdbf392..ec423768296 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -95,7 +95,7 @@ in nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId)); # Note: code names must only increase in alphabetical order. - nixosCodeName = "Flounder"; + nixosCodeName = "Gorilla"; }; # Generate /etc/os-release. See From e986cb3425547cb85fee48b88727609919cde827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Sep 2016 17:13:35 +0200 Subject: [PATCH 132/195] Revert "travis: only fetch top commit" This reverts commit 3c0fdefd8470878242d8c119952918e171be590c. We have to keep more history because travis build could be triggered after new commit is made, meaning it won't be able to checkout the repository. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1cc9890df2..1fa01f7b781 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,6 @@ matrix: - os: osx osx_image: xcode7.3 script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr -git: - depth: 1 env: global: - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f From 16ce4fa511b8c2c23b886fad118f4f82d06f8c2f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 7 Sep 2016 17:32:23 +0200 Subject: [PATCH 133/195] pythonPackages.pyqt4: actually use dbus-python to build dbus.mainloop.qt; fixes ffadoFull build --- pkgs/development/python-modules/pyqt/4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 5ffbd19228c..178a4ba74a7 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -25,7 +25,7 @@ in mkPythonDerivation { --confirm-license --bindir $out/bin \ --destdir $out/${python.sitePackages} \ --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip/PyQt4 \ - --dbus=${dbus_libs.dev}/include/dbus-1.0 --verbose) + --dbus=${dbus-python}/include/dbus-1.0 --verbose) ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" ''; From 587348743cb01892e210e63425aff15524911521 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 17:22:43 +0200 Subject: [PATCH 134/195] go: Remove unused version --- pkgs/development/compilers/go/default.nix | 95 ----------------------- 1 file changed, 95 deletions(-) delete mode 100644 pkgs/development/compilers/go/default.nix diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix deleted file mode 100644 index c684d7d5ee5..00000000000 --- a/pkgs/development/compilers/go/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}: - -let - loader386 = "${glibc.out}/lib/ld-linux.so.2"; - loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2"; - loaderArm = "${glibc.out}/lib/ld-linux.so.3"; -in - -stdenv.mkDerivation { - name = "go-1.0.3"; - - src = fetchurl { - url = http://go.googlecode.com/files/go1.0.3.src.tar.gz; - sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz"; - }; - - buildInputs = [ bison glibc bash makeWrapper ]; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - cd .. - if [ ! -d go ]; then - mv * go - fi - cd go - - patchShebangs ./ # replace /bin/bash - # !!! substituteInPlace does not seems to be effective. - sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c - sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c - sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go - - #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ - # -e 's,/bin/echo,${coreutils}/bin/echo,' \ - # src/pkg/exec/exec_test.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} - # The os test wants to read files in an existing path. Just it don't be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/pkg/os/os_test.go - ''; - - patches = [ ./cacert.patch ./1_0-opt-error.patch ./1_0-gcc-bug.patch ]; - - GOOS = "linux"; - GOARCH = if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "armv5tel-linux" then "arm" - else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; - - installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - ./all.bash - cd - - - # Wrap the tools to define the location of the - # libraries. - for a in go gofmt godoc; do - wrapProgram "$out/bin/$a" \ - --set "GOROOT" $out/share/go \ - ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""} - done - - # Copy the emacs configuration for Go files. - mkdir -p "$out/share/emacs/site-lisp" - cp ./misc/emacs/* $out/share/emacs/site-lisp/ - ''; - - meta = { - branch = "1.0"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ pierron viric ]; - platforms = stdenv.lib.platforms.linux; - }; -} From 2597562d42fe7143330804e767a325119d1bd3c9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 17:22:02 +0200 Subject: [PATCH 135/195] minio: Init at 20160821 --- pkgs/servers/minio/default.nix | 39 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/servers/minio/default.nix diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix new file mode 100644 index 00000000000..ee37107858b --- /dev/null +++ b/pkgs/servers/minio/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, go }: + +stdenv.mkDerivation rec { + name = "minio-${shortVersion}"; + + shortVersion = "20160821"; + longVersion = "2016-08-21T02:44:47Z"; + + src = fetchurl { + url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; + sha256 = "159196bnb4b7f00jh9gll9kqqxq1ifxv1kg5bd6yjpqf5qca4pkn"; + }; + + buildInputs = [ go ]; + + unpackPhase = '' + d=$TMPDIR/src/github.com/minio/minio + mkdir -p $d + tar xf $src -C $d --strip-component 1 + export GOPATH=$TMPDIR + cd $d + ''; + + buildPhase = '' + mkdir -p $out/bin + go build -o $out/bin/minio \ + --ldflags "-X github.com/minio/minio/cmd.Version=${longVersion}" + ''; + + installPhase = "true"; + + meta = { + homepage = https://www.minio.io/; + description = "An S3-compatible object storage server"; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f32f1a44f2..08abe16df0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10417,6 +10417,8 @@ in mfi = callPackage ../servers/mfi { }; + minio = callPackage ../servers/minio { }; + # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; From 039ac38d1e38c0a7c0d1c44667c2d9d56a2ec561 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Sep 2016 17:40:29 +0200 Subject: [PATCH 136/195] minio-client: Init at 20160821 --- .../tools/networking/minio-client/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/networking/minio-client/default.nix diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix new file mode 100644 index 00000000000..258a81570c0 --- /dev/null +++ b/pkgs/tools/networking/minio-client/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, go }: + +stdenv.mkDerivation rec { + name = "minio-client-${shortVersion}"; + + shortVersion = "20160821"; + longVersion = "2016-08-21T03:02:49Z"; + + src = fetchurl { + url = "https://github.com/minio/mc/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; + sha256 = "1qnslwfspbvzawxrrym27agw79x8sgcafk7d0yakncjyg6vmdkka"; + }; + + buildInputs = [ go ]; + + unpackPhase = '' + d=$TMPDIR/src/github.com/minio/mc + mkdir -p $d + tar xf $src -C $d --strip-component 1 + export GOPATH=$TMPDIR + cd $d + ''; + + buildPhase = '' + mkdir -p $out/bin + go build -o $out/bin/minio-client \ + --ldflags "-X github.com/minio/mc/cmd.Version=${longVersion}" + ''; + + installPhase = "ln -s minio-client $out/bin/mc"; + + meta = { + homepage = https://github.com/minio/mc; + description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08abe16df0d..29121b7c315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2620,6 +2620,8 @@ in mimetic = callPackage ../development/libraries/mimetic { }; + minio-client = callPackage ../tools/networking/minio-client { }; + minissdpd = callPackage ../tools/networking/minissdpd { }; miniupnpc = callPackage ../tools/networking/miniupnpc { }; From 67959521490d7308084a9d8e9300125f16a5697a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 7 Sep 2016 18:06:41 +0200 Subject: [PATCH 137/195] libchop: a hack to work around broken guile path detection --- pkgs/development/libraries/libchop/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index e57d1f29606..7ff992ccc55 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { doCheck = true; + preConfigure = '' + sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.* + ''; + meta = { description = "Tools & library for data backup and distributed storage"; From dd98b6fb9f35544201ed66733af40ff822ba8c36 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Sep 2016 18:00:06 +0200 Subject: [PATCH 138/195] nixos/stage2: Fix mounting special filesystems This partially reverts commit ab9537ca22ce3fd4efc1795c58105504022d0c48. From the manpage of systemd-nspawn(1): Note that systemd-nspawn will mount file systems private to the container to /dev, /run and similar. Testing this in a shell turns out: $ sudo systemd-nspawn --bind-ro=/nix/store "$(readlink "$(which ls)")" /proc Spawning container aszlig on /home/aszlig. Press ^] three times within 1s to kill container. /etc/localtime does not point into /usr/share/zoneinfo/, not updating container timezone. 1 execdomains kpageflags stat acpi fb loadavg swaps asound filesystems locks sys buddyinfo fs meminfo sysrq-trigger bus interrupts misc sysvipc cgroups iomem modules thread-self cmdline ioports mounts timer_list config.gz irq mtrr timer_stats consoles kallsyms net tty cpuinfo kcore pagetypeinfo uptime crypto key-users partitions version devices keys scsi vmallocinfo diskstats kmsg self vmstat dma kpagecgroup slabinfo zoneinfo driver kpagecount softirqs Container aszlig exited successfully. So the test on whether PID 1 exists in /proc is enough, because if we use PID namespaces there actually _is_ a PID 1 (as shown above) and the special file systems are already mounted. A test on the $containers variable actually mounts them twice. This unbreaks NixOS containers and I've tested this against the containers-imperative NixOS test. Signed-off-by: aszlig Cc: @rickynils, @shlevy, @edolstra --- nixos/modules/system/boot/stage-2-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 590c2b9a141..ae88222f278 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -36,7 +36,7 @@ fi # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a # stage 1, we need to do that here. -if [ ! -e /proc/1 ] || [ -n "$container" ]; then +if [ ! -e /proc/1 ]; then specialMount() { local device="$1" local mountPoint="$2" From 985a260a1227114ed7bbe34668d57315887189c0 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 7 Sep 2016 19:15:43 +0200 Subject: [PATCH 139/195] haskellPackages.texmath: fix ghc710x build inputs --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 211817baa9e..b403f2d79f7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -212,6 +212,7 @@ self: super: { hslogger = addBuildDepend super.hslogger self.HUnit; semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); + texmath = addBuildDepend super.texmath self.network-uri; intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); Glob = addBuildDepends super.Glob (with self; [semigroups]); From cc3853584589910dbf08a34b09fffeeb6ef66ec1 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 7 Sep 2016 19:17:33 +0200 Subject: [PATCH 140/195] haskellPackages: cleanup ghc710x --- .../configuration-ghc-7.10.x.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index b403f2d79f7..7d5e3d012d3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -63,10 +63,6 @@ self: super: { nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; - hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; }); - - yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); - # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; @@ -205,22 +201,24 @@ self: super: { hackage-security = dontHaddock (dontCheck super.hackage-security); # GHC versions prior to 8.x require additional build inputs. - aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale"; - aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; - case-insensitive = addBuildDepend super.case-insensitive self.semigroups; - bytes = addBuildDepend super.bytes self.doctest; - hslogger = addBuildDepend super.hslogger self.HUnit; - semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); - semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); - texmath = addBuildDepend super.texmath self.network-uri; - intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); - Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); Glob = addBuildDepends super.Glob (with self; [semigroups]); + Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); + aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; + aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale"; + bytes = addBuildDepend super.bytes self.doctest; + case-insensitive = addBuildDepend super.case-insensitive self.semigroups; + hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; }); + hslogger = addBuildDepend super.hslogger self.HUnit; + intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); + lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); + semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); + semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); + texmath = addBuildDepend super.texmath self.network-uri; + yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); # cereal must have `fail` in pre-ghc-8.0.x versions # also tests require bytestring>=0.10.8.1 cereal = dontCheck (addBuildDepend super.cereal self.fail); cereal_0_5_2_0 = dontCheck (addBuildDepend super.cereal_0_5_2_0 self.fail); - lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; From 4876c7362baa7fa0ed4afcbbdb9e5f8534cce239 Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 7 Sep 2016 18:23:38 +0100 Subject: [PATCH 141/195] stun: 0.96 -> 0.97 --- pkgs/tools/networking/stun/default.nix | 50 ++++++++++++++------------ 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index ce7a4dd6434..3eade48a614 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -1,36 +1,42 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "stun-0.96.dfsg-5"; +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "stun"; + version = "0.97"; src = fetchurl { - url = mirror://debian/pool/main/s/stun/stun_0.96.dfsg.orig.tar.gz; - sha256 = "09bnb3p6h8fhsskdp4wrl9hhml1va0xb28fkwgyzs32q2333pgz4"; + url = "mirror://sourceforge/${pname}/stund-${version}.tgz"; + sha256 = "1mxirnnqfqdwb9x8hfjjsscp6lx3468ph6ddx32l94ir46fbzqc3"; }; - # make it compile on x86_64-linux: - postUnpack = '' - sed -i 's@|| defined(__i386__)@|| defined(__x86_64__) || defined(__i386__)@' stund/stun.cxx + srcManpages = fetchurl { + url = "mirror://ubuntu/pool/universe/s/stun/stun_0.97~dfsg-2.debian.tar.xz"; + name = "stun-debian.tar.xz"; + sha256 = "1pr6zrdhia0aafsvywl1hrhlgl00vahp63bw1z2mzvdxri7q88f0"; + }; + + outputs = [ "out" "server" ]; + + preBuild = '' + tar Jxvf ${srcManpages} debian/manpages + gzip -9 debian/manpages/stun.1 + gzip -9 debian/manpages/stund.8 ''; installPhase = '' - mkdir -p $out/{bin,man/man8,man/man1} - cp client $out/bin/stun - cp server $out/bin/stund - cp debian/manpages/stund.8 $out/man/man8 - cp debian/manpages/stun.1 $out/man/man1 + mkdir -p $out/bin $server/bin $out/man/man1 $server/man/man8 + cp -v client $out/bin/stun + cp -v server $server/bin/stund + cp -v debian/manpages/stun.1.gz $out/man/man1 + cp -v debian/manpages/stund.8.gz $server/man/man8 ''; - patches = fetchurl { - url = mirror://debian/pool/main/s/stun/stun_0.96.dfsg-5.diff.gz; - sha256 = "0a6iig58zykdab89b99v1w4fn3gf2d8wz9c01vx2zvlg22gyji0l"; - }; - - meta = { + meta = with stdenv.lib; { description = "Stun server and test client"; - homepage = http://sourceforge.net/projects/stun/; - license = stdenv.lib.licenses.vsl10; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://sourceforge.net/projects/stun/; + license = licenses.vsl10; + maintainers = with maintainers; [ marcweber obadz ]; + platforms = platforms.linux; }; } From 684ec57cb5df64f926f2d319763446f5e0319d7d Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Tue, 6 Sep 2016 13:29:09 +0200 Subject: [PATCH 142/195] sfml: install pkg-config files --- pkgs/development/libraries/sfml/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 934137a8b6d..3257737744e 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew libXrandr libXrender udev xcbutilimage ]; + cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" ]; meta = with stdenv.lib; { homepage = http://www.sfml-dev.org/; description = "Simple and fast multimedia library"; From 5a55ec20e36557ad523556437b2378780762dc80 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 8 Sep 2016 00:03:50 +0200 Subject: [PATCH 143/195] ledger: fix libdir --- pkgs/applications/office/ledger/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index ac90e0c4cb2..07726ba90a4 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + # Skip byte-compiling of emacs-lisp files because this is currently # broken in ledger... postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29121b7c315..14161743097 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13880,9 +13880,7 @@ in linuxband = callPackage ../applications/audio/linuxband { }; ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger { - boost = boost155; - }; + ledger3 = callPackage ../applications/office/ledger { }; ledger = self.ledger3; ledger-web = callPackage ../applications/office/ledger-web { }; From 787875c287ca716a7db87ce4df9218f1cfcc162d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Sep 2016 17:18:48 -0500 Subject: [PATCH 144/195] r-stringi: fix build by including icu.dev output --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 00f58aecb9a..f4c796a7307 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -347,7 +347,7 @@ let sprint = [ pkgs.openmpi ]; ssanv = [ pkgs.proj ]; stsm = [ pkgs.gsl_1 ]; - stringi = [ pkgs.icu ]; + stringi = [ pkgs.icu.dev ]; survSNP = [ pkgs.gsl_1 ]; sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ]; TAQMNGR = [ pkgs.zlib ]; From 95b6e93b634c9f9834b311ac754ace28baaf1d0c Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 7 Sep 2016 23:51:51 +0100 Subject: [PATCH 145/195] pwnat: 0.3-beta -> 2014-09-08 --- pkgs/tools/networking/pwnat/default.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index e2da224cfdc..9e06a644145 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -1,11 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pwnat-0.3-beta"; + name = "${pname}-${date}"; + pname = "pwnat"; + date = "2014-09-08"; - src = fetchurl { - url = "http://samy.pl/pwnat/${name}.tgz"; - sha256 = "18ihs6wk7zni2w0pqip7i61hyi6n60v5rgj6z7j543fgy4afmmnm"; + src = fetchFromGitHub { + owner = "samyk"; + repo = pname; + rev = "1d07c2eb53171733831c0cd01e4e96a3204ec446"; + sha256 = "056xhlnf1axa6k90i018xwijkwc9zc7fms35hrkzwgs40g9ybrx5"; }; installPhase = '' @@ -14,11 +18,11 @@ stdenv.mkDerivation rec { cp README* COPYING* $out/share/pwnat ''; - meta = { - homepage = http://samy.pl/pwnat/; + meta = with stdenv.lib; { + homepage = http://samy.pl/pwnat/; description = "ICMP NAT to NAT client-server communication"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with maintainers; [viric]; + platforms = with platforms; linux; }; } From c6938be57c99c34860eda421a001cd6029b2d639 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Thu, 8 Sep 2016 00:45:37 +0200 Subject: [PATCH 146/195] nomad: v0.4.0 -> v0.4.1 --- pkgs/applications/networking/cluster/nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 4ca54811ce8..fdb8e09d6a5 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.4.0"; + version = "0.4.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "0c6qrprb33fb3y4d1xn3df0nvh0hsnqccq6xaab0jb40cbz3048p"; + sha256 = "093nljhibphhccjwxkylbvlc8dh8g2js36mlxxdh9nh21b3mghcs"; }; meta = with stdenv.lib; { From 1517c8046285d4e864000198259daecd1f028ac8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 8 Sep 2016 02:37:11 +0300 Subject: [PATCH 147/195] uboot: Fix build --- pkgs/misc/uboot/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 2cf9cbb1ab8..a87971d4d9c 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -12,13 +12,15 @@ let name = "uboot-${defconfig}-${version}"; version = "2016.05"; - nativeBuildInputs = [ bc dtc ]; - src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; sha256 = "0wdivib8kbm17qr6r7n7wyzg5vnwpagvwk5m0z80rbssc5sj5l47"; }; + nativeBuildInputs = [ bc dtc ]; + + hardeningDisable = [ "all" ]; + configurePhase = '' make ${defconfig} ''; From e063c66353a4559a7747cb5e7263f7bb4fc1787b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 8 Sep 2016 03:58:29 +0300 Subject: [PATCH 148/195] mono44: 4.4.1.0 -> 4.4.2.11 --- pkgs/development/compilers/mono/4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix index 7de39f9cbcd..1ec679e6e41 100644 --- a/pkgs/development/compilers/mono/4.4.nix +++ b/pkgs/development/compilers/mono/4.4.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix (rec { inherit Foundation libobjc; - version = "4.4.1.0"; - sha256 = "0jibyvyv2jy8dq5ij0j00iq3v74r0y90dcjc3dkspcfbnn37cphn"; + version = "4.4.2.11"; + sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h"; }) From 4829cd7f653fc3b33a8eeedba12568ee72a1599a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 8 Sep 2016 01:51:28 +0000 Subject: [PATCH 149/195] kernel: 4.7.2 -> 4.7.3 --- pkgs/os-specific/linux/kernel/linux-4.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix index bd54c5352a5..ff47e1758c7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.7.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.2"; + version = "4.7.3"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1234z4wzvrbyzql6cc8i4bq7bbbjgaxhys4fcnqzm14lavk3wjaq"; + sha256 = "16rr5nj78jh1l46baa0qgzbw44slyqw5ivfn1y7dcxrgb17bvrqc"; }; kernelPatches = args.kernelPatches; From 23e0d4ae670a00c2f320633c584fd6a86da78a4a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Sep 2016 20:51:38 -0500 Subject: [PATCH 150/195] qt5.mlt: fix build with Qt 5.7 --- pkgs/development/libraries/mlt/qt-5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 259d5a25d15..7633008b4be 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { "--enable-opengl" ]; + CXXFLAGS = "-std=c++11"; + enableParallelBuilding = true; postInstall = '' From c6246e9c7259e3e925635e3ea70bec37a60cc359 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Sep 2016 20:51:51 -0500 Subject: [PATCH 151/195] qt5.poppler: fix build with Qt 5.7 --- pkgs/development/libraries/poppler/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index be38d0cd47e..fd3c063ed90 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + CXXFLAGS = lib.optional qt5Support "-std=c++11"; + configureFlags = with lib; [ "--enable-xpdf-headers" From e25a07e92a64415810da092cafa211ea2f846258 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Sep 2016 20:57:55 -0500 Subject: [PATCH 152/195] qt5.vlc: mark broken with Qt 5.7 --- pkgs/applications/video/vlc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3cc4c310ed5..f3554ab230e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -76,5 +76,9 @@ stdenv.mkDerivation rec { homepage = http://www.videolan.org/vlc/; platforms = platforms.linux; license = licenses.lgpl21Plus; + broken = + if withQt5 + then builtins.compareVersions qtbase.version "5.7.0" >= 0 + else false; }; } From b020675453d004be8bfe0d293ada91d99d2230aa Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 8 Sep 2016 11:34:50 +0900 Subject: [PATCH 153/195] pamix: init at 1.4.1 --- pkgs/applications/audio/pamix/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/audio/pamix/default.nix diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix new file mode 100644 index 00000000000..8f71c848f18 --- /dev/null +++ b/pkgs/applications/audio/pamix/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub +, autoreconfHook, autoconf-archive, pkgconfig +, libpulseaudio, ncurses }: + +stdenv.mkDerivation rec { + name = "pamix-${version}"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "patroclos"; + repo = "pamix"; + rev = "v${version}"; + sha256 = "06pxpalzynb8z7qwhkfs7sj823k9chdmpyj40rp27f2znf2qga19"; + }; + + nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ]; + buildInputs = [ libpulseaudio ncurses ]; + + meta = with stdenv.lib; { + description = "Pulseaudio terminal mixer"; + homepage = https://github.com/patroclos/PAmix; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ericsagnes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0102a4d97ec..b9cc5c2af22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14226,6 +14226,8 @@ in osmo = callPackage ../applications/office/osmo { }; + pamix = callPackage ../applications/audio/pamix { }; + pamixer = callPackage ../applications/audio/pamixer { }; pan = callPackage ../applications/networking/newsreaders/pan { From 1a2b47463b45c2b05ec80ade28781afc986576af Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Thu, 8 Sep 2016 12:51:05 +0530 Subject: [PATCH 154/195] txt2man: enable darwin platform Tested on Mac OS X 10.10, Nix 1.11.4 with: nix-build -A txt2man result/txt2man --- pkgs/tools/misc/txt2man/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index 3b7730347ac..3c894611f69 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Convert flat ASCII text to man page format"; homepage = http://mvertes.free.fr/; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ bjornfor ]; }; } From e57b658049d002a046a5ae204718bef5b396ce10 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 8 Sep 2016 11:09:54 +0200 Subject: [PATCH 155/195] elixir: 1.3.1 -> 1.3.2 --- pkgs/development/interpreters/elixir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 1824287c823..0a8d41ed909 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "elixir"; rev = "v${version}"; - sha256 = "0pihqgsnddrhhcpiphz170wgwlc59pd492iy4f66dajapm5k329d"; + sha256 = "0dib7j81vgbi0npn13jj19rbrsn66cr0rm05hnhkqz6dixz96xcy"; }; buildInputs = [ erlang rebar makeWrapper ]; From f999e9edf8c89f658ce0e2c146634dd54159e6dd Mon Sep 17 00:00:00 2001 From: "Andrew R. M" Date: Tue, 6 Sep 2016 19:59:16 -0400 Subject: [PATCH 156/195] weechat: help weechat find nix's python on darwin --- pkgs/applications/networking/irc/weechat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 1ad0cfa6275..75e5cc4db43 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; cmakeFlags = with stdenv.lib; [] - ++ optional stdenv.isDarwin "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" + ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"] ++ optional (!guileSupport) "-DENABLE_GUILE=OFF" ++ optional (!luaSupport) "-DENABLE_LUA=OFF" ++ optional (!perlSupport) "-DENABLE_PERL=OFF" From 7c8f19b31bdb98404ad3bc9b7d8007207c2387de Mon Sep 17 00:00:00 2001 From: Peter Pickford Date: Thu, 8 Sep 2016 00:56:17 -0700 Subject: [PATCH 157/195] eclipse-cpp-46: init at 4.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn: fix hash for i686-linux (was wrong length), remove backward compatibility attribute alias (not needed for new packages), change commit message (this adds a package, it doesn't upgrade / change existing one).] --- pkgs/applications/editors/eclipse/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 776d771f9b0..3d59777e5f0 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -199,6 +199,23 @@ rec { }; eclipse_cpp_45 = eclipse-cpp-45; # backward compatibility, added 2016-01-30 + eclipse-cpp-46 = buildEclipse { + name = "eclipse-cpp-4.6.0"; + description = "Eclipse IDE for C/C++ Developers, Neon release"; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz; + sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz; + sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h"; + } + else throw "Unsupported system: ${stdenv.system}"; + }; + eclipse-sdk-421 = buildEclipse { name = "eclipse-sdk-4.2.1"; description = "Eclipse Classic"; From bf371a8b0622208aae1727dc1cfeb77df9973271 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 8 Sep 2016 12:34:22 +0200 Subject: [PATCH 158/195] radicale service: use "simple" service type (#18406) Radicale can run as a foreground service and will then emits logging and errors on the standard output. This helps the logging end up in the systemd journal. --- nixos/modules/services/networking/radicale.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 19762f4e570..d5e2e3041b4 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -52,8 +52,7 @@ in description = "A Simple Calendar and Contact Server"; after = [ "network-interfaces.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -d"; - serviceConfig.Type = "forking"; + script = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -f"; serviceConfig.User = "radicale"; serviceConfig.Group = "radicale"; }; From 440d721915c0f44261b3635bfbced5c6bb3f8d7d Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Thu, 8 Sep 2016 15:25:00 +0530 Subject: [PATCH 159/195] txt2man: mention runtime dependencies on gawk and coreutils The commit message in 1a2b47463b45c2b05ec80ade28781afc986576af is incorrect -- the package seemed to work because only the help message was invoked: result/bin/txt2man -h To guard against such trivial successes, this commit introduces a test. --- pkgs/tools/misc/txt2man/default.nix | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index 3c894611f69..29bd3235dfb 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, coreutils, gawk }: stdenv.mkDerivation rec { name = "txt2man-1.5.6"; @@ -12,7 +12,27 @@ stdenv.mkDerivation rec { makeFlags=prefix="$out" ''; - meta = { + patchPhase = '' + for f in bookman src2man txt2man; do + substituteInPlace $f --replace "gawk" "${gawk}/bin/gawk" + + substituteInPlace $f --replace "(date" "(${coreutils}/bin/date" + substituteInPlace $f --replace "=cat" "=${coreutils}/bin/cat" + substituteInPlace $f --replace "cat <<" "${coreutils}/bin/cat <<" + substituteInPlace $f --replace "expand" "${coreutils}/bin/expand" + substituteInPlace $f --replace "(uname" "(${coreutils}/bin/uname" + done + ''; + + doCheck = true; + + checkPhase = '' + # gawk and coreutils are part of stdenv but will not + # necessarily be in PATH at runtime. + sh -c 'unset PATH; printf hello | ./txt2man' + ''; + + meta = { description = "Convert flat ASCII text to man page format"; homepage = http://mvertes.free.fr/; license = stdenv.lib.licenses.gpl2; From a1ff5e6e4ac80ebac739f6b3317b16eeb977db57 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 8 Sep 2016 13:04:13 +0200 Subject: [PATCH 160/195] hipchat: Add dependency to libtool This commit fixes some broken context menus --- .../networking/instant-messengers/hipchat/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index c782b857e0c..02d0267fcaf 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, mesa_noglu, xcbutilkeysyms, xdg_utils }: +, mesa_noglu, xcbutilkeysyms, xdg_utils, libtool }: let @@ -31,6 +31,7 @@ let dbus alsaLib zlib + libtool libxml2 libxslt expat From 4bef63d227f51004f8c8ee2859cd642121c2e8dc Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 8 Sep 2016 13:48:45 +0200 Subject: [PATCH 161/195] tmuxp: Add dependency to pytest --- pkgs/tools/misc/tmuxp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 08dcc184b3c..91a55694f85 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec { sha256 = "05z5ssv9glsqmcy9fdq06bawy1274dnzqsqd3a4z4jd0w6j09smn"; }; + buildInputs = with pythonPackages; [ pytest ]; + propagatedBuildInputs = with pythonPackages; [ click colorama kaptan libtmux ]; From bc7e4e390a9cc20c86b1af66778f75275e4ceb8c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Sep 2016 13:58:05 +0200 Subject: [PATCH 162/195] linux: 4.4.19 -> 4.4.20 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index b1892e51600..6f6a720b412 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.19"; + version = "4.4.20"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1566d8x0ljdsgcgazj7paia3m3qfjw0hw3qh9dg6yd321dphrbam"; + sha256 = "1ammaspil0xxw32c5j4mznkhfbpz1i14rm4n148d0fa1m5qbqcfj"; }; kernelPatches = args.kernelPatches; From 4ff7facccc601718efa97bd5e0cd653a81c46d03 Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 8 Sep 2016 13:03:56 +0100 Subject: [PATCH 163/195] vrpn: 07.30 -> 2016-08-27 --- pkgs/development/libraries/vrpn/default.nix | 46 ++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index ce0fd327304..5250b781590 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -1,34 +1,34 @@ -{ fetchurl, stdenv, unzip, cmake, mesa }: +{ stdenv, fetchFromGitHub, unzip, cmake, mesa }: -stdenv.mkDerivation { - name = "vrpn-07.30"; +stdenv.mkDerivation rec { + name = "${pname}-${date}"; + pname = "vrpn"; + date = "2016-08-27"; - src = fetchurl { - url = "ftp://ftp.cs.unc.edu/pub/packages/GRIP/vrpn/vrpn_07_30.zip"; - sha256 = "1rysp08myv88q3a30dr7js7vg3hvq8zj2bjrpcgpp86fm3gjpvb4"; + src = fetchFromGitHub { + owner = "vrpn"; + repo = "vrpn"; + rev = "9fa0ab3676a43527301c9efd3637f80220eb9462"; + sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh"; }; buildInputs = [ unzip cmake mesa ]; - doCheck = false; # FIXME: test failure + doCheck = false; # FIXME: test failure checkTarget = "test"; - meta = { + meta = with stdenv.lib; { description = "Virtual Reality Peripheral Network"; - - longDescription = - '' The Virtual-Reality Peripheral Network (VRPN) is a set of classes - within a library and a set of servers that are designed to implement - a network-transparent interface between application programs and the - set of physical devices (tracker, etc.) used in a virtual-reality - (VR) system. - ''; - - homepage = http://www.cs.unc.edu/Research/vrpn/; - - license = stdenv.lib.licenses.boost; - # see # - - platforms = stdenv.lib.platforms.linux; + longDescription = '' + The Virtual-Reality Peripheral Network (VRPN) is a set of classes + within a library and a set of servers that are designed to implement + a network-transparent interface between application programs and the + set of physical devices (tracker, etc.) used in a virtual-reality + (VR) system. + ''; + homepage = http://www.vrpn.org/; + license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License + platforms = platforms.linux; + maintainers = with maintainers; [ ludo ]; }; } From 240ca8bebed5b25d57a6992b27423a98e83c0777 Mon Sep 17 00:00:00 2001 From: Benjamin Herr Date: Mon, 22 Aug 2016 23:49:31 +0200 Subject: [PATCH 164/195] evolution: improve out-of-gnome use Add `evolution_data_server` to `propagatedUserEnvPkgs`. Evolution needs `${gnome3.evolution_data_server}/libexec/evolution-source-registry` to be running to be able to find or create any account settings at all, and it apparently doesn't know to start it if it's not in the user env. Use `makeGAppsWrapper` instead of a custom `wrapProgram` invocation. Add `glib_networking`, `libgnome_keyring` and `dconf` to `buildInputs`. `libgnome_keyring` appears to be necessary for evolution to remember a password even for a single session, even if it doesn't get added to the keyring permanently. `dconf` is necessary to persist preferences. `glib_networking` is necessary to connect to mail servers. --- .../gnome-3/3.20/apps/evolution/default.nix | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix index 161b45d6f6b..0a52acbc30e 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix @@ -1,8 +1,8 @@ { stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight , pkgconfig, gtk3, glib, libnotify, gtkspell3 -, makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite +, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: +, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf }: let majVer = gnome3.version; @@ -11,18 +11,22 @@ in stdenv.mkDerivation rec { doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard + gnome3.evolution_data_server ]; propagatedBuildInputs = [ gnome3.gtkhtml ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool + buildInputs = [ gtk3 glib intltool itstool libxml2 libtool gdk_pixbuf gnome3.defaultIconTheme librsvg db icu gnome3.evolution_data_server libsecret libical gcr webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 libcanberra_gtk3 bogofilter gnome3.libgdata sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas makeWrapper ]; + gnome3.gsettings_desktop_schemas dconf + gnome3.libgnome_keyring gnome3.glib_networking ]; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" "--disable-libcryptui" ]; @@ -31,14 +35,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Evolution; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; From f39f829441710a754842590fd49b67a85e0d4eab Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 8 Sep 2016 21:18:21 +0900 Subject: [PATCH 165/195] nixos: unbreak influxdb test (due to new API) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Data from the documentation example[1] was used. [1] https://docs.influxdata.com/influxdb/v1.0/guides/writing_data/ [Bjørn: change commit message.] --- nixos/tests/influxdb.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index 0408d8983ad..aca2189716a 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -22,18 +22,15 @@ import ./make-test.nix ({ pkgs, ...} : { # create database $one->succeed(q~ - curl -X POST 'http://localhost:8086/db?u=root&p=root' \ - -d '{"name": "test"}' + curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE test" ~); # write some points and run simple query $one->succeed(q~ - curl -X POST 'http://localhost:8086/db/test/series?u=root&p=root' \ - -d '[{"name":"foo","columns":["val"],"points":[[6666]]}]' + curl -XPOST 'http://localhost:8086/write?db=test' --data-binary 'cpu_load_short,host=server01,region=us-west value=0.64 1434055562000000000' ~); $one->succeed(q~ - curl -G 'http://localhost:8086/db/test/series?u=root&p=root' \ - --data-urlencode 'q=select * from foo limit 1' | grep 6666 + curl -GET 'http://localhost:8086/query' --data-urlencode "db=test" --data-urlencode "q=SELECT \"value\" FROM \"cpu_load_short\" WHERE \"region\"='us-west'" | grep "0\.64" ~); ''; }) From f77191888d724d2f4ba077fc534205bad0e5d137 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 8 Sep 2016 15:25:05 +0200 Subject: [PATCH 166/195] prometheus-alertmanager: 0.3.0 -> 0.4.2 --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 55ac38f2e37..e9223b3dafd 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.3.0"; + version = "0.4.2"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0ychc2qvn3lzs4rg5f5sslil7clvcpzclcmfj83qjqp8krpg72b5"; + sha256 = "1ngfilln259mh92x5wigiz70lnkgwpfbbmf5682j4pw7m3bxaam8"; }; # Tests exist, but seem to clash with the firewall. From 64bd8c037d3d1a968a6759de17034a5ae9648c9c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 8 Sep 2016 15:25:29 +0200 Subject: [PATCH 167/195] prometheus: 1.0.0 -> 1.1.2 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index ad9143ec33f..f6e58e0a745 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "prometheus-${version}"; - version = "1.0.0"; + version = "1.1.2"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "0wb6aj2019b2bkaai94mxdy8gr6gs7jpkm7ms8h9n2ms041gdsff"; + sha256 = "1k0lfmfkyibjan590wyswr65yr940w8d1zma6k3l2hc025xpi2i4"; }; docheck = true; From 7ffbe5174f0b349396571031a7a3d8ddfb08cd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 8 Sep 2016 15:30:41 +0200 Subject: [PATCH 168/195] sablotron: update source URL The current URL no longer works, switch to a sourceforge mirror URL. Fixes issue #18337. --- pkgs/tools/text/xml/sablotron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/sablotron/default.nix b/pkgs/tools/text/xml/sablotron/default.nix index aeb07d451bf..131bf3ae68c 100644 --- a/pkgs/tools/text/xml/sablotron/default.nix +++ b/pkgs/tools/text/xml/sablotron/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "sablotron-1.0.3"; src = fetchurl { - url = http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz; - md5 = "72654c4b832e7562f8240ea675577f5e"; + url = "mirror://sourceforge/project/sablotron/sablotron-1.0.3/Sablot-1.0.3.tar.gz"; + sha256 = "0qpk3dlfp3bn2hbq0fzx1bzifv8cgqb9aicn59d303cdlynkgix0"; }; buildInputs = [expat]; From 75baee8523f62b75a0cf350a8360ce8f3e3c3695 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Sep 2016 15:34:04 +0200 Subject: [PATCH 169/195] runInMachine: Support passAsFile We need to rewrite attributes passed via files to their location in /tmp/xchg in the VM. Otherwise functions like runCommand don't work. --- nixos/lib/testing.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 61b214bfba8..b177146a56b 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -157,9 +157,7 @@ rec { ${coreutils}/bin/mkdir -p $TMPDIR cd $TMPDIR - $origBuilder $origArgs - - exit $? + exec $origBuilder $origArgs ''; testScript = '' @@ -172,9 +170,20 @@ rec { ''; vmRunCommand = writeText "vm-run" '' + xchg=vm-state-client/xchg ${coreutils}/bin/mkdir $out - ${coreutils}/bin/mkdir -p vm-state-client/xchg - export > vm-state-client/xchg/saved-env + ${coreutils}/bin/mkdir -p $xchg + + for i in $passAsFile; do + i2=''${i}Path + _basename=$(${coreutils}/bin/basename ''${!i2}) + ${coreutils}/bin/cp ''${!i2} $xchg/$_basename + eval $i2=/tmp/xchg/$_basename + ${coreutils}/bin/ls -la $xchg + done + unset i i2 _basename + + export > $xchg/saved-env export tests='${testScript}' ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm ''; # */ From f283e8e83b9e1cd7829c3cbe8e0bbdbc82444cb7 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 8 Sep 2016 06:35:22 +0000 Subject: [PATCH 170/195] plex: remove plexpass at the request of Plex joachifm: throw error instead of silently ignoring user's config.plex.pass setting. Closes https://github.com/NixOS/nixpkgs/pull/18416 --- pkgs/servers/plex/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index f31971bf4c1..28d6295938a 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -4,11 +4,8 @@ }: let - plexpkg = if enablePlexPass then { - version = "1.0.1.2396"; - vsnHash = "c094d0d"; - sha256 = "0bhbpaj88989zn1q590mkcqshcpir87yiac9x1dl0afzpxj09lcz"; - } else { + plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; + plexpkg = if enablePlexPass then plexPass else { version = "1.0.0.2261"; vsnHash = "a17e99e"; sha256 = "14li33ni6aaa1qwvc02a066k52s1qwhpv55prvlmq3m5jm3iv0lr"; From df6827a82495c4f7f9219569a52ae3c175728111 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Sat, 5 Sep 2015 20:59:38 -0700 Subject: [PATCH 171/195] taskjuggler: add 3.5.0, keep 2.4.3 Version 3.5.0 was present but was removed in 8085f08. Keeping the old version per discussion at https://github.com/NixOS/nixpkgs/pull/845. --- .../misc/taskjuggler/{ => 2.x}/default.nix | 0 .../{ => 2.x}/timezone-glibc.patch | 0 .../applications/misc/taskjuggler/3.x/Gemfile | 2 + .../misc/taskjuggler/3.x/Gemfile.lock | 21 +++++++++ .../misc/taskjuggler/3.x/default.nix | 17 +++++++ .../misc/taskjuggler/3.x/gemset.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++- 7 files changed, 92 insertions(+), 1 deletion(-) rename pkgs/applications/misc/taskjuggler/{ => 2.x}/default.nix (100%) rename pkgs/applications/misc/taskjuggler/{ => 2.x}/timezone-glibc.patch (100%) create mode 100644 pkgs/applications/misc/taskjuggler/3.x/Gemfile create mode 100644 pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock create mode 100644 pkgs/applications/misc/taskjuggler/3.x/default.nix create mode 100644 pkgs/applications/misc/taskjuggler/3.x/gemset.nix diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/default.nix rename to pkgs/applications/misc/taskjuggler/2.x/default.nix diff --git a/pkgs/applications/misc/taskjuggler/timezone-glibc.patch b/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch similarity index 100% rename from pkgs/applications/misc/taskjuggler/timezone-glibc.patch rename to pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/pkgs/applications/misc/taskjuggler/3.x/Gemfile new file mode 100644 index 00000000000..77cbaeeed79 --- /dev/null +++ b/pkgs/applications/misc/taskjuggler/3.x/Gemfile @@ -0,0 +1,2 @@ +source 'http://rubygems.org' +gem 'taskjuggler' diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock new file mode 100644 index 00000000000..d1642e76fa6 --- /dev/null +++ b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock @@ -0,0 +1,21 @@ +GEM + remote: http://rubygems.org/ + specs: + mail (2.6.3) + mime-types (>= 1.16, < 3) + mime-types (2.6.1) + taskjuggler (3.5.0) + mail (>= 2.4.3) + term-ansicolor (>= 1.0.7) + term-ansicolor (1.3.2) + tins (~> 1.0) + tins (1.6.0) + +PLATFORMS + ruby + +DEPENDENCIES + taskjuggler + +BUNDLED WITH + 1.10.5 diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/3.x/default.nix new file mode 100644 index 00000000000..eaca537356b --- /dev/null +++ b/pkgs/applications/misc/taskjuggler/3.x/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv { + name = "taskjuggler-3.5.0"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = { + description = "A modern and powerful project management tool"; + homepage = http://taskjuggler.org/; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix new file mode 100644 index 00000000000..e65ab3451a6 --- /dev/null +++ b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix @@ -0,0 +1,47 @@ +{ + "mail" = { + version = "2.6.3"; + source = { + type = "gem"; + sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; + }; + dependencies = [ + "mime-types" + ]; + }; + "mime-types" = { + version = "2.6.1"; + source = { + type = "gem"; + sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; + }; + }; + "taskjuggler" = { + version = "3.5.0"; + source = { + type = "gem"; + sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2"; + }; + dependencies = [ + "mail" + "term-ansicolor" + ]; + }; + "term-ansicolor" = { + version = "1.3.2"; + source = { + type = "gem"; + sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys"; + }; + dependencies = [ + "tins" + ]; + }; + "tins" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz"; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14161743097..c98752b2732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14957,7 +14957,11 @@ in teamspeak_client = qt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { }; + taskjuggler-2 = callPackage ../applications/misc/taskjuggler/2.x { }; + + taskjuggler = callPackage ../applications/misc/taskjuggler/3.x { + ruby = ruby_2_0; + }; tasknc = callPackage ../applications/misc/tasknc { }; From 33300d380be364c0059d204752c16bc8efd49893 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 8 Sep 2016 15:41:49 +0200 Subject: [PATCH 172/195] wireshark: 2.0.5 -> 2.2.0 Release note: https://www.wireshark.org/docs/relnotes/wireshark-2.2.0.html Security related annonces related to 2.0.5 (subject to denial of service attack): https://www.wireshark.org/security/wnpa-sec-2016-50.html https://www.wireshark.org/security/wnpa-sec-2016-51.html https://www.wireshark.org/security/wnpa-sec-2016-52.html https://www.wireshark.org/security/wnpa-sec-2016-53.html https://www.wireshark.org/security/wnpa-sec-2016-54.html https://www.wireshark.org/security/wnpa-sec-2016-55.html --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 32bd9e10467..bbd08f00577 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -11,7 +11,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "2.0.5"; + version = "2.2.0"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "02xi3fz8blcz9cf75rs11g7bijk06wm45vpgnksp72c2609j9q0c"; + sha256 = "010i7wpsv2231pwb1xdqs0xfwywi3514siidv6wnrfpw3rs7x156"; }; buildInputs = [ From ab8474e30fe8d84814517e23e4eeb2884d8a8885 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 8 Sep 2016 16:31:01 +0200 Subject: [PATCH 173/195] zimg: meta.platform -> platforms --- pkgs/development/libraries/zimg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 3f11cd71a3f..9e8de5a5aac 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec{ description = "Scaling, colorspace conversion and dithering library"; homepage = https://github.com/sekrit-twc/zimg; license = licenses.wtfpl; - platform = platforms.linux; # check upstream issue #52 + platforms = platforms.linux; # check upstream issue #52 maintainers = with maintainers; [ rnhmjoj ]; }; } From ed94adc66b5e98c9113d89116c67ff504b697819 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 8 Sep 2016 09:49:17 -0500 Subject: [PATCH 174/195] melpaPackages 2016-09-07 --- .../editors/emacs-modes/melpa-generated.nix | 1286 ++++++++++------- 1 file changed, 767 insertions(+), 519 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 0f7e8cad751..94bbcaf274e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -359,8 +359,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "a58dd558e6ad4f8f5d78b743955a758178e323be"; - sha256 = "1jn2raymx4qml8h7ala8jhgfzfbppd5nq55ffbs0il46r9w3n086"; + rev = "4b873d36a3a9a90999a59c074c0a9e86fdbb9c51"; + sha256 = "0mnaahi5pjkz67vykpaqzi9w005zsy18k4s3scksvpd6as4jbdid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -1558,12 +1558,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20150814.1101"; + version = "20160906.643"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "8259da1cc14e7f7dd3ee0fb01245c58110a95382"; - sha256 = "0x72czw5rmz89w5fa27z54bz8qirrr882g0r37pb8li04j1hk7kw"; + rev = "ad6b85dcc9bdc698d1a6ce657addd133c180eeea"; + sha256 = "0c6jr8izks2x316xzcd962aiy7q4zmwfn8w4i85ans01a88249xf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -1600,12 +1600,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20160825.204"; + version = "20160901.1423"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "7128978b571ec013ccfd91865029cc0d062c269c"; - sha256 = "0l683fk3l82w6097d1g8i9ka3sfv9vpa363i6500xwraa49fcq9i"; + rev = "359c9d62649ad3f2cb007c4d8871e5b051d695f6"; + sha256 = "1kwn5lln7l754x5l3glij7ci3r2g6p9sapc43bm2gmwbgxa9fgis"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1745,12 +1745,12 @@ annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "annotate"; - version = "20160825.444"; + version = "20160906.2352"; src = fetchFromGitHub { owner = "bastibe"; repo = "annotate.el"; - rev = "95da17258802a0a831ed1558faca64b589b261af"; - sha256 = "1bjh5qm9zjw2i1h9c7fd5csmn762i1wp4hsvrifnzaawxlxx9bhj"; + rev = "9616c55812c4b6f11365e0f4e90f9357c95280ff"; + sha256 = "0wkdvmszabx1rcwqbm6rw07niwd7n4bdb9h2iav2miljwy68s40x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate"; @@ -2698,8 +2698,8 @@ src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "bda696babcf4f4df435415e2d6a9c54fa99b230c"; - sha256 = "0zq4am4jgb1rnr2gvi9156y7zi6vfkrasjfj5ar1pw4k0cba7pf6"; + rev = "c4d5a1ecea2506fc9854f3740550616a92c76686"; + sha256 = "0bfr0fc6mjll6jg15g8k46vp5xaqkjhda1caynwzpb26mr3jcf3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -3946,12 +3946,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20160828.1825"; + version = "20160906.2114"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "24dee691af4758d04595cc14f3c2536d39b26f58"; - sha256 = "0qvawqrnl0zx3nzs1fapvfgs7pj1ylqnv7hgs8z5fshy5h96zv2b"; + rev = "d97474f6188700556ac4e121b7ea8887e24a8c0b"; + sha256 = "02pj78ccxzkbw7kgnqjpicyy672c1irlya0kq7q38yfmvnsjrxgc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4526,12 +4526,12 @@ biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "biblio"; - version = "20160625.923"; + version = "20160901.1115"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "biblio.el"; - rev = "55a72b5cd41325d8c98a73932ef3a7b0cf71ea63"; - sha256 = "0d2yj315snd9h8bnbfk9rnr4ybxfpcj1c423hvpbrf54agy57gac"; + rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9"; + sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fbaa8c59b0e64d13beb0e0f18b0734afa84f51/recipes/biblio"; @@ -4547,12 +4547,12 @@ biblio-core = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "biblio-core"; - version = "20160625.923"; + version = "20160901.1115"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "biblio.el"; - rev = "55a72b5cd41325d8c98a73932ef3a7b0cf71ea63"; - sha256 = "0d2yj315snd9h8bnbfk9rnr4ybxfpcj1c423hvpbrf54agy57gac"; + rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9"; + sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f086d3e8fd6a95ce198e148cd3ede35dd73fb8/recipes/biblio-core"; @@ -5068,7 +5068,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20160624.948"; + version = "20160906.1010"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad"; @@ -5087,12 +5087,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20160830.1218"; + version = "20160906.1203"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "c0413bf1eafbee891ec1ed6c290d107056db4fbd"; - sha256 = "1kfvbmsrwcch3ykllfgwknir0hizqqyx01wm16sq0wly6c8fjcca"; + rev = "bef6f50554209ccdfba9261fac9a1c40f08e47ef"; + sha256 = "0z176l6bfpyr1z51k3zyfsgnz46mpabncf1pjyip9ddw08qr2ird"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -6148,12 +6148,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20160807.831"; + version = "20160906.1346"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "0ce335ee0284e9158c56b7002ecd51f597bf8d32"; - sha256 = "15jfbwl6xa583fmym432kygkb4sfvcxfqvirrihkmd33c61ski9b"; + rev = "9ab9937f6c2abb94b24383603838d762909bb62c"; + sha256 = "05a2nsr2pd679k5z9lj3q4pivvnd9xnnv49an90m6z9bvdcdp1kk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6211,12 +6211,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20160816.753"; + version = "20160907.306"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "0828b34d93f3a300fc1c0a40132c17ae7f4bedcb"; - sha256 = "08wy9ksy21v25kbmgdn62x1b2rryfrgl17w36ms03v83drc7l486"; + rev = "f5b828ef4ff6c367f87181a5b998aa78e42c2f24"; + sha256 = "0kmm1dlyf4f8b7dy2v2n7nf6620v6cq70ndlv5607dibhmaa8ksr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6295,12 +6295,12 @@ cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cbm"; - version = "20160628.1348"; + version = "20160905.303"; src = fetchFromGitHub { owner = "akermu"; repo = "cbm.el"; - rev = "3c7f33d26336776f94877974f5f7e1470ea1cbdd"; - sha256 = "0rrgi765x9p9wa14p2b5jhsk86cmiicx2a239jkxm00w3sdn7rn8"; + rev = "bd74f5f83ea1778d2e871cbcbedf458ccde40128"; + sha256 = "1smj2l0g0643qp2c5jgj7z9yk6y8yia5a33pfbdpa4qwgq1ap3m4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm"; @@ -6549,8 +6549,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "7ba51548b2a5e8d90f75f95adf6978992cc90d07"; - sha256 = "0s48s2znrxcx9zqvp4141qzf6kjag0wl0y65vps2bsifq5zdwdsw"; + rev = "52debcc0a272e8c6c0bda85a46b1880d8a7e5d60"; + sha256 = "1nb5wmn04in8a4d2maqxmynbkhigi8r8pl6j72s4in694y0mnn61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6589,7 +6589,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11715"; + rev = "11717"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6898,12 +6898,12 @@ chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-fonts-setup"; - version = "20160830.2145"; + version = "20160906.2229"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-fonts-setup"; - rev = "d1f020daba8bdc1acfb3d5828ed8d830089e8da0"; - sha256 = "1s7sv5j6vkpqzrjy6w3kvfc8qxfrm5rd4ih3nm14v0z26qm5fwhi"; + rev = "c17d7f3a16a2551d7c8e908186dcc361fad9ba40"; + sha256 = "0vg1rxn3lwvmapw63i9i9iccs86xmjr83kx96w8gligacvnbgnzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; @@ -6919,12 +6919,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20160809.1712"; + version = "20160831.2112"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "99d161a56b907e8bc8079d49554b60404e93565b"; - sha256 = "1wdr1hz8v045d17n1vf2gf0119lvhbnykfrzkwm11cs9plk0vmqb"; + rev = "d173f6da0fa304bf69504aa99b64ffa8a2a1beee"; + sha256 = "12wy66binrbakbj2ak6a54j9z7nx1fgpsngyhl5vrb8vhbg60f9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7168,12 +7168,12 @@ cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: melpaBuild { pname = "cider-eval-sexp-fu"; - version = "20160411.2328"; + version = "20160907.100"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider-eval-sexp-fu"; - rev = "63b849b8f996032f662364c451c8e950ce94c8d9"; - sha256 = "0g8yzfpaz1glxd0dxrd19bvk469pdjkr4b11xifcvamxa2slryij"; + rev = "06fefc17ea8a87997d1f18b25e78d874b10299ad"; + sha256 = "1lhf5g5gi31pv2c80fsnw62zfikj3prbs6xwaikbywp48dzhx02y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu"; @@ -7315,12 +7315,12 @@ circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe-notifications"; - version = "20160809.2023"; + version = "20160902.42"; src = fetchFromGitHub { owner = "eqyiel"; repo = "circe-notifications"; - rev = "251aaeef50346fa85e0a0a6eadc71a23b80ebdc6"; - sha256 = "0jfp0ydrkfcwkx32dikhsfxr6vkf7d55pba6wbb2h13wpz4d4n4s"; + rev = "80c44441ecd3ae04ae63760aa20afa837c1ed05b"; + sha256 = "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; @@ -7381,8 +7381,8 @@ version = "20151116.438"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "280224"; - sha256 = "0v0wzbma0acn44as6hhpar70bs99vsgpv5caqxx6c90spp8h2agf"; + rev = "280808"; + sha256 = "0jli8vapg8frk12djhrgz4wfhl7pxka73wx0x41a4k45y9yijyfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7872,12 +7872,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20160415.1916"; + version = "20160902.1242"; src = fetchFromGitLab { owner = "tarsius"; repo = "closql"; - rev = "a8b6b2beaa10528b2fd5ed9759136e3959529266"; - sha256 = "1p251vyh8fc6xzaf0v7yvf4wkrvcfjdb3qr88ll4xcb61gj3vi3a"; + rev = "8e4d0b3b31913a2362a45fcdaf05745dfc188b66"; + sha256 = "1189drdpzp05kafg5wfi556n2v6a957qs9xm3v9k2rsbgnyd2hgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql"; @@ -8023,8 +8023,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "9bbf1dc06ebb891498747768736442b22058c49e"; - sha256 = "02zafa14znp91rlbsfhc2s81xai8zvwp1klc7210y47p302nipw2"; + rev = "f76bcee9a6a95b566e36b533a5fa45b496eb456b"; + sha256 = "00k49iwbkc82wk3ik05al0xyj34vagdall2bqb6c4lv9plica189"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8787,12 +8787,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "20150901.250"; + version = "20160905.1243"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "cfe1c915f49d716f30eec654c54db761f662952c"; - sha256 = "06gh33qzglv40r62dsapzhxwparw8ciblv80g7h6y6ilyazwcidn"; + rev = "09065115bead0a14c134d4419944eed7e999284c"; + sha256 = "1vygalvg3hky0hacvj8pgjiaym91yh0npq69q4qi3slz87rpl24c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -9016,8 +9016,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "a58dd558e6ad4f8f5d78b743955a758178e323be"; - sha256 = "1jn2raymx4qml8h7ala8jhgfzfbppd5nq55ffbs0il46r9w3n086"; + rev = "4b873d36a3a9a90999a59c074c0a9e86fdbb9c51"; + sha256 = "0mnaahi5pjkz67vykpaqzi9w005zsy18k4s3scksvpd6as4jbdid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9054,12 +9054,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20160829.820"; + version = "20160831.1929"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "484d726a2ec63b1ea0052885dd4d88a6fba22620"; - sha256 = "1ly17p4radjaxaic3b0c2dd0bp1p6370l5zxbddz3cb2qx3fh7h4"; + rev = "5439c4060ef0b8120ed6e9bb6c549d412eb809de"; + sha256 = "1mdx07891gll4rkgm7y0vdp980g72rv07wpnmjdp4v26qy9jnakg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9142,8 +9142,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "57b3fab1de11102eee896051605108949fbe75da"; - sha256 = "19829cfyl181kjqp5mn71f0symypfp1f2g5hi8a6949ya9n3l6rm"; + rev = "46e8fd2234a86934e3e8496c7405984ff7b18df5"; + sha256 = "1r8fh3mi5dywxx6qz2r9cnhnsxdcb52p168bfnadw17g9ps550ms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9610,8 +9610,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "200a6d2536cf4932b36a89a753eb9c6a12888f54"; - sha256 = "0avvsnizx8l0gyvzy8qkg0177agckxylldqk0vm45pqzzmbsvr02"; + rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193"; + sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -9648,12 +9648,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "composer"; - version = "20160827.235"; + version = "20160903.1100"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "a846d4d5be8c216b2f97b3e6d9b04b93bd766dd9"; - sha256 = "19ib567f6n0z4mgvrd099rw1la79as79lqns88fzj3zcpd93lkhx"; + rev = "5437ce0417e79ab4aad54f25bc756041eda4dece"; + sha256 = "02x1hs3mv7llidkig15m88nb3zp20smy6b80p7c71vbzapp1mz52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; @@ -9791,22 +9791,22 @@ license = lib.licenses.free; }; }) {}; - contrast-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + contrast-color = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "contrast-color"; - version = "20160713.1211"; + version = "20160903.1107"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "contrast-color-el"; - rev = "31a04e4776117096057ff189e7abd1a1d2fcc277"; - sha256 = "1x9vll92n7fff9q172r978s3mf5amxhwam5j0qvmbvzyiry30abz"; + rev = "c5fb77a211ebbef3185ada37bea7420534c33f94"; + sha256 = "06grlp93n50d7c5z43fia0d6r1hmfpnqa062fzrz8gypy5kqxi1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a13602e10a5fa889d0e094eff5b74a39023a477/recipes/contrast-color"; sha256 = "0pa88mfla7g7wpia0q1lkv2dncw63ivvh83hf73f75a22rvl8jcx"; name = "contrast-color"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/contrast-color"; license = lib.licenses.free; @@ -9920,12 +9920,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20160826.2343"; + version = "20160906.750"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "4c3ecb4d739df379dd01ac8c7dc17080e608dac3"; - sha256 = "0cah0ri248hy1xzrldhh831imyfvnm9jdwnnxqm0iphp4dsf1xk7"; + rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; + sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10359,12 +10359,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20160808.1235"; + version = "20160901.319"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "0c4edfd8e4916725810e26d8bb3c42a1d740c294"; - sha256 = "0335shnscf5z9jipz7cpwccl7w85svr5g77kr7lj2i4wklcj4qyg"; + rev = "2275ddab415bcd790f603ccfb6f613142c6144f1"; + sha256 = "16dabgcll453rwc7afigsbvk42dl9yb8ihgvvq01pv57y95jn5wf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -10874,8 +10874,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "09f6874a8e831370e9ba08e706e366ecfc72b408"; - sha256 = "1ii6v0bixwj64x3iw8xjy8n3x2brb2swwln176625lwz7x39jc2k"; + rev = "f0091a9d6580785b868e4660b3a53027a2447a3e"; + sha256 = "0wlvgpmj6rypgngkmf5wjy6hh45pws40b299r4j1rqk480px1d82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12230,8 +12230,8 @@ src = fetchFromGitHub { owner = "jidaikobo-shibata"; repo = "dired-explorer"; - rev = "0e929d4eab2eb545a2e2436994cf4941b643e5c1"; - sha256 = "02syawkw44f33hldp4ncws271jv6w4zid1acf4zkm40sbb0iqdil"; + rev = "f9ac7c511c4b2e349952eb4b99635047f3603907"; + sha256 = "03zax8q9wwj4q9l13zsznrx18b6d1rqrfgvmvzlkd3y4sqj2i64w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acd40e02185847dfdcd70b3cacea703133e4356d/recipes/dired-explorer"; @@ -12370,6 +12370,27 @@ license = lib.licenses.free; }; }) {}; + dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dired-launch"; + version = "20160904.1533"; + src = fetchFromGitHub { + owner = "thomp"; + repo = "dired-launch"; + rev = "1c24b5ea9d0b091fac58047cb1a1ca60a16a6594"; + sha256 = "0cnj9ffphsq7rzq4hnlxaxi4ziij2d86zqll5pg0ggdsfjhq2dv6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; + sha256 = "0vhf0iai60mp8sp7snishz6nrw0bcriq4cx64f41lk1adjb2mqaw"; + name = "dired-launch"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dired-launch"; + license = lib.licenses.free; + }; + }) {}; dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-narrow"; @@ -13830,7 +13851,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1758596"; + rev = "1759610"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -13931,12 +13952,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20160830.1152"; + version = "20160904.1855"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "c99c874451aefae9072e521e518a14aeb3559b12"; - sha256 = "1dw0ybx5xr9lrlnqblgw64dwk446812vgh1134jpdslzqjpirzwd"; + rev = "e32a4916a1cf0a7f455abce41015f297d9c5bc60"; + sha256 = "0lh32i3y3z5i5wvyxniw1biip59kzklz7nvxmxaqw2bbdbrqkwn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -14455,12 +14476,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "20160831.425"; + version = "20160905.1750"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "57a9a228743d5f773002f951b9bc5765ff9c7332"; - sha256 = "1rz4mdzwx293q8ba8gvidj79y7lcjy3dngvh9dhz9vig2xdggn77"; + rev = "0b97d84c342820f873e3bfe506365f9d51aad7a7"; + sha256 = "0p8pf902prs26fafzkavna3capfrq7abfmg06p1mi6mz32rqph5r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -14536,12 +14557,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20160831.455"; + version = "20160901.16"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "a58dd558e6ad4f8f5d78b743955a758178e323be"; - sha256 = "1jn2raymx4qml8h7ala8jhgfzfbppd5nq55ffbs0il46r9w3n086"; + rev = "4b873d36a3a9a90999a59c074c0a9e86fdbb9c51"; + sha256 = "0mnaahi5pjkz67vykpaqzi9w005zsy18k4s3scksvpd6as4jbdid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -14872,12 +14893,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20160808.2212"; + version = "20160904.1508"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "e54c0b8aa81bbd4292301c6c0cee2be71e62bccf"; - sha256 = "1jwkf1q59b24dk4zlpp25v8y7200a7mn5fjq8f8xzsw2vgfqz0zs"; + rev = "bf3bedb6f3740b1df20d7ab344c16984b141eac4"; + sha256 = "0aam813888m3smnh8ycmsmlb9nlkrxfv9myd7crvjgbsc6413bnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15110,12 +15131,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20160725.621"; + version = "20160831.817"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "a9736311c86d6b8b1fe4ecd695cecaeff968db8c"; - sha256 = "08wyqnmm775dk88ijyjqw8fv4393kd9zm05pvzi6vr3svb2fmhrm"; + rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e"; + sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein"; @@ -15219,8 +15240,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "a6638a664acd9313e8797d6c4087dafcc0ac45cb"; - sha256 = "049wwsxg0w803d2a5xkywldlqds7dbw6wa0m2lpip2yl08qfympg"; + rev = "0ee06a6f8890d3a1eca913e42c7f22e9d1d507e2"; + sha256 = "0dv4ags1hfv2fyypqn75cmnjgskwjkx6kjz5r1k93siz3grny8kf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -15545,12 +15566,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20160828.544"; + version = "20160904.910"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "49bffc321705179a06d685c2023e67229b952b36"; - sha256 = "1kqq557m5rm71hg3b7qr4md145dsp0g0xn2dim5jifcwmynf4m6f"; + rev = "4f8ced25619b34ca6b36f8446071c2cb75e23906"; + sha256 = "1lvlhjdprlw3dqz49h8gncw5q33mlpqwx9pgi7jj79hrsfq8fqml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -15608,12 +15629,12 @@ elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elf-mode"; - version = "20160829.1118"; + version = "20160901.435"; src = fetchFromGitHub { owner = "abo-abo"; repo = "elf-mode"; - rev = "ae5ff9b88033e275f8eeca1a0753ba6a8aa6153b"; - sha256 = "0208wkbi2qc1lfdisrdc36gpsmf9hlj99y6w3va01yl2b5hrc5ik"; + rev = "284dc09309360c69efa19979113b2245c551b259"; + sha256 = "1rv0ri5hhj3d5f1l4034sd9rd4g8z8zi2vpcd3vhdprlpgnqvn0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode"; @@ -15633,8 +15654,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "45cad0febad147c16ca52f24417b633501dbda22"; - sha256 = "11gq4jhvrnx4209dp5wp2lrpdcdfrn0m5gvzzzd363pv78qqnadq"; + rev = "85b59b9e580ab58a71852026698c6d61daa977e6"; + sha256 = "0ak7qar0wagb35cxzb09nfjmnb5wz5hiq2bardsvz9ifddi7nnps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -15699,12 +15720,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20160828.1809"; + version = "20160904.1131"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "45cad0febad147c16ca52f24417b633501dbda22"; - sha256 = "11gq4jhvrnx4209dp5wp2lrpdcdfrn0m5gvzzzd363pv78qqnadq"; + rev = "85b59b9e580ab58a71852026698c6d61daa977e6"; + sha256 = "0ak7qar0wagb35cxzb09nfjmnb5wz5hiq2bardsvz9ifddi7nnps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -15888,12 +15909,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20160605.201"; + version = "20160906.36"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "3112ff7964b596022de94c12b4676c6ca7a69c80"; - sha256 = "1n6gp3c4b3ryprw7hxd7447gkgjafxnlbfg75mjm96vfgxkb7abx"; + rev = "7e0da96f483703930919f04943f60f6eca3cb842"; + sha256 = "1y0prk4dbw6h26kj2l5vl3bakvc58aawjpkpb2r8wgb2b3fg9vl3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -16119,12 +16140,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: melpaBuild { pname = "elpy"; - version = "20160613.1005"; + version = "20160903.841"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "c0a92332bb0c0e784d226c1fe3ade9d8b924ddbb"; - sha256 = "1f7qrks9ldq247ibih8qdp377fhzl5mlx2z5qm4wk53wydp643nm"; + rev = "c3fb8a8a4aaa7aafec6a38d22ffe1731e7a8cf20"; + sha256 = "16c5pzrnnjg4dy1k07wn64nmvb8h86530krdyp5h5v4vlpwd3m67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; @@ -16608,12 +16629,12 @@ emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emmet-mode"; - version = "20160501.1151"; + version = "20160906.1919"; src = fetchFromGitHub { owner = "smihica"; repo = "emmet-mode"; - rev = "3c2d5c3e86c317601cbf8d976c5611b8c73ac178"; - sha256 = "1dh43fhkaqljnh1517kf8h3rjqaygj6wdhcbsy7mzcac0jrbfsfc"; + rev = "607a23d208405838325ca5203a1900682dad00ac"; + sha256 = "04b0663hxq7hyha6ccdxwdal803p91ipwhrk385qlc5i2mnx81fq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/emmet-mode"; @@ -16900,12 +16921,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20160805.918"; + version = "20160904.2344"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "2b5dde50a0f74a92d5c87ebf349351b871e483c4"; - sha256 = "144bmpvx62xm0j0ddbjn15n1rn55ilwj03cfyxw0s8xpx47jdgvc"; + rev = "f791ad4c741218668dad4ba8db65161da9a5b010"; + sha256 = "172p422889wikj9hvq973whqz9jnkaxay8lsa5zdk26i0b6a2kk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -17122,12 +17143,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20160828.1225"; + version = "20160905.704"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "a32b758ee6933597dd723694f560cefd7acd1849"; - sha256 = "1xf18wkqwb4ic2dd8594iqs03c5fxa9zr5x1mclv4ffb1ibk63g1"; + rev = "adca2a4dc74edca2a017374543bdcb45a3ffcabc"; + sha256 = "1wlm4c5pasvnh3mrkwvzhs5phyh3h1a6hyksm4lr7ynvgyn7nslz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17172,12 +17193,12 @@ eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }: melpaBuild { pname = "eopengrok"; - version = "20160213.2347"; + version = "20160903.2359"; src = fetchFromGitHub { owner = "youngker"; repo = "eopengrok.el"; - rev = "0bf07c636f8d29a98e9776243ec9496875ddff51"; - sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x"; + rev = "78f734328aaf19c52720415c037708ece1944c4c"; + sha256 = "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok"; @@ -17235,12 +17256,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20160515.809"; + version = "20160902.1246"; src = fetchFromGitLab { owner = "tarsius"; repo = "epkg"; - rev = "17553458c01563170be9c74db37bcc359a4702d4"; - sha256 = "18am0nc2kjxbnkls7dl9j47cynwiiafx8w6rqa4d9dyx7khl2rmp"; + rev = "b0606f9800c971085d5fef17dfe242aece378fb3"; + sha256 = "195y4clhs8lwbl3f5a9181v60n424s69nfzy9xrwzqclbyj42lr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg"; @@ -17651,6 +17672,27 @@ license = lib.licenses.free; }; }) {}; + ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: + melpaBuild { + pname = "ereader"; + version = "20160904.854"; + src = fetchFromGitHub { + owner = "bddean"; + repo = "emacs-ereader"; + rev = "d85ff3601f5f6c4771a3e215640f6bc026e02822"; + sha256 = "1i7599pddh5klad0a0lmkcb978ckc898nknlrbcbrh7r7gm70242"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader"; + sha256 = "10dhy4d8kwi983fx0klvpvwlwrwrnx1h4x32j2zzlg5rvig016li"; + name = "ereader"; + }; + packageRequires = [ dash emacs s xml-plus ]; + meta = { + homepage = "https://melpa.org/#/ereader"; + license = lib.licenses.free; + }; + }) {}; eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eredis"; @@ -17738,12 +17780,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20160824.510"; + version = "20160831.740"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "7b5bc80b74c488fb056fc37d687b8acb29fb331a"; - sha256 = "151yrjxdvkdhdc2bg496iirm2pfd82va1dc3s41x1i4c88lz89k8"; + rev = "b834a527c2f420a80806fbf36d4585c1e530061c"; + sha256 = "0n1mrsgbk5r663i2zkxqn4q0dimpr2n156822yb6f38ay6b41c7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang"; @@ -18175,12 +18217,12 @@ espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "espuds"; - version = "20151114.759"; + version = "20160905.600"; src = fetchFromGitHub { owner = "ecukes"; repo = "espuds"; - rev = "1405972873339e056517217136de4ad3202d744a"; - sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg"; + rev = "ef854367d469c6eff459d24a544addd21a4fbd23"; + sha256 = "024msmnwlnsgqa523s3phxj1g77pyw917gz1fhz56062576nv22q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds"; @@ -18238,12 +18280,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20160829.349"; + version = "20160905.1519"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "fc81449c8a3bf95f2cf063e1d2f377d4e73124ee"; - sha256 = "0airlgpzrlbvzj8p1ppx2qz1r1slxgdzw35zr1b32k9kkfbmc5n7"; + rev = "14e80d605a9f0d3912526f1eb4bfbeac9290d450"; + sha256 = "0qlpl2an7qzq9q1ib29z2haqd2q2hqciblxvh982f3yghscn7wgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -18945,12 +18987,12 @@ evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-iedit-state"; - version = "20160313.1156"; + version = "20160905.1908"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-iedit-state"; - rev = "eab7d5e3e7d25c4a852fedb6c0c7f50dd9e9bd7c"; - sha256 = "0r9gif2sgf84z8qniz6chr32av9g2i38rlyms81m8ssghf0j86ss"; + rev = "02ce7ea1414aa0f139b52f1b3350c2b7af74d0ba"; + sha256 = "0lf7ldd9i8r5f1x9jjd6mb7dr04xn87sd3sr6rqrwz925q0v0sib"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0b6b7d09c023cfe34da65fa1eb8f3fdbe7b1290/recipes/evil-iedit-state"; @@ -19113,12 +19155,12 @@ evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20160827.527"; + version = "20160906.1723"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "de6ce21e1e24b7a0370ca3a6ce83b529f772c8db"; - sha256 = "0dhk8ajn5b0y4qla4jak76zxqgiai9fcd1hpfh98pmsjy1jq5ll4"; + rev = "b01763bf766a7449626e6216c2d360ae1e80e5c1"; + sha256 = "197ycwx02mjlvck5xraw2jwlsv3ham5jm2yv8133i4cq8dszcfaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -20035,12 +20077,12 @@ fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fabric"; - version = "20141024.322"; + version = "20160907.215"; src = fetchFromGitHub { owner = "nlamirault"; repo = "fabric.el"; - rev = "004934318f63d8cf955022f87b2c33eb97ada280"; - sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5"; + rev = "8402f2f71c8975d2d9611e2a30845d62d58c9e28"; + sha256 = "116qwncyxaj9a0p5qk5ragi2wshbcv6ncgkmf9nhha7i45hdfa7f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/83939d2a4d5874244a4916eee9ae6b327af18b5d/recipes/fabric"; @@ -21188,12 +21230,12 @@ flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flim"; - version = "20160816.243"; + version = "20160831.633"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; - rev = "c946b83addd10ea700f2173b8d63386ef37b481a"; - sha256 = "0lrh7h30q5wvqzix8d7w4x5jacmnk8fscrpdfl637fi27gy6cwgf"; + rev = "b0d16a821c720ec9b32cf41a545656d3c00478ab"; + sha256 = "06zgl3j12ljz0w8p4p9n64jws3wjjiaydaih6bhzasbn94qmh2qv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; @@ -21332,12 +21374,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20160831.204"; + version = "20160904.1622"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "7b4f5440fc35bf23162714a753a1118a65be5d91"; - sha256 = "0aphb03m9hx8qrdq1n3k75rf7iw99i4c8zn63h8681mhg0f9waz8"; + rev = "f0f31ecb7a08111961961a0455f02d094c115619"; + sha256 = "1ibrdzhbpwlfgaq5rf15177c7ahramgxmjbagwp54m5n3r6rmiz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -21399,8 +21441,8 @@ src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-bashate"; - rev = "d9780b73ee698d6bc001e617b187845cafa3292a"; - sha256 = "1qhvrkhpjs214mc5f6gygwf5hx5gb2jcs46a4b34mqq29rn0j9kc"; + rev = "77fa03dbc578c34fe71ca44926bac2aff8f2b021"; + sha256 = "1jcay4gncpr0fap6qlm6k4r5b94s18zj8j56w462hvxydaxxiql6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54fd062e4ad012d846260c96801d3415756ce981/recipes/flycheck-bashate"; @@ -21518,6 +21560,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-credo = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-credo"; + version = "20160902.800"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "flycheck-credo"; + rev = "cdf73c72b637ee585a90b1ff8100c81186472f3b"; + sha256 = "0a5j3zd9jn1s4as53mx4438pajzbm743xhn7aqjx9wdrdfy7gsp4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/88dfffe034135cc46d661f8173e8b14e0fb7f240/recipes/flycheck-credo"; + sha256 = "0xmnbib7lx6v10pd3pkr69c4jb4sn3nmjk16qzvscwjgf2dypyax"; + name = "flycheck-credo"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-credo"; + license = lib.licenses.free; + }; + }) {}; flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-css-colorguard"; @@ -21542,12 +21605,12 @@ flycheck-cstyle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-cstyle"; - version = "20160320.1608"; + version = "20160905.1641"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-cstyle"; - rev = "997f55402b9f5af64ba5f9029015db23b649029d"; - sha256 = "1fric65r33bgn2h1s1m3pxnm3d1gk2z4pwnj72in6p7glj3kg24w"; + rev = "207285140a353d08cf1fc450cacab158bc98ba82"; + sha256 = "19wwv4r3nh79bdfcqp55qmknl0gwicy7dcaz28hm3sswbjpfv3rw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5970f4f0967dc3a10dc9554a8f5f06b703872878/recipes/flycheck-cstyle"; @@ -21710,12 +21773,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20160826.110"; + version = "20160905.50"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "95a9b41c7c1c8515cbf8680ce5456b2b8af23268"; - sha256 = "1p4yzjnn790c168pf6341bwfa84nj4a47qz8fwrr9p4jsszb4i7n"; + rev = "53c7ba2caed744408bbe01c24753dddc080361a7"; + sha256 = "1fp3xzq1i1z62i6qv2345la3qvniir5qvjvwhrfm7b9mx0n77alp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -22260,8 +22323,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "200a6d2536cf4932b36a89a753eb9c6a12888f54"; - sha256 = "0avvsnizx8l0gyvzy8qkg0177agckxylldqk0vm45pqzzmbsvr02"; + rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193"; + sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -23492,12 +23555,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20160830.1804"; + version = "20160901.2339"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "c7c445c49ac619fe3fb2f0c6bd2bd83b9c9ed7a3"; - sha256 = "16linxh50d3gkcl7mhjl3b3gz0n5wlbs0b3vnbi3sqfzk0isffwp"; + rev = "a31c19e88f403a8ebb2e6a5d27eef39fca595ba4"; + sha256 = "1sxr79gcj2xkh8qfp0h4r6iqmhm27qkibsk8l78gi2n3790sbnxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -23765,11 +23828,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20160713.834"; + version = "20160825.254"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "4f74f5bd698b253a63fa0ce626f4b86405a9714e"; - sha256 = "02wis1hv3rk1a8f8bbz317j7ip7yprr364nfdjbqzx9fa3rvv0qh"; + rev = "98be09e8eab968cfd6c4c8d9ed0d894297aea82e"; + sha256 = "0gyfi59rd61sxpgw0dz6xk5n2ickrxisgwh443zx9jainjrqk5f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -24176,12 +24239,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20160829.1350"; + version = "20160906.450"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "25fdd8dcda3fabcfffe983b7cadb3196dbca801b"; - sha256 = "0yz5q0ya1612kfn22xmwxx9yq32dqznilrdvavm7glgh6765wznd"; + rev = "219abf6230d1379eb302725f28461fda8405b5e3"; + sha256 = "1a9fba0v5w9wph4w8l1nvwvbqllbd242qhwwmzdknlcmdrxddkm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -24218,12 +24281,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20160830.435"; + version = "20160907.532"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "ef9ed23ea1cf11267f7178b70489aa604e6888d0"; - sha256 = "02zikvi8fzw7j06ab5kv17fdjz37rljzdf7lmh8iby3vb3zc81vb"; + rev = "e8913a9f57cde590cd932704ba6efd7429572435"; + sha256 = "0djf7rz918z2xchf05ir8q0jc1zmrdvvmpmhl8a8qfav9146ffi3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -24684,8 +24747,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ec81268eb1c08c164ce363acca777e0fd96cc2dc"; - sha256 = "08633gmcg63k62qrk1cs96hclvs9q2r6777kcb76xfa63xal9rfs"; + rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75"; + sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -24743,12 +24806,12 @@ git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-gutter"; - version = "20160828.711"; + version = "20160903.852"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter"; - rev = "aa9420614ca814b2c63a2a47661901b389e10357"; - sha256 = "1f71jcfh9wgfpapdaizc333kmpdg131dlchrbrwd1ymjb7kxp61j"; + rev = "a786465bd527c13e32c73c02b95086560c1be878"; + sha256 = "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; @@ -25209,8 +25272,8 @@ src = fetchFromGitLab { owner = "tarsius"; repo = "glab"; - rev = "cbba9c2bc55146015d75b8483237b501f761eb06"; - sha256 = "0wrkhinh5bgrhaw6d8v8p2sv2s7d5mp407qg4hipsl21vw8c836q"; + rev = "5ced0214622450930bcea105b9aac785c594609d"; + sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; @@ -25563,8 +25626,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "57b3fab1de11102eee896051605108949fbe75da"; - sha256 = "19829cfyl181kjqp5mn71f0symypfp1f2g5hi8a6949ya9n3l6rm"; + rev = "46e8fd2234a86934e3e8496c7405984ff7b18df5"; + sha256 = "1r8fh3mi5dywxx6qz2r9cnhnsxdcb52p168bfnadw17g9ps550ms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -26163,27 +26226,6 @@ license = lib.licenses.free; }; }) {}; - goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "goose-theme"; - version = "20160828.545"; - src = fetchFromGitHub { - owner = "thwg"; - repo = "goose-theme"; - rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c"; - sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5fa2ce32adbccdbc3f1b642585b430202e7ae274/recipes/goose-theme"; - sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9"; - name = "goose-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/goose-theme"; - license = lib.licenses.free; - }; - }) {}; gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "gore-mode"; @@ -26335,8 +26377,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "f229d31ab41239c2caad72a3bb4a5ed3ee8fc214"; - sha256 = "17psrhl6l6hhb0sphlncsibmay7n2pl44b9vyx8nk6vqhkxwp5pg"; + rev = "582151d8d15324ce497ee6d7c0297b2fd27701d5"; + sha256 = "15g4p7hjimnapcdrl8r1cixjyj3glqw2fribk8mws3f4sbihw952"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -26499,12 +26541,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20160824.2356"; + version = "20160906.810"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "98e03515357528588fc6478e042d27810de0b9a0"; - sha256 = "1r69indg4mr0b216350cgdxz29d124b3rp0i1b3qw844hqqc4lhj"; + rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d"; + sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -26841,12 +26883,12 @@ gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20160514.658"; + version = "20160907.315"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "8776c27ae1f0d5ea92a125251526483718e509b5"; - sha256 = "0xa7pnyp0iggaxsfic7gjnbib2c9175cg9d75bml760s18fvnciv"; + rev = "b0e67e42a44374be7176e199414a40309cd8d6fb"; + sha256 = "1h2whbp1qqlfgs3z7nxk31jgq7dqhsac8pxamr6wvxpy23wvj9x2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -27282,12 +27324,12 @@ haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs"; - version = "20160704.1120"; + version = "20160904.1326"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; - sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; + rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; + sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs"; @@ -27307,8 +27349,8 @@ src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; - sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; + rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; + sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-base"; @@ -27328,8 +27370,8 @@ src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; - sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; + rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; + sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-text"; @@ -27349,8 +27391,8 @@ src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "19623461dd282614bc0589602603619499e45207"; - sha256 = "0hsaxm8zm4d8rpswazhsfnqv2p2hrli63sy928vc32d5010kac7i"; + rev = "80225e09bf06ab3962b24812f014f948218e0c80"; + sha256 = "1vb6wp35l1vhzlyfs7h5hcnmm2mk47sxxx5waiclmafc7y8j35al"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -27613,16 +27655,16 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20160831.10"; + version = "20160906.1118"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8eef909d567921af76c067830a2e39021be5f586"; - sha256 = "0dmn141ikv254v07jjykkx7p73i3mhp7a6ygm8nqrdpi3883q02g"; + rev = "97f4d65e4cfb2253ec27a4331570f09e68cb6404"; + sha256 = "1zsmj6j23hy6csh471l0qaj6rg5f7py6dlywla7bkbp152hdimj9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/90ab37af6b0c85eac11c423bc8f0d93d6d8a9fd4/recipes/helm"; - sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; + sha256 = "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf"; name = "helm"; }; packageRequires = [ async emacs helm-core popup ]; @@ -27991,12 +28033,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20160727.1944"; + version = "20160902.2037"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "a82b8b2e219e38c783d39a32ad86730672a49da6"; - sha256 = "0kw2i9921vyqcl3a831r9zf1apdgrb51iwj3k4jrb4srpz2sk79p"; + rev = "375b5666e333398a60e9ddb9a38cad677e2f60a0"; + sha256 = "0vh3whp4qr56ijjkx24g4yis3qvkjgzhzx535hl7kqnrpf4apjry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -28096,12 +28138,12 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20160809.803"; + version = "20160831.1742"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "aac4d858a80396231adaf1a78c3b75f65bb22921"; - sha256 = "1d7rsjp5xbshj6simsp4hqgd8fh865c34i9i12y968aqkn7nlsqd"; + rev = "ff192dfcfbc737b7803cee1b87518c488aec0807"; + sha256 = "05xxnpqfppqyxncj4dddr0x02ji7yh4rj3q5przmm6v98kkdh6fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -28159,12 +28201,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20160831.308"; + version = "20160906.1004"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8eef909d567921af76c067830a2e39021be5f586"; - sha256 = "0dmn141ikv254v07jjykkx7p73i3mhp7a6ygm8nqrdpi3883q02g"; + rev = "97f4d65e4cfb2253ec27a4331570f09e68cb6404"; + sha256 = "1zsmj6j23hy6csh471l0qaj6rg5f7py6dlywla7bkbp152hdimj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -28810,12 +28852,12 @@ helm-grepint = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-grepint"; - version = "20160303.1226"; + version = "20160903.321"; src = fetchFromGitHub { owner = "kopoli"; repo = "helm-grepint"; - rev = "95e4c10ef0c0a18f660caaebb07bf5c5887efcfc"; - sha256 = "1f88vd31fc7ksrhlc72i6c0wbbz62lxw9yakxdk0m72pfz345mz2"; + rev = "ce5bcb435d090bab35344c5abc682dc92aaf4862"; + sha256 = "1ffwn21c1z201q9wcac0d4xj6w4p1lmcg9pgnbs576vabb2mdmxq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26446d6a2215bfa622d86837b30f2754dd25eb4c/recipes/helm-grepint"; @@ -29146,12 +29188,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20160407.2140"; + version = "20160901.822"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "841400ff302c5fdcba55fd6b2a18a01b420fcfd2"; - sha256 = "0yridy54p53zps33766hl7p2hq5pc4vxm08rb5vzbjw84vwaq07b"; + rev = "742eeb6c33253b2be581e30b5d70113cd87a581d"; + sha256 = "1dmmz6ghi21kmwprcv174pq5m198cmsphg297ll1bhqczk51j9h5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -29191,7 +29233,7 @@ version = "20150717.39"; src = fetchsvn { url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el"; - rev = "152175"; + rev = "152395"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; recipeFile = fetchurl { @@ -29562,22 +29604,22 @@ license = lib.licenses.free; }; }) {}; - helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: + helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20160807.313"; + version = "20160902.2236"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "fb2dd7fad405f650f95e0492d2a80e4b40ce434f"; - sha256 = "0qi46q04h0y8khqhza5pj6q83wwlq5mh3y524d21pbklc0vsm8yx"; + rev = "1e8354e61a086609ad43ba49c9a2b36f75ca4435"; + sha256 = "0xi4h8q44b5kf1r1ff8vg4gic4ayi44ay3hwkk6pbkhn1d8cdp5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a"; name = "helm-projectile"; }; - packageRequires = [ cl-lib dash helm projectile ]; + packageRequires = [ cl-lib helm projectile ]; meta = { homepage = "https://melpa.org/#/helm-projectile"; license = lib.licenses.free; @@ -29964,12 +30006,12 @@ helm-spotify = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }: melpaBuild { pname = "helm-spotify"; - version = "20131014.1421"; + version = "20160905.1447"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "helm-spotify"; - rev = "a1a8275a4769221f7df9a67ed9a028fecbdc29ca"; - sha256 = "133dcqk42nq5gh5qlcbcmx3lczisfgymcnypnld318jvjgd2ma8a"; + rev = "f7a62d1ff88e3127de9be7cd3e818b0a92268ab3"; + sha256 = "0q3h84zj63b1rnlvmsznrpmvvf0qbic5yb9xkdjcz4jz4h8p3h1w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1bf9eda57cba4742656f37a621b6d394483ff638/recipes/helm-spotify"; @@ -30933,12 +30975,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "20160831.218"; + version = "20160905.243"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "963a89bd83756c538bcabde14b668df136cd8f7c"; - sha256 = "106czcg0g73z0qiavqjhf1gwv0jwhcmggig6d63k1ic6793ld7d7"; + rev = "4ef059b127d54cb9dcb3b6ecfbc7f8bc1681a0af"; + sha256 = "0vcyxzd9wr15mqqfcnshm3xlc4pqv7r3slzfrbrac0a9n6xns0g5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -31989,7 +32031,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20160830.1738"; + version = "20160831.954"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; sha256 = "0x082kilmzq26f9pwwbq2bid98s9mjyfwljcwz2qlj8fbihwjn6l"; @@ -33546,12 +33588,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20160825.656"; + version = "20160905.137"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "037f1acd9d275d669e594942e1c207264b1e0282"; - sha256 = "1m73y99yvbwkdbrfaiibk33ibc1alwdg3nwgnn7fn7ivxz91n617"; + rev = "a82fdea78717047cec33c3b3c2b5fc5739e21022"; + sha256 = "18p7dmiymmw63dcn2v1wfy3i0prg6ldvbjdk98irvjg4mrfif1nb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -34083,12 +34125,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20160829.234"; + version = "20160905.940"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "4c3ecb4d739df379dd01ac8c7dc17080e608dac3"; - sha256 = "0cah0ri248hy1xzrldhh831imyfvnm9jdwnnxqm0iphp4dsf1xk7"; + rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; + sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -34125,12 +34167,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20160824.2004"; + version = "20160905.353"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "eec1c4ec26f693fb21495c8644badf4d7bd4ae6f"; - sha256 = "0ivmwk8nnvpghbvrr883i8wc7nck5752pws1kkfxn4qs2yl6v1bf"; + rev = "568e639a31828e4e7155c96d3b9e0f10fba4c2cd"; + sha256 = "0y1w84v4pfj4fazz0k43l6v6as5jpd1ccpnb4z2dih0460rgbddz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -34171,8 +34213,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "4c3ecb4d739df379dd01ac8c7dc17080e608dac3"; - sha256 = "0cah0ri248hy1xzrldhh831imyfvnm9jdwnnxqm0iphp4dsf1xk7"; + rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; + sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -34795,12 +34837,12 @@ jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "jenkins"; - version = "20151114.1908"; + version = "20160903.1556"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "jenkins.el"; - rev = "5ae8759d4799789337df0fd5e0e7d6f732f59b79"; - sha256 = "08ywfmsjv3vjqy95hx095kasy8knh3asl7mrlkgmv9wjwnxw45zs"; + rev = "8a3c1849fcbac379ea88ba1c14f3a63bb9dd3244"; + sha256 = "1dd7qmkdarrfm0gf115c2m2913jn7yv2ns0ic1ywq7b9v547i9cz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins"; @@ -35128,12 +35170,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20160826.1908"; + version = "20160904.1234"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "e45206b792e56e241c5536459d70b5509b731b28"; - sha256 = "0rdysrbfm6ks7x9nkw77pklsjmn8z01r2pa6bv8inbwgdvxm62v3"; + rev = "c0801b25d6ada38cc93e7a6d33d5de0d1ad5bc1a"; + sha256 = "0g3y0sni3mb3480zlj0cv5d59b275bpswvsim4ym96fq4vs82qk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -35835,12 +35877,12 @@ key-leap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "key-leap"; - version = "20160610.303"; + version = "20160831.747"; src = fetchFromGitHub { owner = "MartinRykfors"; repo = "key-leap"; - rev = "5add9fd38fdf46cc0306c27f721195ba6cf6ecf1"; - sha256 = "02f7mxhhw1y9j5nxfjcm0p1qczsk6wx0b3k0d7gn9chq9gablsp3"; + rev = "b3f6ef15c8a13870475d5af159fa24b30f97dea0"; + sha256 = "1f2k7jpxfvjirxzjc5c4s4lpg1hdgw8k7lfchx362jqijny1ipfp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b56e18063e6292bb2aca2acc7077b32f3d62262/recipes/key-leap"; @@ -35940,12 +35982,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "20160523.545"; + version = "20160902.513"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "34e28d4c88ad9c71aee3dd226817c6eb6927b2c7"; - sha256 = "17bfxn1bl2by3vnp24hnk6qjxx6av1fayrsw9hlldwhgp4ayhy48"; + rev = "14c86914b708081299cf6a290570ff8e11853cab"; + sha256 = "15zsx296cqzmwivrkkknr8lmdsr6dkggxbwp2yggr20278vsvbhv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -36171,12 +36213,12 @@ kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kivy-mode"; - version = "20160623.1210"; + version = "20160902.1041"; src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "0a9354edd2f9b66da171f642f6bccb2ad1094320"; - sha256 = "130ngys74vcfsq7m0vcr7qbfv7rjbrqrn5ha0a38qsc9ccnxw8ir"; + rev = "20eeefed81847f52b8d003fdfaa20cc6a927b311"; + sha256 = "0b6dgpl592fgz54j5hnhv6hylqjj0773j9zn7mk275m5c10is3cp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -36192,12 +36234,12 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20160810.634"; + version = "20160902.759"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "ec62ab010ae0f2670b6598c112cc54119e2ed2f4"; - sha256 = "1zyflkrwwjai097cwvqm2n21mvmb4ppdi3j2lc1jvq9jnls68xxn"; + rev = "686bac60f942665ddf695e761a1a37900c30885f"; + sha256 = "1salimr0295hqk14g0s3lw8a7znkkfw2mdk6g1ij07lc4cahhfx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; @@ -36818,12 +36860,12 @@ leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; - version = "20160829.317"; + version = "20160905.1849"; src = fetchFromGitHub { owner = "aborn"; repo = "leanote-emacs"; - rev = "28b2eda501b850174b0eda425ad59bd9bef8ed2e"; - sha256 = "11izm80swbg01hw5wx3imy6sssxgxhzb4sw30rb36kdamvk616dl"; + rev = "8c7b9e5283c1f2f45b71639fa71420b06f84abda"; + sha256 = "1bb97i5fidb4vxnr57r7q59vycj3j2gc1rbj5lq5c8gxwgfnq30g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote"; @@ -37402,22 +37444,22 @@ license = lib.licenses.free; }; }) {}; - lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper }: + lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20160830.611"; + version = "20160906.743"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "7c2fe43bcbd2df86e1149b189b5d54e30602b57f"; - sha256 = "11f6d9wfnh2z8708rma020749rgckkiyap799hrgyw7hlysmgcj0"; + rev = "2360ae987f8c7a10bfbd716592982777bf6745b3"; + sha256 = "0skzfh26qwjbaxmspdmzma5bgqbibxqj8i24b8kmljdmij8z0gzn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g"; name = "lispy"; }; - packageRequires = [ ace-window emacs hydra iedit swiper ]; + packageRequires = [ ace-window emacs hydra iedit swiper zoutline ]; meta = { homepage = "https://melpa.org/#/lispy"; license = lib.licenses.free; @@ -37805,8 +37847,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "5682750bf9fc3a02c57e08527780a43854695460"; - sha256 = "0wh2jy8jwh23381y334qyz6gdpff1fy1zhsavwg9pfgb118dqiw2"; + rev = "9313182d938463d6fa1ba7ee75d002af37a0bd01"; + sha256 = "1m8ah6r8c1wscnrv3vbk9f02bls509zz5fmwrkgjrsylp3963vx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -38424,12 +38466,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20160827.1549"; + version = "20160902.1451"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ec81268eb1c08c164ce363acca777e0fd96cc2dc"; - sha256 = "08633gmcg63k62qrk1cs96hclvs9q2r6777kcb76xfa63xal9rfs"; + rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75"; + sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -38603,8 +38645,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ec81268eb1c08c164ce363acca777e0fd96cc2dc"; - sha256 = "08633gmcg63k62qrk1cs96hclvs9q2r6777kcb76xfa63xal9rfs"; + rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75"; + sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -39439,11 +39481,11 @@ matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "matlab-mode"; - version = "20160815.50"; + version = "20160902.459"; src = fetchgit { url = "git://git.code.sf.net/p/matlab-emacs/src"; - rev = "32a69776d12882902a8a42826b6265d9505051f3"; - sha256 = "013h9ph6vabq63k0xwavm313ni2523vjarmbkfm5s5ras2kw020n"; + rev = "3b3c48ac0c27039e0bef89c643f0ee4c0b53d3d0"; + sha256 = "0kizmzpmc8iw15n6xkrf7m5kbjcs5rwdrxyrfij6cj43szlnkf1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39e384608df76bb3e91bd1405e3a5029181ff94e/recipes/matlab-mode"; @@ -39686,12 +39728,12 @@ mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; - version = "20160425.702"; + version = "20160902.827"; src = fetchFromGitHub { owner = "hexmode"; repo = "mediawiki-el"; - rev = "40387ad7ae03f1589846518d7361c19774bcc4e3"; - sha256 = "0kzmvsbzqrkrlnr5sf1xwazm9zyzbrflb4d1jrkp206q9yk439cr"; + rev = "7cc465af1d95a814387d241ff8a4c89d03b1e86e"; + sha256 = "1bhp0cx8kdr7mnmwg5q59qv019aalk4z7ic625qaa03gd6xr2ym4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki"; @@ -39832,10 +39874,10 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20160512.1714"; + version = "20160831.748"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "0v3n0227fmdk6hshnc1x1sxqci0pi3954nqy5ym4k9bmvw3cyxlg"; + sha256 = "0wqd2dv7rbw2cygjj79kfm3g9jjxria2zlcij8fxpnw7is4j951q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+"; @@ -39915,8 +39957,8 @@ src = fetchFromGitHub { owner = "lvillani"; repo = "metafmt"; - rev = "bd20fc67d0affd48c1199315b7da06a7182e7d76"; - sha256 = "0n4nv1s25z70xfy3bl1wy467abz3agj4qmpx4rwdwzbarnqp9ps3"; + rev = "b624ba1ac46cdbeddb0cfe920dd44dcab3fdb529"; + sha256 = "1r4v06pyi7y7gp3w0p3xfz8hf807p7i4frgws54naagzihww06y6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a53f740fb7a58cd6339b301d0de8c543b61f6a5/recipes/metafmt"; @@ -39995,12 +40037,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20160818.1927"; + version = "20160904.1829"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "00dacb8b7246cb36efaff754ba1ebdcfc9a02217"; - sha256 = "0bbn1p0wmmjdhipdvc0vs0mzl3q7p355ffdrfbwvvs523zdfv4nd"; + rev = "2f9efcd93a8ea6b89d87800c8f9611899610c936"; + sha256 = "177yp566lpc45xkzm6ahw97l358lnzpjsn90shvgfc4lhfsr6c2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -40944,12 +40986,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20160814.659"; + version = "20160902.1417"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "53f0ba96f0417885e7d3955d8750de6763f99444"; - sha256 = "1azyrvhvyrd5n7djyh324famzab9w5c81bm3nv04p93gd92mm6zh"; + rev = "11fa06c8fd5d5734e635427565a7fc980908b877"; + sha256 = "1vkjgmwlnhfqs4dnp6lf0vpjss5pxcmdqy29yg62igsg1xjd7whw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -41523,12 +41565,12 @@ multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; - version = "20160829.1830"; + version = "20160831.1826"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "2d31d60e240caa321a2f57345b395dcc6fdb874d"; - sha256 = "19p8x43dsqvm2nfjdwb1imcwqkajc0vb2d8xqjswg894qiinkrlr"; + rev = "e698e94ff34ab432bed9a11626c3a0277bd45fe7"; + sha256 = "1rq4bpa9bfyc9r3hwa6ik3yk74aizz2k1crwmafqy2wqlr6zx04q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; @@ -41915,12 +41957,12 @@ mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "mysql-to-org"; - version = "20160817.1453"; + version = "20160901.2358"; src = fetchFromGitHub { owner = "mallt"; repo = "mysql-to-org-mode"; - rev = "4cbb45a32ba5c286bed73b77470d29160a192b44"; - sha256 = "10gnppqj3f15nzsm93si83f0z8qzvijv4642lbhgdlxvm2q19rfw"; + rev = "25e30a8f3582e64377c8df23531b17dcc14a84e2"; + sha256 = "0vjnah8nkhh01nq758c79rssscd3rwmfrcb02sq98mcqa0aaqk07"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org"; @@ -42521,8 +42563,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "b1ec55459bda21463483d32401803d246abf045b"; - sha256 = "1iv7k127wsrhl9hvanlzmi8ycz3ynwfwxgh5zw9617zhiw8f7004"; + rev = "97c18aca4d29d7f183437b2bfdfb8193cc47162a"; + sha256 = "0nspqnv5jk59r9l8mnca0d3fkyybhnrbm6jbghyv7z35xfh5n0bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -42559,12 +42601,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20160802.51"; + version = "20160906.739"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "5982766558bea413b0c15c807aa45bb36a296eed"; - sha256 = "03xcziqli0hwpcggp94vgswn27np0a05rcr4dgzksviyn4gb9ixc"; + rev = "f2cec77d0c6ea843e37c584470b2c65561a457a7"; + sha256 = "09ll5l0vd4iybmgp43jdf55crgn0rcdcqs42v6yfknf9n6wf8w4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -42808,6 +42850,27 @@ license = lib.licenses.free; }; }) {}; + nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nix-buffer"; + version = "20160906.251"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-buffer"; + rev = "57ac482d998db58813e8d6f3b90887635f83d44e"; + sha256 = "1y5x49mqippngp7ya6y7p8z81anrc644n84wpd7y62yqv8qhz0fp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4de2a8cbf1180ec7ca1648f497538b8dbf7a3945/recipes/nix-buffer"; + sha256 = "1svx1wg05fajxzjz95dfg072i6nfydr0ir4q1zhdxg1igkffqsml"; + name = "nix-buffer"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/nix-buffer"; + license = lib.licenses.free; + }; + }) {}; nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; @@ -42815,8 +42878,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "d74c8a3f4e1131ee9dbd9898d141789832802306"; - sha256 = "00b0gi26rbxg5hsnn2zz0404kaqyn3bmlf7dz09knvpq4w77gsgj"; + rev = "312bab008d835dd9c8939b803d2bc7af4f82a811"; + sha256 = "1vj7dwrv0x4zjaxpn5baiy1dhzdhabdcj28yp2dykdvymmp3zx8x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -43081,11 +43144,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20160811.416"; + version = "20160904.423"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "59fed50a82b0a625a7303099675484557fed9d23"; - sha256 = "12d2xna8fn5n9axpc8c75dq1ikc7fnrqsgh27d80j1lw22i2ds21"; + rev = "fce8146a8b738f2317034fee6236cdbd3597849b"; + sha256 = "04iscnc83c1yhzwid83m71bgawnqkzwvikffgqd6kiwj140ahx2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -43291,8 +43354,8 @@ src = fetchFromGitHub { owner = "Liu233w"; repo = "number-lock.el"; - rev = "1ac1b1a269128ddac820df7d45a8d0c703e9c05c"; - sha256 = "11pqm2f8bx3m9mnvpjbvq8vd8sym7zpq7n0y4lbkybiyxswjrv5q"; + rev = "74417b1238953bf485961a0dd7d20f5c36ae25ea"; + sha256 = "0xmd4q2k0psd53cg71vsyc54iiq0wp9bs00ch68561lrnbjg043w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c107adabe2e4c5b35ebb6b21db076cdea0e9c24/recipes/number-lock"; @@ -43682,27 +43745,6 @@ license = lib.licenses.free; }; }) {}; - ob-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { - pname = "ob-lua"; - version = "20160411.2024"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "ob-lua"; - rev = "1b5fd9bf529c50f8121afae0472e057daa5e95f9"; - sha256 = "11cdf5nfmn5cc1i4kqxq0hks8d19sf5rwavpfmz39xysbnr65s68"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f08723efb7502474d77e0212c7bdc7c9b4dac624/recipes/ob-lua"; - sha256 = "13ailb285bs9sm9qmjrpq0wjk7sp3w019p94pzrwmzqf52y1dapg"; - name = "ob-lua"; - }; - packageRequires = [ org ]; - meta = { - homepage = "https://melpa.org/#/ob-lua"; - license = lib.licenses.free; - }; - }) {}; ob-ml-marklogic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-ml-marklogic"; @@ -43727,12 +43769,12 @@ ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-mongo"; - version = "20130718.732"; + version = "20160504.1434"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "ob-mongo"; - rev = "7eb5524d9c106945b371f9fbb9f1176f6e6f9b13"; - sha256 = "0qibnn908a59jyfslsnpjanbm85f8xw9zywsqsh37nv27ncbx0hr"; + rev = "abfe62e964f6f3e097f94111ae14247e1f442134"; + sha256 = "1xrapp8mvxlbz0v5s3lrmfacijdgs6qrpklbk85rswx1gisl0kmb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo"; @@ -43853,12 +43895,12 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "20160517.1728"; + version = "20160903.25"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "98560075eb0a9dc5ad1e3102ac1154543692d74d"; - sha256 = "08p64ss3ia1gq6dsna5v3ajjwm5g9ma7yvd5y0jx91xssjqq5dja"; + rev = "56bb9a20ffa257db484616eeb62380deadaa5856"; + sha256 = "0mnkinwnjmzz9245ja0zf51cxxq3agk7j25aqvsdxj6p9bxpavfc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -44252,12 +44294,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20160823.244"; + version = "20160905.220"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "d2c54acf566a9ee38021261f7d8f43a94c9eee8c"; - sha256 = "1rh6vi2vi50zkmcd5jyfnhhsdrfn6l9abd43l8ppgr3k93l3m5bl"; + rev = "696c19550f50e1960327e007750c4b80bd3f14bf"; + sha256 = "12d6icnhmvpvpnfyai1ni5d5g3dqg1d7775rm5vd12hf9nafidj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -44967,6 +45009,27 @@ license = lib.licenses.free; }; }) {}; + org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-clock-csv"; + version = "20160906.1047"; + src = fetchFromGitHub { + owner = "atheriel"; + repo = "org-clock-csv"; + rev = "62acbb8673cafc9db00fde7ea1804cde6a781cd0"; + sha256 = "16gq2yyjzfyra0gzabcd9pclickqy4hal0kgx2xmdfxpxchfk0gs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; + sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l"; + name = "org-clock-csv"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-clock-csv"; + license = lib.licenses.free; + }; + }) {}; org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-commentary"; @@ -45389,12 +45452,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20160624.23"; + version = "20160907.621"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "51aec969cc0dc8e0c81220f020d643861d2f5c9b"; - sha256 = "0j3z2imv5w6cndnxdyy0pf9la6qxbgwdwr7vr8mr47frqpjb4i63"; + rev = "5f1445e9bafa252c8708b3bc223f30032f5ae82b"; + sha256 = "0aip4krrl5cyaa2agmmzipqw139zar3j6594vba93axalfdx9i9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -45455,8 +45518,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "fb517fabc0c1790b6b0dd3630f40919a5e7a87ef"; - sha256 = "1l1s2qhykpzn1fil5qsvpw8iabf07lbbymn48lgbqd96fvx0lls6"; + rev = "d1c1b7f8faad0c8e1253695c95bf2df06969830b"; + sha256 = "1ph9gxxmbpy5094jzn7gg5xcck30a0b7a2hqrxj9irgsh16bdhrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -45472,11 +45535,11 @@ org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mac-link"; - version = "20160109.1443"; + version = "20160808.220"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "fb517fabc0c1790b6b0dd3630f40919a5e7a87ef"; - sha256 = "1l1s2qhykpzn1fil5qsvpw8iabf07lbbymn48lgbqd96fvx0lls6"; + rev = "d1c1b7f8faad0c8e1253695c95bf2df06969830b"; + sha256 = "1ph9gxxmbpy5094jzn7gg5xcck30a0b7a2hqrxj9irgsh16bdhrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -45707,6 +45770,27 @@ license = lib.licenses.free; }; }) {}; + org-preview-html = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-preview-html"; + version = "20160906.2327"; + src = fetchFromGitHub { + owner = "lujun9972"; + repo = "org-preview-html"; + rev = "0a6bf43046b2bff794f9d414b7171132dd23cecc"; + sha256 = "0xwwkgj4i28dr2wxq5fw7badpn9vk40hnfa83f3ay7c8z2rcz8ci"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d433daa1a3b95646f3957ba58c49db2a6da2768/recipes/org-preview-html"; + sha256 = "0nf8xbqc9q2ppkjplynhfqvsms97w68afxq4rarspzddn881z7nj"; + name = "org-preview-html"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-preview-html"; + license = lib.licenses.free; + }; + }) {}; org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "org-projectile"; @@ -45821,12 +45905,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20160830.1546"; + version = "20160907.551"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "db328ff7a2d42e1f8bde9ae15d43638e16cff5c9"; - sha256 = "0bk6bkaa6c3c2ahyag28aqixkyqwsc23yhc06n89drs9zjv3nrvj"; + rev = "873337642b9b312803ae743d0d636947e74470b1"; + sha256 = "07s5n35qinihzg4lq2aazdidx48zmzi36vrd3iri50r149ks1gfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -45870,6 +45954,27 @@ license = lib.licenses.free; }; }) {}; + org-review = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-review"; + version = "20160906.2237"; + src = fetchFromGitHub { + owner = "brabalan"; + repo = "org-review"; + rev = "44773bbd9868bb3ddca27cd35d2fc54139a70ab5"; + sha256 = "1iqcxdni680pgl9azi7khx2ns3mh8sgpbq1mcc4ivxkbwrb93crb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b474cf4f237c28771c48fb770dc88b57193976f0/recipes/org-review"; + sha256 = "1xzhbnd1p2fab2f5xhg4zp06gwk63x8sjlxrfji6hh2p5a6gf6nx"; + name = "org-review"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-review"; + license = lib.licenses.free; + }; + }) {}; org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }: melpaBuild { pname = "org-rtm"; @@ -46150,22 +46255,22 @@ license = lib.licenses.free; }; }) {}; - org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, web-server }: + org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20160818.643"; + version = "20160904.122"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-webpage"; - rev = "66670bcfa6ed89cfbe67f144b53b9cf7202613e1"; - sha256 = "1n578x8ysxribmsm9gsg5y4anvq6zl8bypw6qgasnlagb00ppa3d"; + rev = "4c760fe11a6ca6b58e821753d648a6c8d3df4b85"; + sha256 = "00s7hzps7qr91i6hdkf96r253286d6j0gq5h69ia2jnp15827bgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; sha256 = "0ndvv5kw65p5shgg0gn3rpxz3zbxgcpa6an4m4yxms0ma72xw124"; name = "org-webpage"; }; - packageRequires = [ cl-lib dash ht htmlize mustache org web-server ]; + packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ]; meta = { homepage = "https://melpa.org/#/org-webpage"; license = lib.licenses.free; @@ -46892,8 +46997,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "c6e287d1de2e85e23b4c39afda97f654ac08aa0e"; - sha256 = "0in2w1wcillq6gf5qyjqprdn2n7bzp612s5zrqhpc9vwz2krzd1d"; + rev = "652b43a77aab502498656117aa278f8f09a517db"; + sha256 = "11xgz0fl8biimkffmbfccinb0gr3zb5a57lrb7br1j22ncdacmyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -46909,12 +47014,12 @@ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-gfm"; - version = "20160805.928"; + version = "20160906.1035"; src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; - rev = "a46628aeb67f4504fea596771bf432be09212b47"; - sha256 = "0j8992d55p54m6v38v9bqy0x8ks13acak4hdgqc9lyx14asrhljx"; + rev = "8fa2c82e4c1d52381d4528fdd7acd234cc75e380"; + sha256 = "0hga00njg914wdpib7jc0xkw4pq40q1rcxqj6i9dsp4kl0h15wq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; @@ -47242,6 +47347,27 @@ license = lib.licenses.free; }; }) {}; + ox-tufte = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ox-tufte"; + version = "20160906.1801"; + src = fetchFromGitHub { + owner = "dakrone"; + repo = "ox-tufte"; + rev = "fe7e7cec0559acdaeb89d6dc99e50ad698723207"; + sha256 = "0fm0qmqcq6alk2sw3vlybqjlkwxp14zaqgi5r2lnmq4z0lsxa5sv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0e1592b788ef7218cfb4b3da8599b6cd23eef357/recipes/ox-tufte"; + sha256 = "15b7aml9nl1kh8gbc086nb155f5mzlh8dmq41zi9frn6gskzjnfk"; + name = "ox-tufte"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ox-tufte"; + license = lib.licenses.free; + }; + }) {}; ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; @@ -47329,12 +47455,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20160816.1911"; + version = "20160903.1832"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "82a19298d1d8669b0e548a1c80dd0ebf3e8a43ed"; - sha256 = "127zn218hwcrk73dnqzps336b2f0jc4k8qvi4a1zxjbnmvsx25xa"; + rev = "680eeb78201d7c94d24bb920386486942ce0d465"; + sha256 = "0xzf8byg76lbhx0bypqr2k48scx86985g0998b5wsqw820q1qiw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -47641,12 +47767,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20160822.1439"; + version = "20160902.126"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "e641d91c2886800871769e8e0e6554d2f8001e79"; - sha256 = "1lv3iiwidlvr6jsldd2s9apir1jzpynii8vp58gxq9kxbm4rzb42"; + rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2"; + sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -48222,6 +48348,27 @@ license = lib.licenses.free; }; }) {}; + pcap-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pcap-mode"; + version = "20160830.1322"; + src = fetchFromGitHub { + owner = "orgcandman"; + repo = "pcap-mode"; + rev = "33356c815377e9d966768cefb15227ee5990ed1f"; + sha256 = "0h60m349xyfpvj2ik9akp37xx5wrfsbyi0n9zhhnjvx7lny0vafn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/44f4cb526556a4b58b7e67314002e73413a59a76/recipes/pcap-mode"; + sha256 = "1p6lnr7yr8i3yp63xc8r1hnx8a4v0mz1s7q89zxx7aprk7i9kpv6"; + name = "pcap-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pcap-mode"; + license = lib.licenses.free; + }; + }) {}; pcmpl-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcmpl-args"; @@ -49064,12 +49211,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20160821.1455"; + version = "20160831.819"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "f1cdabf3fb6f1b23652d05f2649a1196f61131f3"; - sha256 = "0j4k3rdw8bb4hgvrg0m50ra0dw0ms0msvpdf79zvrhbdab1yl4rn"; + rev = "182c0b583216ec02e259dc5bdb16c72fb92814b8"; + sha256 = "1zni6yb83bj09pw9p9p6i4jwq2l0k62bnc114jd8cbsmr55axla3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -49502,6 +49649,27 @@ license = lib.licenses.free; }; }) {}; + plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "plain-theme"; + version = "20160903.1029"; + src = fetchFromGitHub { + owner = "yegortimoshenko"; + repo = "plain-theme"; + rev = "4210122812df9b5fe375ad35a3b933bf040460a3"; + sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; + sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8"; + name = "plain-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/plain-theme"; + license = lib.licenses.free; + }; + }) {}; plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; @@ -51083,8 +51251,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "c0a6a6b4628a634f6a0529c9f7e9e1e0fe66d4d6"; - sha256 = "1k1b3yhcdp4x55cdk4wf1hzx8sw66cjy8xpjc0n1k71pzlx6ydz3"; + rev = "74638a253ea76baa0aed78491b92d157326295a6"; + sha256 = "18xz1ic5cz2vlypxwxz81z3m2cf36wl8dqw7fbbgq20z6c3zl76h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -51226,12 +51394,12 @@ pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20160531.138"; + version = "20160723.2236"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "b6208b75237083e728b20815c63ab8f9c4a167fb"; - sha256 = "0yr04yj72dkj520wzzj4a1mk0w653bb8alz15v92mlj5lc8kdjm8"; + rev = "4a25f6b0ba51b87d882d4062de1601c49b2a822d"; + sha256 = "13rkmi7ckchd42zjl6lm7wdf6402xwjxvi1839lkzlmlb49xf47b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -51960,12 +52128,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20160620.330"; + version = "20160901.1048"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "f3180213966e4eea5f139f21aa0b16a6d02633ce"; - sha256 = "09l1dzk3x4d2wba62dy4w0b5zzv9nhs97g8shfz9vz1q51a30ix8"; + rev = "ef8df01d62097e38ec76940822440c9cc1e895b4"; + sha256 = "1yfcv70yv73cqmnwlvgqpda18xxkd7cdqn3jjp8bicillnpl04xz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -52692,6 +52860,27 @@ license = lib.licenses.free; }; }) {}; + rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rc-mode"; + version = "20160906.1227"; + src = fetchFromGitHub { + owner = "mrhmouse"; + repo = "rc-mode.el"; + rev = "70b1e93f40d2f24dfb5619605fedbb1dc05cbe60"; + sha256 = "0jpsp8zbcdf7yrfakv9dycw606yqcb497k9w5aj16a8r37xg089l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode"; + sha256 = "0p77mckw8jyxcwspj1ffm8mz0k01ddm67hh9j8rw812wddwnj7qf"; + name = "rc-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/rc-mode"; + license = lib.licenses.free; + }; + }) {}; rcirc-alert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-alert"; @@ -53280,22 +53469,22 @@ license = lib.licenses.free; }; }) {}; - redprl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20160818.852"; + version = "20160905.1415"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "1ee36bd7e8595a61f20152985f4b9f4230a51c6a"; - sha256 = "120kmjqrp4s5jvcxgkingzszkxk01ya1h5xrgdf1lylg52xx9dvj"; + rev = "80cce07e97ef1816c86c851b525461c6dd505849"; + sha256 = "1vk6hqjsc6dr9n1hf4wjhihimb9pyi0qyqfwrj8y5b1cv2rzvc01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; sha256 = "1zinzs3vzf2alsnxf5k71i7lp90fm26wv4y20ci52n0hnh5nz861"; name = "redprl"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/redprl"; license = lib.licenses.free; @@ -54427,12 +54616,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20160830.957"; + version = "20160904.1233"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "9f4fcaefd51915dae69cf283e62e5883ae6cef09"; - sha256 = "1grw4gc98yaxsdqarl2n3w3bn4h9nri1anjrvw5hqi9i111fskwb"; + rev = "046372ccbf5b6a4367a873d23a784810f2bbda1b"; + sha256 = "1b5sfbvgyr2pa74fm24wmmiwmrrqfwawrfva9y8cj0fcnvvb198r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -54452,8 +54641,8 @@ src = fetchFromGitHub { owner = "pmiddend"; repo = "emacs-rtm"; - rev = "dfc1440178d479b1f81ba60b8bfc068384a603a0"; - sha256 = "1gqvp0h5zy2023gdzf7pw28rl27lzml87vpbi1zaw4bmj82zgh3f"; + rev = "08dc10458b56e72f1512896192b2114ef57e58c5"; + sha256 = "1ajks5dmsb5cyj0hzxbp3r305liwaayb8jds0wdnw4nk5anlsbnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0acb202acc25420274a1b9e639f34f9878a61e83/recipes/rtm"; @@ -54493,7 +54682,7 @@ version = "20160607.157"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56050"; + rev = "56093"; sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; }; recipeFile = fetchurl { @@ -54573,7 +54762,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56050"; + rev = "56093"; sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; }; recipeFile = fetchurl { @@ -54926,12 +55115,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20160526.2248"; + version = "20160907.418"; src = fetchFromGitHub { owner = "stakemori"; repo = "sage-shell-mode"; - rev = "26303698cbd807b4cbaa241b0671f7e542a3bbe4"; - sha256 = "1124akipvrcmkd66slklgap2jdvb8iksldd8sjvg9n25kp0wd0vr"; + rev = "5dd85a064304af51c676b4a95b1f298e297756d5"; + sha256 = "114ja5gyhpv9xi1gxsxylxbbmnmjrqlwd4daww4a5xc2avi6flxq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff7cefd5497aec9ed271fd783625fed445c4ac12/recipes/sage-shell-mode"; @@ -55161,8 +55350,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "733562b1eea812d7f5b241678fc6bf42af5bc0dc"; - sha256 = "0qap5gih0wh6g1dj271s6fkhb2y1i1mk6nl0wipg9sdgdc3m50lp"; + rev = "31211c6b7f4767f5e7611c6ed7844dbbb3600ee1"; + sha256 = "0yafxig7wvlps8fsl26n46hyfiqhyzjhi1k2lgwmacf3v7lhjqhv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -55199,12 +55388,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20160813.304"; + version = "20160902.525"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "a0b73b25377f5aedf50abe198d6b6111310735be"; - sha256 = "0b2gm1mfxiqm86m5156scmzvn10dl0idgxpzgki1k0cpy4xf4qfa"; + rev = "387e93c70a3703e55f717d3285912ad12cfee947"; + sha256 = "0xwwarla3m9cr1mpnlhsknfvxw1xyf85cxjkzg42q12k7i0yad5w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -56075,8 +56264,8 @@ src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "4ec9883fa68ffc4a0dc02998b98fe59bd87a1143"; - sha256 = "0hp51fq2gk9ksln691h7vkm8r9rif8lbjhd4593xri69778rz387"; + rev = "fcd9f53cd044ad169a240e3d12a2cf2d65485db6"; + sha256 = "10lgafsck2r9x7997gdl3v1wn4sig0pm6jarip9496ka58z95mjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -56384,8 +56573,8 @@ src = fetchFromGitHub { owner = "deech"; repo = "shen-elisp"; - rev = "2896533e07ed072da09a37e9f236141d8f5d4842"; - sha256 = "1445vv2qj1n0mqx9hn693580af30irsv51i493bn8ab0if80lvxb"; + rev = "822d2e4e791e883ba38ac8bed483a908c60ada1a"; + sha256 = "0zpd1jpyw1243nk7m89x45kn99ly9b64p365v16gdhng3yk2l02c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp"; @@ -56440,6 +56629,25 @@ license = lib.licenses.free; }; }) {}; + shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "shimbun"; + version = "20160825.919"; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; + module = "emacs-w3m"; + sha256 = "f48cdf069e61d81908e303d9984a05e1de9ccfc9fca8545435a95dd9de54eab9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun"; + sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x"; + name = "shimbun"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/shimbun"; + license = lib.licenses.free; + }; + }) {}; shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shm"; @@ -56447,8 +56655,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "e4f3c8f3474bfd1338ba0207c21159910698b63d"; - sha256 = "1x45d43jnckwfl669ckdb4idkvyzx7qnm96jcnd3843g780pm0ag"; + rev = "1ffb4db1e7049d4089fea430d4f20bce2eff263d"; + sha256 = "1vrycvqp4n2pp6sq7z2v0zkqz6662nvacm7cla5hrrzl157cg0j5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; @@ -56815,12 +57023,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20150430.1755"; + version = "20160902.1800"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "4b7a6bc6a6df6b932f8c9e9aded9103397c0c18f"; - sha256 = "0jn46fk0ljqs40kz6ngp0sk6hg1334835r2rmagx4qm0mdaqy7p8"; + rev = "ff1c0b661d1b5b8abdb4bea2efec5efe8485dd1f"; + sha256 = "054mi7plsyk79kc2iqmgp1w8frvlyg1pywm3fzcyg8qa461d35dw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -57073,8 +57281,8 @@ sha256 = "0pc0mnrgd47cq61s8xrc9mcizfc3cj4ln7r5ixqk6jq59img27fh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c7a00894cb1398757b90f670a0beb7b7f640b8b8/recipes/skewer-reload-stylesheets"; - sha256 = "1rxn0ha2yhvyc195alg31nk1sjghnbha33xrqwc9z3j71w211frm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/aeaa2c89b995f1ab0b0f96493db0cda44cc851ee/recipes/skewer-reload-stylesheets"; + sha256 = "1hcz8q7rs5g7gbj6w72g8prry4niqjmyxvvc0ala83qw76x4cm7k"; name = "skewer-reload-stylesheets"; }; packageRequires = [ skewer-mode ]; @@ -57212,12 +57420,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20160829.1150"; + version = "20160907.602"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "20e0c1d345359def80d7cdbdd74214b510b00885"; - sha256 = "1i7v93f0njqjfahn5r671knyfi0jngygvgr2xb8b2d20v6di7ysh"; + rev = "bad2acf672c33b913aabc1a7facb9c3c16a4afe9"; + sha256 = "0d0p03d368jmyz5kjwbrcvs5glq7b6k1yyang3ai8f08sjvkmh6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -57884,8 +58092,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "659e4ded92e26390cc7f8e0c7e6c7fd2e96acb8a"; - sha256 = "1i7hrj57dv2nhjhmayvysj974myq1lkpkl6dgja5x9xvcz024acn"; + rev = "6b4832412a896213f3e3d45ef75acaf2aeeab97a"; + sha256 = "06l9ngm37lzqf22ywg20na0bnfq2bcwab9rkfc5w8m51j5z6gn6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -58215,12 +58423,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20160612.2126"; + version = "20160902.1855"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "a8efc182c1ab68e65f20f7ce801921435ecf1c2f"; - sha256 = "1hlckgqzqxkmkhzi6dhxwr69padqbfv4jjskyfdn96na5z080fl5"; + rev = "a28ff63f4c3a6492dea38c028e47bb6431ab4c84"; + sha256 = "1vb9b4wclmhqj4p9xqz3zhrh7id1s03k2041nx6pcwr7918dfpjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -58341,12 +58549,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20160827.1130"; + version = "20160901.334"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "62dfe37e843faa705a65e6fbed0c2a2c7ed57c12"; - sha256 = "1dr0psppjfgkn6plbkhni6jdmad588mk2jdnky2w2g07hz4jrgd0"; + rev = "1fe6b5e8486a8f346198c70804a62c9e0885659b"; + sha256 = "1i6zv1yy1b25qjvjhv968nav4zw94jdccgq5a34z0h5n9dgfv2hh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -59013,19 +59221,19 @@ license = lib.licenses.free; }; }) {}; - spray = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + spray = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spray"; version = "20160304.1420"; - src = fetchFromGitHub { - owner = "ian-kelling"; + src = fetchFromGitLab { + owner = "iankelling"; repo = "spray"; - rev = "ecb0425a3c49b4bcb1ac1d3ccbeec2061ff43978"; - sha256 = "0vl3qx3wdxqbvbpn811q4d0pnh9sla4mf5c19n56m4n4dd9i47h3"; + rev = "8e6385f2f09b8d72a480b6cbe211344be646005e"; + sha256 = "0sc5ygv0qxvral16gv1908jh2dvmlpx8lfc9b0cmbihhxpg1j305"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d0947317319c8ccfee59461ee628eb8ae9f261fc/recipes/spray"; - sha256 = "11b3wn53309ws60w8sfpfxij7vnibj6kxxsx6w1agglqx9zqngz4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e4f5053aa4e1af3f636febe9c3ce8c6ae20c090d/recipes/spray"; + sha256 = "1h8lngcqa343mlc091zs419frgsla65khfj93lv9fil3xbgrm7m9"; name = "spray"; }; packageRequires = []; @@ -59244,12 +59452,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "20160830.1354"; + version = "20160904.838"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "c8e86c90655dd138e5ccf2fd666f90b977c9a976"; - sha256 = "1wfrm2ylgxcazmp9v5ah214svcsl1l581p4cz89k7vg8f4vscs4g"; + rev = "4bf563b0b95f5a1e627e55d52d1c2fd0dd3af95f"; + sha256 = "0hxkkpylnf5phavcd2y3bxzikcnr7cdk3rbqgp3nw74sxz0223w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -59367,12 +59575,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20160813.308"; + version = "20160831.2219"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "965c68fe6ae4eabab28faad37ce2a57e3e343b46"; - sha256 = "1y10j2lqyz2ls7lp61f261mm2vgwrgcfqqv1af75g6gd2qqb1bfk"; + rev = "2257f951fef62080a97d5e3083889afd53b5648d"; + sha256 = "0c6pmvq7ck3hqcilb7cbb7gc7gi9wzjcb93qkgxy5mlv4m5w328m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -60086,22 +60294,22 @@ license = lib.licenses.free; }; }) {}; - sudo-edit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20160627.1203"; + version = "20160905.2153"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "2d5c7340eff4c88f29cd123a544ea2b88d14d9d9"; - sha256 = "0hdv9sphsrvknz9w6pkds2rbv4lp14z4k3x6kl6iipdh60lgywc7"; + rev = "d7fce267b58614e2b56d2fd260151b7b4d0c7f1b"; + sha256 = "0j0pyvm6pfkk0mq4vm8ajxwclllmsyj6d8wd3sf2yfxy45qacl2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4"; name = "sudo-edit"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/sudo-edit"; license = lib.licenses.free; @@ -60131,12 +60339,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20160822.2134"; + version = "20160903.806"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "d9cedf0d9c3809d4eb44dd719aebf2a0c681be4b"; - sha256 = "16g1ammapx0wgrxlhckxhn3bn2lj0xjx0m23gnn9ln1bj138h9fq"; + rev = "b0d7826ba295fc20f3346d6beb52c169d892a06f"; + sha256 = "0lkny47kjw4q0khndb9swmgiy5j22473djk32yjwy7b6qnfgwcwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -60461,12 +60669,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20160829.2049"; + version = "20160905.940"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "4c3ecb4d739df379dd01ac8c7dc17080e608dac3"; - sha256 = "0cah0ri248hy1xzrldhh831imyfvnm9jdwnnxqm0iphp4dsf1xk7"; + rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; + sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -61573,8 +61781,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "0bf87473bc8c21f8d37e2ff6157edf9df8bde521"; - sha256 = "189pbik01j3spd7ds2nsl48k1aqj01b3m4pc5261c8rakhdzgjz6"; + rev = "dcd808f985e7b0f562467e2145dcd1e901347999"; + sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -61590,12 +61798,12 @@ tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: melpaBuild { pname = "tern-auto-complete"; - version = "20151123.653"; + version = "20160906.1204"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "0bf87473bc8c21f8d37e2ff6157edf9df8bde521"; - sha256 = "189pbik01j3spd7ds2nsl48k1aqj01b3m4pc5261c8rakhdzgjz6"; + rev = "dcd808f985e7b0f562467e2145dcd1e901347999"; + sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -61917,10 +62125,10 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20160830.1004"; + version = "20160906.1018"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "1psccacv7r4mqxbp99q4hsln27pybhb0dz9mzrh0iz57b9j13fnh"; + sha256 = "0k7nw25bs7a5zrgfw3anfv0ls5pq1lhrwg81x0j749djjhw3xk5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; @@ -62003,8 +62211,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "e4ba16495e8d8177eb85d6bfcc69089b38753e39"; - sha256 = "1ykhl56l2rr853ppf37w37rq4bc5dvfvf1h47ahplij9qgagbf6x"; + rev = "ddc53c32486cc23dfa63ed4e5abb19923b8d13e6"; + sha256 = "0gq2zwy1isrb4r1xv1j34ni6byyyy7x4mpvcfw6g2z9h36x7bcsb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -63593,12 +63801,12 @@ uimage = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uimage"; - version = "20160716.130"; + version = "20160901.521"; src = fetchFromGitHub { owner = "lujun9972"; repo = "uimage"; - rev = "e63b06416d4fcfc50a65ba6dfdf7e4d9b969750c"; - sha256 = "0l03c72y219ilfm685g3c8jziayjdvbb911qzhs6hcbysy0b3v6x"; + rev = "9893d09160ef7e8c0ecdcd74fca99ffeb5f9d70d"; + sha256 = "1ri50nab778kpq49m54ra75z8dphagp9sz92is0636j4qy3sbih1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/346cb25abdfdd539d121a9f34bce75b2fc5a16be/recipes/uimage"; @@ -65224,6 +65432,25 @@ license = lib.licenses.free; }; }) {}; + w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "w3m"; + version = "20160825.919"; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; + module = "emacs-w3m"; + sha256 = "f48cdf069e61d81908e303d9984a05e1de9ccfc9fca8545435a95dd9de54eab9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m"; + sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc"; + name = "w3m"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/w3m"; + license = lib.licenses.free; + }; + }) {}; wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wacspace"; @@ -65332,12 +65559,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20160826.1616"; + version = "20160906.1507"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "6e69789e5413e91d315123ba977d9754bd9ef76d"; - sha256 = "0j0mhcvsf1hi2zxdn1gi7r0mrbcffcj0kdjrf15wwih4g6kraja6"; + rev = "2b717828f1878a05759701c249fffff6642fe1e1"; + sha256 = "084g3cn0s7n78s3zg0ln0sh445281pmn8fbr101y8akvp33b9aaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -65563,12 +65790,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20160828.2311"; + version = "20160904.1151"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "cceda49bfaad34296592492bebaa1544f6f0dc12"; - sha256 = "1d6ifc9ii2f64jyywqlkjk48jp1gv71hwd32lrp6dxmv3l32bwk3"; + rev = "c73ea9da7cbdefbe8edde0f021be93b8f4ad852d"; + sha256 = "1wriywjbqyibfd8m29blrccbs2g1kfjm4vlpz1a06f2kj0zcywq3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -65856,12 +66083,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20160817.817"; + version = "20160831.1655"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "1eace34a1f5b780a30797976d0cfec5936048b7b"; - sha256 = "0sgisdgid6xw6pggdi42i07wmar8bbxg9wk1b7jvyi7i7q94s843"; + rev = "ad9b0e43bc07b44094686ed521a4e107aa8efd2e"; + sha256 = "097q45vn3f1bmr67qwy71sn4acxwhb20bs6lif7zxahbd7iaxcv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -66025,8 +66252,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "58a5a48691f5814c6264fce48310681eed10cef4"; - sha256 = "010aplsdww0aksyml6xgyp6j44sj1f3m30h9zz7pknq7yn96rjnp"; + rev = "cbff3b029c7dc850676c288b5cd0d570a1906519"; + sha256 = "0vj02m8b29vwqv8k54h75s801sh6xz8vxsazqjmhx6a7cgm2l0k8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -66557,12 +66784,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }: melpaBuild { pname = "worf"; - version = "20160825.218"; + version = "20160902.734"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "ec177f9edd48bcb230acd5ff995bdb78b8f8ffac"; - sha256 = "1vhc370swk6bh7abgz1bnzyjvilmcjr7hvdl878x0vzcf9vlg7gx"; + rev = "6b540776f849704c331dbbf9b4db4a1ca033ada6"; + sha256 = "0gf1pnk111q2m7706sq7jv198a8ah1560wha0m226b1q3swlx11a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -66893,12 +67120,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20160817.509"; + version = "20160903.1614"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "2f4e511fe88ef21f24e0381ab3f31995296cd43a"; - sha256 = "0cwghnyklcnmcn1f6py0ji9bc5pwf03wxk1jv9vjxlyh0yd35dnk"; + rev = "0955a1a83170d324f90188426932ab8ea4616832"; + sha256 = "0i4sgx5p1mp09hxgh1qvr97kc7mr41dvib6kv9djm8vm19rvfd3b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -66935,12 +67162,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20160827.2003"; + version = "20160906.1341"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "30d7f9fad789f20c73eda03c62a18d4ecb6a239d"; - sha256 = "11x0d5rbvxk35hrmd8ygpyfi3k9nd8rxqkqrjvvzbfjwnjpwdk9q"; + rev = "59a4980eabb96361626d275c813fff336b17ae65"; + sha256 = "0yriyizfyp9bd83d4069rdbps4f6hyi3hf6w47xxxsjmvn9s9c2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -67082,12 +67309,12 @@ xcode-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, s }: melpaBuild { pname = "xcode-mode"; - version = "20160702.632"; + version = "20160907.508"; src = fetchFromGitHub { owner = "nicklanasa"; repo = "xcode-mode"; - rev = "3d4ce61f88a7e0d0e897972986c606dfb44ae5fe"; - sha256 = "09zl382wcsgmrp0ajaqvmh1wjrd0fzdk0by7dwrdlljafczwxlfl"; + rev = "5b5f0a4f505d44840a4924b24e3ef73b8528d98b"; + sha256 = "0g2vc13rc9vk20m9l1a1rxkdsc099k33pya3z10sg9pa09a4a2a2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/845c731bed7dbe9c41c09e47e219299f17d0d489/recipes/xcode-mode"; @@ -67586,12 +67813,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20160528.1400"; + version = "20160902.1142"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "a4794ea21a2ca8c9be6322fd7964e353d3fed0c1"; - sha256 = "1ql4bjqblij78cgasxdyr19w75xnl8cfxq047qi8r8847zy5w5wg"; + rev = "b03fba2be23ef928cc6e8752c87bf5f0e3dd422a"; + sha256 = "1nnqv0xq1w181cvd4yin7qij1lghyqg2x8qsll3k4f6jwnmwc561"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -67649,12 +67876,12 @@ yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20160819.247"; + version = "20160903.1935"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "aa61434132125ac6ab67d19968d8a1d5b27f62f5"; - sha256 = "0d5rbp36r7lwd7zm0z010wj0nxrf344ln1gn10j06hg4555wbmhb"; + rev = "76ecf21a8b59f35087716ac713eb072fd3d98f00"; + sha256 = "1h0gnnsqfb6q88002pjzmhmq9is1f3knwh24nw2rbsg3mpfg378x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -67896,12 +68123,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20160830.1455"; + version = "20160905.1720"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "200a6d2536cf4932b36a89a753eb9c6a12888f54"; - sha256 = "0avvsnizx8l0gyvzy8qkg0177agckxylldqk0vm45pqzzmbsvr02"; + rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193"; + sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -68483,6 +68710,27 @@ license = lib.licenses.free; }; }) {}; + zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zoutline"; + version = "20160906.743"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "zoutline"; + rev = "47231c6a82f0b718b0bec09f34e40ce68ca050de"; + sha256 = "0jd7izvpc4z3ivp5mdzbmz5vrlwnjxp2r16f3zs0cfbym998i25c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline"; + sha256 = "1yyww84b58ymbx0w1gkgd0csr0cwlghdmnxk0jbzwc45g9g42k1m"; + name = "zoutline"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/zoutline"; + license = lib.licenses.free; + }; + }) {}; ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; From b924cdefa5671b7f35ee6731352b25482ac8cac2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Sep 2016 16:49:09 +0200 Subject: [PATCH 175/195] tptp: take into account upstream tarball hash change; one file got renamed and some statistics in the documentation got regenerated --- pkgs/applications/science/logic/tptp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 32906b88d59..db7e0c0c938 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz" "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz" ]; - sha256 = "1i5hi8grfl5zyh8py63zn39rg019bd90h2l312iswbgai6nyfdw0"; + sha256 = "17mnqxnyibmzf5vvbnyhsd010zykqw8ikx4pvyj0x9sfyhpvgfix"; }; buildInputs = [ tcsh yap perl patchelf ]; From 5537503dec1af5dfa6392b7673420042878d659f Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 5 Sep 2016 21:09:44 +0100 Subject: [PATCH 176/195] nixos/tests/pump.io: Fix systemd unit config Ref #18209 (cherry picked from commit 3fd603c02f339778c8ea24c2fadacb91185eb1c7) --- nixos/tests/pump.io.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix index 89fa23c3336..3864f676497 100644 --- a/nixos/tests/pump.io.nix +++ b/nixos/tests/pump.io.nix @@ -81,7 +81,7 @@ in { ''; }; systemd.services.mongodb.unitConfig.Before = "pump.io.service"; - systemd.services.mongodb.unitConfig.RequiredBy = "pump.io.service"; + systemd.services."pump.io".unitConfig.Requires = "mongodb.service"; }; }; From 85091e33b767d08c2bd033f77ae76c85369400f4 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 5 Sep 2016 16:27:35 +0200 Subject: [PATCH 177/195] netcdf-mpi: fix compiler: use mpicc Use mpicc to build when mpi support is required (instead of regular gcc) (cherry picked from commit 396ffac28f948ebe4864551c67a01d1828e22ba6) --- pkgs/development/libraries/netcdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 06137bdad1f..5e296e8d754 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { "--enable-dap" "--enable-shared" ] - ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" ]); + ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); meta = { platforms = stdenv.lib.platforms.unix; From b6be2e9dc215a36bac644dacb213852ea58af591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 8 Sep 2016 12:36:58 +0200 Subject: [PATCH 178/195] eclipse-plugin-gnuarmeclipse: 2.11.1 -> 3.1.1 --- pkgs/applications/editors/eclipse/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index c871e6d6e8b..763b882af6a 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -322,12 +322,12 @@ rec { gnuarmeclipse = buildEclipseUpdateSite rec { name = "gnuarmeclipse-${version}"; - version = "2.11.1-201512141335"; + version = "3.1.1-201606210758"; src = fetchzip { stripRoot = false; url = "https://github.com/gnuarmeclipse/plug-ins/releases/download/v${version}/ilg.gnuarmeclipse.repository-${version}.zip"; - sha256 = "1ijvnahfw2wc860la7kj8b52z2sfm8k1yk62bl0d4lq60y3aycg9"; + sha256 = "1g77jlhfa3csaxxps1z5lasrd9l2p5ajnddnq9ra5syw8ggkdc2h"; }; meta = with stdenv.lib; { From 190b1d1ffccb70ca42de289d81eb7c693173647d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 8 Sep 2016 12:33:34 +0200 Subject: [PATCH 179/195] eclipse-plugin-cdt: 8.8.0 -> 9.0.1 --- pkgs/applications/editors/eclipse/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 763b882af6a..ba37f34719d 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -152,12 +152,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; - version = "8.8.0"; + version = "9.0.1"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/8.8/${name}.zip"; - sha256 = "1i1m7g5128q21njgrkiw71y4vi4aqzz8xdd4iv80j3nsvhbv6cnm"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.0/${name}.zip"; + sha256 = "0vdx0j9ci533wnk7y17qjvjyqx38hlrdw67z6pi05vfv3r6ys39x"; }; meta = with stdenv.lib; { From 1ac28f798c6550b54b88b576a2d72729c4c7f229 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 8 Sep 2016 13:02:16 -0500 Subject: [PATCH 180/195] melpaStablePackages 2016-09-08 --- .../emacs-modes/melpa-stable-generated.nix | 302 ++++++++++-------- 1 file changed, 172 insertions(+), 130 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index c061b30def8..e310064cb49 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1061,12 +1061,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "7128978b571ec013ccfd91865029cc0d062c269c"; - sha256 = "0l683fk3l82w6097d1g8i9ka3sfv9vpa363i6500xwraa49fcq9i"; + rev = "359c9d62649ad3f2cb007c4d8871e5b051d695f6"; + sha256 = "1kwn5lln7l754x5l3glij7ci3r2g6p9sapc43bm2gmwbgxa9fgis"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1166,12 +1166,12 @@ annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "annotate"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "bastibe"; repo = "annotate.el"; - rev = "067fe860eabcbad4894609c06f090c2c0f97773f"; - sha256 = "0s1yviv6sa05njlix7a88vhfz75mw056w2ac6cmw4wyhxcf4rwdv"; + rev = "9616c55812c4b6f11365e0f4e90f9357c95280ff"; + sha256 = "0wkdvmszabx1rcwqbm6rw07niwd7n4bdb9h2iav2miljwy68s40x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate"; @@ -3019,12 +3019,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "8337237449446e186ccd5ade0b0dc8c6ea7bd728"; - sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l"; + rev = "f5b828ef4ff6c367f87181a5b998aa78e42c2f24"; + sha256 = "0kmm1dlyf4f8b7dy2v2n7nf6620v6cq70ndlv5607dibhmaa8ksr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -3103,12 +3103,12 @@ cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cbm"; - version = "0.3.2"; + version = "0.4"; src = fetchFromGitHub { owner = "akermu"; repo = "cbm.el"; - rev = "3c7f33d26336776f94877974f5f7e1470ea1cbdd"; - sha256 = "0rrgi765x9p9wa14p2b5jhsk86cmiicx2a239jkxm00w3sdn7rn8"; + rev = "bd74f5f83ea1778d2e871cbcbedf458ccde40128"; + sha256 = "1smj2l0g0643qp2c5jgj7z9yk6y8yia5a33pfbdpa4qwgq1ap3m4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm"; @@ -3418,12 +3418,12 @@ cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: melpaBuild { pname = "cider-eval-sexp-fu"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider-eval-sexp-fu"; - rev = "dbe6a19c835ea42b099dd17f040db0baf9774aaf"; - sha256 = "1rkd76561h93si4lpisz3qnaj48dx8x01nd59a3lgpqsbbibnccf"; + rev = "6b437bf073b21543e72d76fd0392a28fba7cbfbe"; + sha256 = "1frpr5dwg7aa0pjr2sarck498lj11li8xi36s5qa8qhflgl29jpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu"; @@ -3478,6 +3478,27 @@ license = lib.licenses.free; }; }) {}; + circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "circe-notifications"; + version = "1.0"; + src = fetchFromGitHub { + owner = "eqyiel"; + repo = "circe-notifications"; + rev = "80c44441ecd3ae04ae63760aa20afa837c1ed05b"; + sha256 = "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; + sha256 = "06y525x5yc0xgbw0cf16mc72ca9bv8j8z4gpgznbad2qp7psf53c"; + name = "circe-notifications"; + }; + packageRequires = [ alert circe emacs ]; + meta = { + homepage = "https://melpa.org/#/circe-notifications"; + license = lib.licenses.free; + }; + }) {}; cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cl-format"; @@ -3765,12 +3786,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitLab { owner = "tarsius"; repo = "closql"; - rev = "a8b6b2beaa10528b2fd5ed9759136e3959529266"; - sha256 = "1p251vyh8fc6xzaf0v7yvf4wkrvcfjdb3qr88ll4xcb61gj3vi3a"; + rev = "8e4d0b3b31913a2362a45fcdaf05745dfc188b66"; + sha256 = "1189drdpzp05kafg5wfi556n2v6a957qs9xm3v9k2rsbgnyd2hgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql"; @@ -3828,12 +3849,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "f59513140bf086eda2029c5b4e950fc58216c06e"; - sha256 = "0x32brljg3rv4nsj75sngzbwkfp908xz0ypmvwm1rb47jgds6aqd"; + rev = "c5dcd31e92c0a09009a340e3fe23ced4f6190b64"; + sha256 = "0k40czfgxwdn4yavkl10ab5ls57mdr7smxjjld20mfrjnfbmv0fc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4143,12 +4164,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "b9b4b22bc8c109de3ae3a5bb4c6b2be89bd644db"; - sha256 = "1dds3fynbd6yb0874aw6g4qk5zmq3pgl3jmcp38md027qalgqmym"; + rev = "09065115bead0a14c134d4419944eed7e999284c"; + sha256 = "1vygalvg3hky0hacvj8pgjiaym91yh0npq69q4qi3slz87rpl24c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -4632,12 +4653,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "composer"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "3b5a9b7364136c8dd85b8b3c1323790c8c38c2a8"; - sha256 = "0zk1rbnh423r1rsml4lbwzkajkq7h3k6dan4cjqbyiw8pd12hq3m"; + rev = "d955d9dd39b3bd0ba04ade648108ddb805bac4bc"; + sha256 = "1yxywibs7zdhc4kgl372rl49r1ivl96adnapz2k58kggjybjk778"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; @@ -7375,12 +7396,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "0.17.0"; + version = "0.19.3"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "3112ff7964b596022de94c12b4676c6ca7a69c80"; - sha256 = "1n6gp3c4b3ryprw7hxd7447gkgjafxnlbfg75mjm96vfgxkb7abx"; + rev = "7e0da96f483703930919f04943f60f6eca3cb842"; + sha256 = "1y0prk4dbw6h26kj2l5vl3bakvc58aawjpkpb2r8wgb2b3fg9vl3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -8153,12 +8174,12 @@ eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }: melpaBuild { pname = "eopengrok"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "youngker"; repo = "eopengrok.el"; - rev = "30154a083b2fd8cbb9336d0d2134f790efd4163b"; - sha256 = "1yn9jn6jl6rmknj50g18z5yvpa1d8mzzx3j1pfdwfn36ak4nc9ba"; + rev = "0bf07c636f8d29a98e9776243ec9496875ddff51"; + sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok"; @@ -8195,12 +8216,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitLab { owner = "tarsius"; repo = "epkg"; - rev = "17553458c01563170be9c74db37bcc359a4702d4"; - sha256 = "18am0nc2kjxbnkls7dl9j47cynwiiafx8w6rqa4d9dyx7khl2rmp"; + rev = "b0606f9800c971085d5fef17dfe242aece378fb3"; + sha256 = "195y4clhs8lwbl3f5a9181v60n424s69nfzy9xrwzqclbyj42lr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg"; @@ -9137,12 +9158,12 @@ evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "de6ce21e1e24b7a0370ca3a6ce83b529f772c8db"; - sha256 = "0dhk8ajn5b0y4qla4jak76zxqgiai9fcd1hpfh98pmsjy1jq5ll4"; + rev = "b01763bf766a7449626e6216c2d360ae1e80e5c1"; + sha256 = "197ycwx02mjlvck5xraw2jwlsv3ham5jm2yv8133i4cq8dszcfaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -11307,12 +11328,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "cffb48cfc3973155d34651996257a901e6f5f8d0"; - sha256 = "1bzbjv15bz0zfsizgd8yr6gin225qnq8g2795r14q7al8f71slv7"; + rev = "a31c19e88f403a8ebb2e6a5d27eef39fca595ba4"; + sha256 = "1sxr79gcj2xkh8qfp0h4r6iqmhm27qkibsk8l78gi2n3790sbnxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -11557,12 +11578,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "bfc157a682b53927af633fd919c2e03235ea6599"; - sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj"; + rev = "383a050920e9b99d37c21d041deb7f38b202485c"; + sha256 = "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -11977,12 +11998,12 @@ git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-gutter"; - version = "0.89"; + version = "0.90"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter"; - rev = "02f67e207f0653077c06ddc8502c6a0cd28de260"; - sha256 = "04qkznd85f9msrgpwsfswbfi5nzvpy4mk5mcmv2cvbq68grs4c40"; + rev = "a786465bd527c13e32c73c02b95086560c1be878"; + sha256 = "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; @@ -12352,22 +12373,22 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { owner = "tarsius"; repo = "glab"; - rev = "7c022e55ec5d50f9f5b656b17823f7e165f2d056"; - sha256 = "0qmnz4zd6z0nhxxmwgk16mppf7i86na7c3nyc47jfw7xl63s98pk"; + rev = "5ced0214622450930bcea105b9aac785c594609d"; + sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di"; name = "glab"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/glab"; license = lib.licenses.free; @@ -12772,27 +12793,6 @@ license = lib.licenses.free; }; }) {}; - goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "goose-theme"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "thwg"; - repo = "goose-theme"; - rev = "52244bd5ee3e7b42599d9697007a5df3b026aafc"; - sha256 = "1d1x5ffpn9gq9byd0qavxr081sl3qf0lihdxfdqvhwd815kravxk"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5fa2ce32adbccdbc3f1b642585b430202e7ae274/recipes/goose-theme"; - sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9"; - name = "goose-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/goose-theme"; - license = lib.licenses.free; - }; - }) {}; gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: melpaBuild { pname = "gotest"; @@ -13477,12 +13477,12 @@ haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; - sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; + rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; + sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs"; @@ -13498,12 +13498,12 @@ haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs-base"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; - sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; + rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; + sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-base"; @@ -13519,12 +13519,12 @@ haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs-text"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; - sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; + rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9"; + sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-text"; @@ -13665,16 +13665,16 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "557786d0443791d5d0ccfbdc1dcc86004e31d218"; - sha256 = "0xk0hw08b335j3w2frxa61bg3521zjrjv35bw5qcd1z6b0n8gwks"; + rev = "7a7c9d990e924b9ac0e845afa4e539122f034e31"; + sha256 = "0rpjz3z5ainpxkdmdwpmb1an23qwvfyfjsfscw5kw7k915wak0kq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/90ab37af6b0c85eac11c423bc8f0d93d6d8a9fd4/recipes/helm"; - sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; + sha256 = "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf"; name = "helm"; }; packageRequires = [ async emacs helm-core popup ]; @@ -13875,12 +13875,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "557786d0443791d5d0ccfbdc1dcc86004e31d218"; - sha256 = "0xk0hw08b335j3w2frxa61bg3521zjrjv35bw5qcd1z6b0n8gwks"; + rev = "7a7c9d990e924b9ac0e845afa4e539122f034e31"; + sha256 = "0rpjz3z5ainpxkdmdwpmb1an23qwvfyfjsfscw5kw7k915wak0kq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -15051,12 +15051,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "7d883bfa80dcb6fd2bf6c559cc8250fe0c4f80d7"; - sha256 = "1dil3lspcidvdq99h7an7n6mvylwmf8s4xmaqbpdbc4rwiijjhkl"; + rev = "5de979e1e001608c9fe73d552c4e29110957bbb8"; + sha256 = "1qaklfhf92zibj2wrpiyjqrzba7j00iqzb46nd7p64wyqqhh7ncp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -17400,12 +17400,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "34e28d4c88ad9c71aee3dd226817c6eb6927b2c7"; - sha256 = "17bfxn1bl2by3vnp24hnk6qjxx6av1fayrsw9hlldwhgp4ayhy48"; + rev = "14c86914b708081299cf6a290570ff8e11853cab"; + sha256 = "15zsx296cqzmwivrkkknr8lmdsr6dkggxbwp2yggr20278vsvbhv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -17736,12 +17736,12 @@ leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "aborn"; repo = "leanote-emacs"; - rev = "60368f2629ec4eac97c2a9d1ad043efd84454925"; - sha256 = "01y4ilrjhf7y3a1r514ahxpa7cl1w5xdj01lxal2a3bhxbkzcvrp"; + rev = "1bd49fdf13ef707bae7edaa724a1592aa7fb002f"; + sha256 = "1k58rhk5p819cvfa6zg7j3ysvzhq6dc433fzhh1ff0gwga2vrqbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote"; @@ -20416,12 +20416,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "2ac966a464a830f52a9101c0a9d65f6a95cbfa0e"; - sha256 = "003lxk19z8wq0i6ah7xf14cgqgxww50337vgp66gi3kc0lscfdbf"; + rev = "fb577a431f5ef1a29fdf3b818dceb4f6b4e8fa52"; + sha256 = "1vzs5y0ib9bqvcyap7f6v75pf8z0xpdwgq554zxci4dlwp68fp2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -20458,12 +20458,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "6e4c239f58645d6cee3ed4aa180ae484f677a7ab"; - sha256 = "1j5agcq56mphpbpxdaklvl1y2689sfny4l6wknvrwxnqyl48yzkb"; + rev = "537e584d115fb056a23a0b055e0a28f543182c45"; + sha256 = "1cma5047c3486bjfshb612iq6j3yml0c02gqy8d0ms9507r60igq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -20958,12 +20958,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "d2c54acf566a9ee38021261f7d8f43a94c9eee8c"; - sha256 = "1rh6vi2vi50zkmcd5jyfnhhsdrfn6l9abd43l8ppgr3k93l3m5bl"; + rev = "1553934954ea47e4d2de676c42324ed4790cfd14"; + sha256 = "1n978yv19bsy5876lnp16xs1qg1frdbicf9c9h2rvil5myrljhyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -21450,12 +21450,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "51aec969cc0dc8e0c81220f020d643861d2f5c9b"; - sha256 = "0j3z2imv5w6cndnxdyy0pf9la6qxbgwdwr7vr8mr47frqpjb4i63"; + rev = "5f1445e9bafa252c8708b3bc223f30032f5ae82b"; + sha256 = "0aip4krrl5cyaa2agmmzipqw139zar3j6594vba93axalfdx9i9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -22621,12 +22621,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "e641d91c2886800871769e8e0e6554d2f8001e79"; - sha256 = "1lv3iiwidlvr6jsldd2s9apir1jzpynii8vp58gxq9kxbm4rzb42"; + rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2"; + sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -23331,7 +23331,7 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; @@ -23496,6 +23496,27 @@ license = lib.licenses.free; }; }) {}; + plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "plain-theme"; + version = "1"; + src = fetchFromGitHub { + owner = "yegortimoshenko"; + repo = "plain-theme"; + rev = "4210122812df9b5fe375ad35a3b933bf040460a3"; + sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; + sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8"; + name = "plain-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/plain-theme"; + license = lib.licenses.free; + }; + }) {}; platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "platformio-mode"; @@ -24063,12 +24084,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "9a8a4641be1f2eae7f6f42d13db24c10bfa0c974"; - sha256 = "0v5mm9v4wd3yfnlx7zbb48lsxz7fyv4vcdszdpr5nswynmihxfi5"; + rev = "70ec237ce49172ccc4daa536505749e3d4701469"; + sha256 = "0jvj0lxy7mhkv8ql472zz6wyrmh72cw1z9n1200z5g8p4n7jfjsj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -24168,12 +24189,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "e8ae137c96444ea313485ed1118c5e43b2099cf1"; - sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; + rev = "1a586735085e817b1f52e53feec92ce418049f69"; + sha256 = "16wmr1fgdqpf84fkq90cxvccfsxx7h0q0wzqkbg8vdjmka412g09"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -24942,6 +24963,27 @@ license = lib.licenses.free; }; }) {}; + rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rc-mode"; + version = "1.0.6"; + src = fetchFromGitHub { + owner = "mrhmouse"; + repo = "rc-mode.el"; + rev = "b9b48e24a55083e4911f2b497ed4d9676a192e88"; + sha256 = "06ln916fim58q44g67zlnsipfxcramyrqbm9adh52mdbk44j4bf9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode"; + sha256 = "0p77mckw8jyxcwspj1ffm8mz0k01ddm67hh9j8rw812wddwnj7qf"; + name = "rc-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/rc-mode"; + license = lib.licenses.free; + }; + }) {}; rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-styles"; @@ -25999,8 +26041,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "a0b73b25377f5aedf50abe198d6b6111310735be"; - sha256 = "0b2gm1mfxiqm86m5156scmzvn10dl0idgxpzgki1k0cpy4xf4qfa"; + rev = "387e93c70a3703e55f717d3285912ad12cfee947"; + sha256 = "0xwwarla3m9cr1mpnlhsknfvxw1xyf85cxjkzg42q12k7i0yad5w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -27570,12 +27612,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "6140e23a2902616da5894dc676b47a8748faf016"; - sha256 = "0dczcmibvr9m5isn9isgl01q9x97yfdcs21qa57ds2b3nmqaqy4p"; + rev = "4bf563b0b95f5a1e627e55d52d1c2fd0dd3af95f"; + sha256 = "0hxkkpylnf5phavcd2y3bxzikcnr7cdk3rbqgp3nw74sxz0223w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -30698,12 +30740,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "4929d430266925c1145adef9987e2acdb829395b"; - sha256 = "12613xwd05l26p2v9jxjxcqf4v20j6fq5wpmnj45spg0ngalwzg4"; + rev = "6f41998405796336575b1fce49b84667feaa9b9f"; + sha256 = "12bw86l8756rwfgnik0kywqafw8idv8ncdxlbaybix70r2iaa61y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; From 023e4db7857eaf64f1dd34ca3359dbbcdb8b02b1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 8 Sep 2016 13:09:47 -0500 Subject: [PATCH 181/195] elpaPackages 2016-09-08 --- .../editors/emacs-modes/elpa-generated.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 8694c30c6d4..cc9e033cd41 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "11.89.4"; + version = "11.89.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-11.89.4.tar"; - sha256 = "06dxj9wflwgzy88vk47pdk6xln4f63cab7s73ynwp2bdqjs99f5b"; + url = "https://elpa.gnu.org/packages/auctex-11.89.5.tar"; + sha256 = "0scab76ks9wnv1wp9lrm6h9hag7p70zn950srp2p02vrzz2z5p53"; }; packageRequires = []; meta = { @@ -618,10 +618,10 @@ }) {}; el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "el-search"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-0.2.2.tar"; - sha256 = "07b4jk143vi3sydg03mg12gy1rs21q0qvs7p303irwz4pv8bfwqj"; + url = "https://elpa.gnu.org/packages/el-search-0.2.3.tar"; + sha256 = "0icxfq6hd8pfg4r5q70ylm84wgv1jiijpv0d56x7kjdh7wrdalrb"; }; packageRequires = [ emacs ]; meta = { @@ -1336,10 +1336,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20160829"; + version = "20160905"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20160829.tar"; - sha256 = "1p0bxbzjzxmhsg1m4a3mlsphh7gcv6b97mfgkl22lfy0ia0g1fzv"; + url = "https://elpa.gnu.org/packages/org-20160905.tar"; + sha256 = "118xq8bsiwa6nfxm14ww5dmyf5r0cv69lf748cj39bcvg1qm94vn"; }; packageRequires = []; meta = { From a0d198104665ac37973ead6087ea482039a2c0a5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 8 Sep 2016 13:11:34 -0500 Subject: [PATCH 182/195] orgPackages 2016-09-08 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index feab6f5cc56..700e494cfa7 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 = "20160725"; + version = "20160905"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20160725.tar"; - sha256 = "1d2v6w93z543jnmz6a1kmp61rmznjnw6pvd9ia2pm42rzhsgydy5"; + url = "http://orgmode.org/elpa/org-20160905.tar"; + sha256 = "01zm7s5qbh1xvxddd93i6cmz3m7x2s67zwzah5q5l3hgnvbx750q"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20160725"; + version = "20160905"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20160725.tar"; - sha256 = "0bxxbcln7npffvd947052sjp59ypxdfwkp2ja7mbs28pzzb25xxi"; + url = "http://orgmode.org/elpa/org-plus-contrib-20160905.tar"; + sha256 = "1wx51iqg1cfrf220yslp2lq9s7klbv6bbxq0d2ygj47yjikkf39r"; }; packageRequires = []; meta = { From f7910efe6ea1ce96061561615cb46e9fff3d47b5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 8 Sep 2016 13:28:03 -0500 Subject: [PATCH 183/195] melpaPackages.jade: disable due to missing dependency --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6081c96006a..eaddf4ed61e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -98,6 +98,9 @@ self: # upstream issue: missing file header initsplit = markBroken super.initsplit; + # upstream issue: missing dependency + jade = null; + # upstream issue: missing file header jsfmt = markBroken super.jsfmt; From c61026de5dcf4dd80940ec5fbe5263e322e062f4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 8 Sep 2016 13:32:38 -0500 Subject: [PATCH 184/195] melpaStablePackages.jade: disable due to missing dependency --- .../editors/emacs-modes/melpa-stable-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 0e90f7adf27..7cf85d3cdab 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -35,10 +35,6 @@ self: }); overrides = { - ac-php = super.ac-php.override { - inherit (self.melpaPackages) company popup; - }; - # upstream issue: mismatched filename ack-menu = markBroken super.ack-menu; @@ -95,6 +91,9 @@ self: # upstream issue: missing file header initsplit = markBroken super.initsplit; + # upstream issue: missing dependency + jade = null; + # upstream issue: missing file header jsfmt = markBroken super.jsfmt; From c58f6e62de1e3163489b4e2f29c6f2b0531ab47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 7 Sep 2016 23:44:51 +0200 Subject: [PATCH 185/195] bcc: git-2016-05-18 -> git-2016-08-30 --- pkgs/os-specific/linux/bcc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 838c65dd196..98d790068e1 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -2,14 +2,14 @@ flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: stdenv.mkDerivation rec { - version = "git-2016-05-18"; + version = "git-2016-08-30"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; - rev = "c7f317deb577d59007411e978ac21a2ea376358f"; - sha256 = "0jv4smy615kp7623pd61s46m52jjp6m47w0fjgr7s22qamra3g98"; + rev = "4c2b5388f8d685a127a4d757c254a380e0aa915c"; + sha256 = "1bd4darmr60vfr5414zq0bd9rq42r6h3cwiiwjllksbi4v2jvx77"; }; buildInputs = [ makeWrapper cmake llvmPackages.llvm llvmPackages.clang-unwrapped kernel From e2991cc70bc4c953570045ab29bde4734d7476ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 7 Sep 2016 22:44:06 +0200 Subject: [PATCH 186/195] bcc: install documentation not as an executable in bcc/tools documentation was wrapped as an executable --- pkgs/os-specific/linux/bcc/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 98d790068e1..d6593b4ee50 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -17,17 +17,21 @@ stdenv.mkDerivation rec { ]; cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules -DBCC_KERNEL_HAS_SOURCE_DIR=1"; - + postInstall = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/share + rm -r $out/share/bcc/tools/{old,doc/CMakeLists.txt} + mv $out/share/bcc/tools/doc $out/share + mv $out/share/bcc/man $out/share/ + for f in $out/share/bcc/tools\/*; do - ln -s $f $out/bin/$(basename $f) + ln -s $f $out/bin/$(basename $f) wrapProgram $f \ --prefix LD_LIBRARY_PATH : $out/lib \ --prefix PYTHONPATH : $out/lib/python2.7/site-packages \ --prefix PYTHONPATH : :${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages done - ''; + ''; meta = with stdenv.lib; { description = "Dynamic Tracing Tools for Linux"; From 348ee0ae187c3de42e30e41a4ba9de73a32c2af8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 8 Sep 2016 20:59:11 +0200 Subject: [PATCH 187/195] josm: 10786 -> 10966 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 3b1b9faa574..dde6b151c8b 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "10786"; + version = "10966"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1dlb33nw8idipshiqy5p9vssdnkra3z2ixfixkj017b8wxdzvjpn"; + sha256 = "0ggiilqfr7n4b2qik1ddlx9h0dwzglfk10y1zmzw9ij0gfbxn791"; }; phases = [ "installPhase" ]; From a49133b07f95d48db98f3da00c24156746d2b712 Mon Sep 17 00:00:00 2001 From: Matt Billenstein Date: Thu, 8 Sep 2016 11:57:46 -0700 Subject: [PATCH 188/195] nginx module: add upstream check module --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 2785bd27d77..743a7834c58 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -127,4 +127,13 @@ sha256 = "1psrb5v071idlplvbnaq904nlhqw1zrbw4aawfs278zcdmq67zn8"; }; }; + + upstream-check = { + src = fetchFromGitHub { + owner = "yaoweibin"; + repo = "nginx_upstream_check_module"; + rev = "10782eaff51872a8f44e65eed89bbe286004bcb1"; + sha256 = "0h98a8kiw2qkqfavysm1v16kf4cs4h39j583wapif4p0qx3bbm89"; + }; + }; } From 5d670ed65c544312864c5cc616d5528d42921d85 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Sep 2016 21:16:58 +0200 Subject: [PATCH 189/195] gdrivefs: 0.14.3 -> 0.14.8 --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06a11bf2815..5dc5b75d48a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -831,6 +831,8 @@ in fzy = callPackage ../tools/misc/fzy { }; + gdrivefs = python27Packages.gdrivefs; + gencfsm = callPackage ../tools/security/gencfsm { }; genromfs = callPackage ../tools/filesystems/genromfs { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 350843e3df7..8463f49f655 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11021,15 +11021,14 @@ in modules // { }; gdrivefs = buildPythonPackage rec { - version = "0.14.3"; + version = "0.14.8"; name = "gdrivefs-${version}"; + namePrefix = ""; disabled = !isPy27; - src = pkgs.fetchFromGitHub { - sha256 = "1ljkh1871lwzn5lhhgbmbf2hfnbnajr3ddz3q5n1kid25qb3l086"; - rev = version; - repo = "GDriveFS"; - owner = "dsoprea"; + src = pkgs.fetchurl { + url = "https://github.com/dsoprea/GDriveFS/archive/${version}.tar.gz"; + sha256 = "1dch10ajkp567pwvssvz1v5c0hxfyd8wf9qd7j1gfybh7f7hyzvw"; }; buildInputs = with self; [ gipc greenlet httplib2 six ]; From dd1858be90cf8e1c55949c0902b2b574664fb8cf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 31 Jul 2016 18:01:50 +0200 Subject: [PATCH 190/195] libtoxcore-dev: 20160319 -> 20160727 --- .../libraries/libtoxcore/new-api/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix index eff8e2449a1..b88f4f6a74e 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix @@ -2,13 +2,13 @@ , libvpx, check, libconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "tox-core-dev-20160319"; + name = "tox-core-dev-20160727"; src = fetchFromGitHub { owner = "irungentoo"; repo = "toxcore"; - rev = "532629d486e3361c7d8d95b38293cc7d61dc4ee5"; - sha256 = "0x8mjrjiafgia9vy7w4zhfzicr2fljx8xgm2ppi4kva2r2z1wm2f"; + rev = "755f084e8720b349026c85afbad58954cb7ff1d4"; + sha256 = "0ap1gvlyihnfivv235dbrgsxsiiz70bhlmlr5gn1027w3h5kqz8w"; }; NIX_LDFLAGS = "-lgcc_s"; @@ -29,8 +29,10 @@ stdenv.mkDerivation rec { "--enable-daemon" ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - autoreconfHook libsodium ncurses check libconfig pkgconfig + autoreconfHook libsodium ncurses check libconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus ]; From 6ee129b29fcb2dcfe2c5d002c62b0117f14fd029 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 31 Jul 2016 18:01:26 +0200 Subject: [PATCH 191/195] utox: 0.9.4 -> 0.9.8 --- .../networking/instant-messengers/utox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 227198ccd6b..75995a6c5e3 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "utox-${version}"; - version = "0.9.4"; + version = "0.9.8"; src = fetchFromGitHub { owner = "GrayHatter"; repo = "uTox"; rev = "v${version}"; - sha256 = "0kcz8idjsf3vc94ccxqkwnqdj5q1m8c720nsvixk25klzws2cshv"; + sha256 = "0ahwdwqhi1gmvw80jihc1ba4cqqnx8ifjnzazxidfdky4ikzccmn"; }; buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype From 9146a62f51ae6ffbeab40b39eff7f0140c20b17e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 31 Jul 2016 18:00:28 +0200 Subject: [PATCH 192/195] toxic: 20150125 -> 20160728 --- .../instant-messengers/toxic/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index f733acf4133..414b36b05e3 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses -, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: +{ stdenv, fetchFromGitHub, libsodium, ncurses, curl +, libtoxcore-dev, openal, libvpx, freealut, libconfig, pkgconfig +, libqrencode }: stdenv.mkDerivation rec { - name = "toxic-dev-20150125"; + name = "toxic-dev-20160728"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; - rev = "4badc983ea"; - sha256 = "01zk6316v51f1zvp5ss53ay49h3nnaq5snlk0gxmsrmwg71bsnm6"; + rev = "cb21672600206423c844306a84f8b122e534c348"; + sha256 = "1nq1xnbyjfrk8jrjvk5sli1bm3i9r8b4m8f4xgmiz68mx1r3fn5k"; }; - makeFlags = [ "-Cbuild" "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ]; + nativeBuildInputs = [ pkgconfig libconfig ]; buildInputs = [ - autoconf libtool automake libtoxcore libsodium ncurses - libconfig pkgconfig + libtoxcore-dev libsodium ncurses libqrencode curl ] ++ stdenv.lib.optionals (!stdenv.isArm) [ openal libvpx freealut ]; From 7583f080ae60a9aabb080634649f48620f6c4f27 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 8 Sep 2016 20:38:08 +0200 Subject: [PATCH 193/195] qtox: 1.4.1 -> 1.5.0 --- .../networking/instant-messengers/qtox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index b30605294b3..9a26e2e4fc0 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -4,7 +4,7 @@ qtbase, qtsvg, qttools, qmakeHook, qttranslations, sqlcipher }: let - version = "1.4.1"; + version = "1.5.0"; revision = "v${version}"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "tux3"; repo = "qTox"; rev = revision; - sha256 = "1n0bfcfc90pnh0bzas7gv60jicsg9vpfwhhln9hkllsrimjvcdq5"; + sha256 = "1na2qqzbdbjfw8kymxw5jfglslmw18fz3vpw805pqg4d5y7f7vsi"; }; buildInputs = From daf068c33bab05956afd4cc1316c07435a174acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 8 Sep 2016 23:09:23 +0200 Subject: [PATCH 194/195] plantuml: 8037 -> 8047 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index c71f2e86e11..f15c452c955 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "8037"; + version = "8047"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar"; - sha256 = "1mlwcaph6n2akl639x64vpyjjipv6x0mwqxv6lvy3ml58pbgl58y"; + sha256 = "11a1qchalymvc7qn9kqxamp8qm8fljpnxmfi4zs8sg75nzddjnlm"; }; # It's only a .jar file and a shell wrapper From 42557e0514177e10040f8425b505a6ff32807e04 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Fri, 6 May 2016 11:43:22 +0200 Subject: [PATCH 195/195] antimicro: 2.21 -> 2.22, use new official repository --- pkgs/tools/misc/antimicro/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index bf89e303744..4bba4858beb 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "antimicro-${version}"; - version = "2.18.2"; + version = "2.22"; src = fetchFromGitHub { - owner = "7185"; + owner = "AntiMicro"; repo = "antimicro"; rev = "${version}"; - sha256 = "1mqw5idn57yj6c1w8y0byzh0xafcpbhaa6czgljh206abwfixjmk"; + sha256 = "102fh9ysd2dmfc6b73bj88m064jhlglqrz2gd7k9jccadxpbp3mq"; }; buildInputs = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GUI for mapping keyboard and mouse controls to a gamepad"; - homepage = "https://github.com/Ryochan7/antimicro"; + inherit (src.meta) homepage; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; platforms = with platforms; linux;