From cbc25e55068eb61644deacdd4f9ff883140f064c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 27 Oct 2016 17:15:18 +0200 Subject: [PATCH 001/295] duplicity: use buildPythonApplication --- pkgs/tools/backup/duplicity/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index c63e6c515a5..4f5601501e9 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -3,8 +3,7 @@ let version = "0.7.07.1"; - inherit (python2Packages) boto cffi cryptography ecdsa enum idna ipaddress lockfile paramiko pyasn1 pycrypto python setuptools six; -in stdenv.mkDerivation { +in python2Packages.buildPythonApplication { name = "duplicity-${version}"; src = fetchurl { @@ -12,16 +11,21 @@ in stdenv.mkDerivation { sha256 = "594c6d0e723e56f8a7114d57811c613622d535cafdef4a3643a4d4c89c1904f8"; }; - installPhase = '' - python setup.py install --prefix=$out + postInstall = '' wrapProgram $out/bin/duplicity \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}" - wrapProgram $out/bin/rdiffdir \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" ''; - buildInputs = [ python librsync makeWrapper setuptools ]; + buildInputs = [ librsync makeWrapper ]; + + # Inputs for tests. These are added to buildInputs when doCheck = true + checkInputs = with python2Packages; [ lockfile mock pexpect ]; + + # Many problematic tests + doCheck = false; + + propagatedBuildInputs = with python2Packages; [ boto cffi cryptography ecdsa enum idna + ipaddress lockfile paramiko pyasn1 pycrypto six ]; meta = { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; From 9434ec54414c6cbfd3be6e6f8d3b7fec74e75aae Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 29 Oct 2016 14:47:32 -0400 Subject: [PATCH 002/295] root: fix environment setup 1) s/envHook/postHook/ 2) patch to not set $p that fixes nested ```nix-shell -p root``` calls --- pkgs/applications/science/misc/root/default.nix | 3 +++ pkgs/applications/science/misc/root/setup-hook.sh | 2 +- .../applications/science/misc/root/thisroot.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/misc/root/thisroot.patch diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 45d7686b3e5..d1106a75847 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; }) ./sw_vers.patch + + # this prevents thisroot.sh from setting $p, which interferes with stdenv setup + ./thisroot.patch ]; preConfigure = '' diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index 197dc78c3c2..fc2b697d8a8 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -6,4 +6,4 @@ thisroot () { source @out@/bin/thisroot.sh } -envHooks+=(thisroot) +postHooks+=(thisroot) diff --git a/pkgs/applications/science/misc/root/thisroot.patch b/pkgs/applications/science/misc/root/thisroot.patch new file mode 100644 index 00000000000..57cd5838e64 --- /dev/null +++ b/pkgs/applications/science/misc/root/thisroot.patch @@ -0,0 +1,15 @@ +diff --git a/config/thisroot.sh b/config/thisroot.sh +index 85dee20..532cb28 100644 +--- a/config/thisroot.sh ++++ b/config/thisroot.sh +@@ -15,8 +15,8 @@ drop_from_path() + return 1 + fi + +- p=$1 +- drop=$2 ++ local p=$1 ++ local drop=$2 + + newpath=`echo $p | sed -e "s;:${drop}:;:;g" \ + -e "s;:${drop};;g" \ From 1f978a50a8aecf2c447dec7fd8cb688a08ebf703 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 30 Oct 2016 13:14:15 -0200 Subject: [PATCH 003/295] cherrytree: 0.37.1 -> 0.37.6 --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 43e41284f14..324fa12dc46 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cherrytree-${version}"; - version = "0.37.1"; + version = "0.37.6"; src = fetchurl { url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "45f1cee4067598cf2ca8ae6f89d03789b86f9e3bf196236119868653420d7cdd"; + sha256 = "0x4cgsimpwh7wfbzbzw2f5ipxxjizpi4wa99s1cwizynfjr38y5s"; }; buildInputs = with pythonPackages; From 1cb54a7dd0dc6527949ba889d7cffd979c444e73 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 30 Oct 2016 20:47:13 +0300 Subject: [PATCH 004/295] bumblebee: backport critical libkmod.patch --- pkgs/tools/X11/bumblebee/default.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 480c929e941..ec279f56cd8 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -20,6 +20,7 @@ , glib, libbsd , libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau , nvidia_x11, virtualgl, primusLib +, automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? @@ -48,6 +49,15 @@ let xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); + modprobePatch = fetchurl { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/1ada79fe5916961fc4e4917f8c63bb184908d986.patch"; + sha256 = "0x9qvhw6sn606dqcp3394irj6jjhw3h75k3lpbys6gha1yshgjps"; + }; + libkmodPatch = fetchurl { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; + sha256 = "0j2v0lncjfn2nw3324q3n69lw3yz3hah6bscc8xn9a2df2dcawj1"; + }; + in stdenv.mkDerivation rec { name = "bumblebee-${version}"; @@ -56,7 +66,12 @@ in stdenv.mkDerivation rec { sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; - patches = [ ./nixos.patch ]; + patches = [ + ./nixos.patch + + modprobePatch + libkmodPatch + ]; # By default we don't want to use a display device nvidiaDeviceOptions = lib.optionalString (!useDisplayDevice) '' @@ -96,7 +111,8 @@ in stdenv.mkDerivation rec { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ libX11 glib libbsd ]; + buildInputs = [ libX11 glib libbsd ] + ++ [ kmod automake111x autoconf ]; nativeBuildInputs = [ makeWrapper pkgconfig help2man ]; # The order of LDPATH is very specific: First X11 then the host From f8a17768cd6049c6dcc3251ed512504b5cac91f0 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Mon, 31 Oct 2016 09:49:34 +0300 Subject: [PATCH 005/295] bumblebee: remove long time obsolete substitution --- pkgs/tools/X11/bumblebee/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index ec279f56cd8..116a7a014ea 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -90,13 +90,6 @@ in stdenv.mkDerivation rec { ''; preConfigure = '' - # Substitute the path to the actual modinfo program in module.c. - # Note: module.c also calls rmmod and modprobe, but those just have to - # be in PATH, and thus no action for them is required. - - substituteInPlace src/module.c \ - --replace "/sbin/modinfo" "${kmod}/sbin/modinfo" - # Don't use a special group, just reuse wheel. substituteInPlace configure \ --replace 'CONF_GID="bumblebee"' 'CONF_GID="wheel"' From a25e6bc8dbeac64de77b81c46d9116989b2b483c Mon Sep 17 00:00:00 2001 From: romildo Date: Tue, 1 Nov 2016 17:06:39 -0200 Subject: [PATCH 006/295] lumina: init at 1.1.0-p1 --- .../services/x11/desktop-managers/default.nix | 3 +- .../services/x11/desktop-managers/lumina.nix | 52 ++++++++++++++ pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch | 26 +++++++ .../avoid-absolute-path-on-sessdir.patch | 11 +++ pkgs/desktops/lumina/default.nix | 69 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/x11/desktop-managers/lumina.nix create mode 100644 pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch create mode 100644 pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch create mode 100644 pkgs/desktops/lumina/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 31412ae7014..144e4aada27 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,8 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix - ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix + ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix + ./kodi.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix new file mode 100644 index 00000000000..f0b31a2acb0 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + xcfg = config.services.xserver; + cfg = xcfg.desktopManager.lumina; + +in + +{ + options = { + + services.xserver.desktopManager.lumina.enable = mkOption { + type = types.bool; + default = false; + description = "Enable the Lumina desktop manager"; + }; + + }; + + + config = mkIf (xcfg.enable && cfg.enable) { + + services.xserver.desktopManager.session = singleton { + name = "lumina"; + start = '' + exec ${pkgs.lumina}/bin/start-lumina-desktop + ''; + }; + + environment.systemPackages = [ + pkgs.fluxbox + pkgs.kde5.kwindowsystem + pkgs.kde5.oxygen-icons5 + pkgs.lumina + pkgs.numlockx + pkgs.qt5.qtsvg + pkgs.xscreensaver + ]; + + # Link some extra directories in /run/current-system/software/share + environment.pathsToLink = [ + "/share/desktop-directories" + "/share/icons" + "/share/lumina" + "/share" + ]; + + }; +} diff --git a/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch b/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch new file mode 100644 index 00000000000..6ddd9c76591 --- /dev/null +++ b/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch @@ -0,0 +1,26 @@ +diff --git a/src-qt5/core/libLumina/LuminaOS-NixOS.cpp b/src-qt5/core/libLumina/LuminaOS-NixOS.cpp +index b92d1b0..441b1bf 100644 +--- a/src-qt5/core/libLumina/LuminaOS-NixOS.cpp ++++ b/src-qt5/core/libLumina/LuminaOS-NixOS.cpp +@@ -13,17 +13,17 @@ + //can't read xbrightness settings - assume invalid until set + static int screenbrightness = -1; + +-QString LOS::OSName(){ return "Gentoo Linux"; } ++QString LOS::OSName(){ return "NixOS"; } + + //OS-specific prefix(s) + // NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in + QString LOS::LuminaShare(){ return (L_SHAREDIR+"/lumina-desktop/"); } //Install dir for Lumina share files +-QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications +-QString LOS::SysPrefix(){ return "/"; } //Prefix for system ++QString LOS::AppPrefix(){ return PREFIX+"/usr"; } //Prefix for applications ++QString LOS::SysPrefix(){ return PREFIX; } //Prefix for system + + //OS-specific application shortcuts (*.desktop files) + QString LOS::ControlPanelShortcut(){ return ""; } //system control panel +-QString LOS::AppStoreShortcut(){ return LOS::AppPrefix() + "/share/applications/porthole.desktop"; } //graphical app/pkg manager ++QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager + //OS-specific RSS feeds (Format: QStringList[ :::: ]; ) + QStringList LOS::RSSFeeds(){ return QStringList(); } + diff --git a/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch b/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch new file mode 100644 index 00000000000..f5ef6cba41f --- /dev/null +++ b/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch @@ -0,0 +1,11 @@ +diff -Naur lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri +--- lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri 2016-08-09 12:04:30.000000000 -0300 ++++ lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri 2016-08-13 17:32:18.272137900 -0300 +@@ -55,7 +55,6 @@ + #Use the defaults for everything else + + }else : linux-*{ +- L_SESSDIR=/usr/share/xsessions + OS=Linux + LIBS += -L/usr/local/lib -L/usr/lib -L/lib + diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix new file mode 100644 index 00000000000..66229420cf6 --- /dev/null +++ b/pkgs/desktops/lumina/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, + numlockx, xorg, qt5, kde5 +}: + +stdenv.mkDerivation rec { + name = "lumina-${version}"; + version = "1.1.0-p1"; + + src = fetchFromGitHub { + owner = "trueos"; + repo = "lumina"; + rev = "v${version}"; + sha256 = "1kkb6v6p6w5mx1qdmcrq3r674k9ahpc6wlsb9pi2lq8qk9yaid0m"; + }; + + nativeBuildInputs = [ + qt5.qmakeHook + qt5.qttools + ]; + + buildInputs = [ + xorg.libxcb + xorg.xcbutilwm + xorg.xcbutilimage + qt5.qtbase + qt5.qtsvg + qt5.qtmultimedia + qt5.qtx11extras + kde5.oxygen-icons5 + fluxbox + xscreensaver + desktop_file_utils + numlockx + ]; + + patches = [ + ./avoid-absolute-path-on-sessdir.patch + ./LuminaOS-NixOS.cpp.patch + ]; + + prePatch = '' + # Copy Gentoo setup as NixOS setup and then patch it + # TODO: write a complete NixOS setup? + cp -a src-qt5/core/libLumina/LuminaOS-Gentoo.cpp src-qt5/core/libLumina/LuminaOS-NixOS.cpp + ''; + + postPatch = '' + # Fix location of fluxbox styles + substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ + --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" + ''; + + qmakeFlags = [ "LINUX_DISTRO=NixOS" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A lightweight, portable desktop environment"; + longDescription = '' + The Lumina Desktop Environment is a lightweight system interface + that is designed for use on any Unix-like operating system. It + is based on QT5. + ''; + homepage = https://lumina-desktop.org; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd483d4777..616ca20fe77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16206,6 +16206,8 @@ in in makeOverridable makePackages extra; + lumina = callPackage ../desktops/lumina { }; + lxqt = recurseIntoAttrs (callPackage ../desktops/lxqt { }); mate = recurseIntoAttrs (callPackage ../desktops/mate { From f00e28164b343606e514fd43cd5b225dd30cd6dd Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Wed, 2 Nov 2016 10:30:34 +0100 Subject: [PATCH 007/295] pdfjam: remove obsolete version pdfjam is included in texlive fixes #19826 --- pkgs/tools/typesetting/pdfjam/builder.sh | 9 --------- pkgs/tools/typesetting/pdfjam/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 30 deletions(-) delete mode 100644 pkgs/tools/typesetting/pdfjam/builder.sh delete mode 100644 pkgs/tools/typesetting/pdfjam/default.nix diff --git a/pkgs/tools/typesetting/pdfjam/builder.sh b/pkgs/tools/typesetting/pdfjam/builder.sh deleted file mode 100644 index 720ddeae78d..00000000000 --- a/pkgs/tools/typesetting/pdfjam/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -tar zxvf $src - -mkdir -p $out/bin -cp pdfjam/bin/* $out/bin - -mkdir -p $out/man/man1 -cp pdfjam/man1/* $out/man/man1 diff --git a/pkgs/tools/typesetting/pdfjam/default.nix b/pkgs/tools/typesetting/pdfjam/default.nix deleted file mode 100644 index f8eafb221a3..00000000000 --- a/pkgs/tools/typesetting/pdfjam/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "pdfjam-${version}"; - version = "2.08"; - url-version = stdenv.lib.replaceChars ["."] [""] version; - - builder = ./builder.sh; - - src = fetchurl { - url = "http://go.warwick.ac.uk/pdfjam/pdfjam_${url-version}.tgz"; - sha256 = "1wy0xhcy27d7agby598s20ba48s4yg5qkzr6anc6q1xdryccacf7"; - }; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.mornfall ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f72a57f9bb1..3b241dc2376 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3142,8 +3142,6 @@ in pdf2svg = callPackage ../tools/graphics/pdf2svg { }; - pdfjam = callPackage ../tools/typesetting/pdfjam { }; - pdfmod = callPackage ../applications/misc/pdfmod { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; From 05977b236b2a925983224c24d6e14aed796e7a14 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 27 Oct 2016 21:01:50 -0700 Subject: [PATCH 008/295] top-level: Remove redundant parentheses --- pkgs/top-level/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 7d370bec6b5..012db1e393b 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -77,9 +77,9 @@ let }; trivialBuilders = self: super: - (import ../build-support/trivial-builders.nix { + import ../build-support/trivial-builders.nix { inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; - }); + }; stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) pkgs; From 68a04c1195ba8087f0f57c5b9017b38a02a8c6c1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 2 Nov 2016 18:35:03 -0400 Subject: [PATCH 009/295] top-level: Inline topLevelArugments, and make pkg named arg for stdenv [Trying my best to indent properly while avoiding excessive drift] --- pkgs/top-level/default.nix | 13 +++++++------ pkgs/top-level/stdenv.nix | 3 +-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 012db1e393b..67577aabaa4 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -56,10 +56,6 @@ let platform = if platform_ != null then platform_ else config.platform or platformAuto; - topLevelArguments = { - inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun; - }; - # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than # give `all-packages.nix` all the arguments to this function, even ones that @@ -81,10 +77,15 @@ let inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; }; - stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) pkgs; + stdenvDefault = self: super: + import ./stdenv.nix { + inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun pkgs; + }; allPackages = self: super: - let res = import ./all-packages.nix topLevelArguments res self; + let res = import ./all-packages.nix + { inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun; } + res self; in res; aliases = self: super: import ./aliases.nix super; diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index c36b0fed091..7efbfc36b1f 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -1,5 +1,4 @@ -{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, ... }: -pkgs: +{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, pkgs, ... }: rec { allStdenvs = import ../stdenv { From eed34bd214d6f513a859f3cfc52b266a9d19898b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 2 Nov 2016 17:08:39 -0400 Subject: [PATCH 010/295] top-level: Remove redundant arguments from top-level/{all-package,stdenv}.nix --- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/default.nix | 4 ++-- pkgs/top-level/stdenv.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc4660108d0..8d7a5d204ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5,9 +5,9 @@ * to merges. Please use the full-text search of your editor. ;) * Hint: ### starts category names. */ -{ system, bootStdenv, noSysDirs, config, crossSystem, platform, lib +{ system, noSysDirs, config, crossSystem, platform, lib , nixpkgsFun -, ... }: +}: self: pkgs: with pkgs; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 67577aabaa4..baf314edece 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -79,12 +79,12 @@ let stdenvDefault = self: super: import ./stdenv.nix { - inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun pkgs; + inherit system bootStdenv crossSystem config platform lib nixpkgsFun pkgs; }; allPackages = self: super: let res = import ./all-packages.nix - { inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun; } + { inherit system noSysDirs config crossSystem platform lib nixpkgsFun; } res self; in res; diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index 7efbfc36b1f..f9ba5e7516e 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -1,4 +1,4 @@ -{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, pkgs, ... }: +{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, pkgs }: rec { allStdenvs = import ../stdenv { From 7b84331f22ab11d71f238882c0daf7b26fa43eee Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 2 Nov 2016 19:35:33 -0400 Subject: [PATCH 011/295] bullet: darwin compatibility --- pkgs/development/libraries/bullet/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 37b403548c9..a8d350d9e37 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, mesa, freeglut }: +{ stdenv, fetchFromGitHub, cmake, mesa, freeglut, darwin }: stdenv.mkDerivation rec { name = "bullet-${version}"; @@ -11,9 +11,24 @@ stdenv.mkDerivation rec { sha256 = "1zz3vs6i5975y9mgb1k1vxrjbf1028v0nc11p646dsvv2vplxx5r"; }; - buildInputs = [ cmake mesa freeglut ]; + buildInputs = [ cmake ] ++ + (if stdenv.isDarwin + then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] + else [mesa freeglut]); - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt + sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt + ''; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ] ++ + stdenv.lib.optionals stdenv.isDarwin [ + "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\"" + "-DOPENGL_FOUND=true" + "-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" + "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"]; enableParallelBuilding = true; @@ -21,11 +36,11 @@ stdenv.mkDerivation rec { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision - detection, soft body and rigid body dynamics. + detection, soft body and rigid body dynamics. ''; homepage = http://code.google.com/p/bullet/; license = stdenv.lib.licenses.zlib; maintainers = with stdenv.lib.maintainers; [ aforemny ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } From 1e2f37e9f43794b161e5a16dd16460a324158215 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 3 Nov 2016 08:30:49 +0100 Subject: [PATCH 012/295] godef: init at 20160620-ee532b9 Signed-off-by: Vincent Demeester --- lib/maintainers.nix | 1 + pkgs/development/tools/godef/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/godef/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6ff64599540..752d9d6a8f9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -455,6 +455,7 @@ vbgl = "Vincent Laporte "; vbmithr = "Vincent Bernardoff "; vcunat = "Vladimír Čunát "; + vdemeester = "Vincent Demeester "; veprbl = "Dmitry Kalinkin "; viric = "Lluís Batlle i Rossell "; vizanto = "Danny Wilson "; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix new file mode 100644 index 00000000000..ddb136ed86e --- /dev/null +++ b/pkgs/development/tools/godef/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "godef-${version}"; + version = "20160620-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "ee532b944160bb27b6f23e4f5ef38b8fdaa2a6bd"; + + goPackagePath = "github.com/rogpeppe/godef"; + excludedPackages = "go/printer/testdata"; + + src = fetchgit { + inherit rev; + url = "https://github.com/rogpeppe/godef"; + sha256 = "1r8c4ijjnwvb9pci4wasmq88yj0ginwly2542kw4hyg2c87j613l"; + }; + + meta = { + description = "Print where symbols are defined in Go source code"; + homepage = "https://github.com/rogpeppe/godef/"; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + licence = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f72a57f9bb1..ad1a5a6547d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7077,7 +7077,7 @@ in #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr/default.nix { }; - + mpfi = callPackage ../development/libraries/mpfi { }; # A GMP fork @@ -11228,6 +11228,8 @@ in godep = callPackage ../development/tools/godep { }; + godef = callPackage ../development/tools/godef { }; + goimports = callPackage ../development/tools/goimports { }; govers = callPackage ../development/tools/govers { }; From 7850a6b0ecc62470a0bc911d27928607604a5c6e Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 2 Nov 2016 21:16:12 -0400 Subject: [PATCH 013/295] freeimage: darwin compatibility --- .../libraries/freeimage/default.nix | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 2a75f7693e1..42105c7022c 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,31 +1,48 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, darwin}: stdenv.mkDerivation { name = "freeimage-3.17.0"; src = fetchurl { url = mirror://sourceforge/freeimage/FreeImage3170.zip; sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; - buildInputs = [ unzip ]; - prePatch = '' - sed -e s@/usr/@$out/@ \ + buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + prePatch = if stdenv.isDarwin + then '' + sed -e 's/gcc-4.0/clang/g' \ + -e 's/g++-4.0/clang++/g' \ + -e 's/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__/' \ + -e "s|PREFIX = /usr/local|PREFIX = $out|" \ + -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk||g' \ + -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.6.sdk||g' \ + -e 's|-isysroot /Developer/SDKs/MacOSX10.6.sdk||g' \ + -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||g' \ + -e 's| $(STATICLIB)-ppc $(STATICLIB)-i386||g' \ + -e 's| $(SHAREDLIB)-ppc $(SHAREDLIB)-i386||g' \ + -e 's| install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)||' \ + -e 's| -m 644 -o root -g wheel||g' \ + -i ./Makefile.osx + # Fix LibJXR performance timers + sed 's|^SRCS = \(.*\)$|SRCS = \1 Source/LibJXR/image/sys/perfTimerANSI.c|' -i ./Makefile.srcs + '' + else '' + sed -e s@/usr/@$out/@ \ -e 's@-o root -g root@@' \ -e 's@ldconfig@echo not running ldconfig@' \ -i Makefile.gnu Makefile.fip - - # Fix gcc 5.1 macro problems - # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/ - sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/* + # Fix gcc 5.1 macro problems + # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/ + sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/* ''; - postBuild = "make -f Makefile.fip"; + postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip"; preInstall = "mkdir -p $out/include $out/lib"; - postInstall = "make -f Makefile.fip install"; + postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install"; meta = { description = "Open Source library for accessing popular graphics image file formats"; homepage = http://freeimage.sourceforge.net/; license = "GPL"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } From 936db422f9de4170458bc53b1796c6797e5bfebb Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 3 Nov 2016 17:19:25 -0700 Subject: [PATCH 014/295] add defaultConfig for mysql ruby gem The mysql gem needs the same libraries as the mysql2 gem. --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 742c9e49757..21cc80ea6ba 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -89,6 +89,10 @@ in msgpack = attrs: { buildInputs = [ libmsgpack ]; }; + + mysql = attrs: { + buildInputs = [ mysql.lib zlib openssl ]; + }; mysql2 = attrs: { buildInputs = [ mysql.lib zlib openssl ]; From d89c3acced7c5ccad00bd1940813cfba95f41adb Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 4 Nov 2016 06:02:11 +0200 Subject: [PATCH 015/295] wineUnstable: 1.9.20 -> 1.9.22 Also update staging as well --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 40845a0988c..f3b12dc48f8 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.20"; + version = "1.9.22"; url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; - sha256 = "1pvrlawp079qg74q348v9p2qzlj4aqibxxwn4vqid69j883g6s97"; + sha256 = "0hgc85d695mi1z4hyk561q2s9pblhdy6h5a23rh459y7qwd8xgx3"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.47"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1hk20axv0hppi5rqgslibwfjmcpjks3xa2dxi5v1y27qqhphvxpl"; + sha256 = "1yqrxx4zaxc8khnnqfgz53apfa9mc315114psq3kvai01lz4a7p8"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From 30c1ad5ca378ff46bc90f37bf04e14f9765d6f23 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Fri, 4 Nov 2016 14:18:50 +0100 Subject: [PATCH 016/295] opencv3: added in extra flag for enabling cuda with dependencies opencv3: added in optional buildFlag for enabling cuda opencv3: added CUDA enabling flags to cmakeFlags opencv3: added CUDA-speicifc FAST_MATH flag for enabling CUDA-accelerated math functions opencv3: change enableCUDA default to false opencv:added in cuda-enabling functionality. --- pkgs/development/libraries/opencv/3.x.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 0167011ed49..701aa8e26b4 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -14,6 +14,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? false, eigen +, enableCuda ? false, cudatoolkit, gcc49 }: let @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen + ++ lib.optional enableCuda [ cudatoolkit gcc49 ] ; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -90,7 +92,10 @@ stdenv.mkDerivation rec { (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) - ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ]; + (opencvFlag "CUDA" enableCuda) + (opencvFlag "CUBLAS" enableCuda) + ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ] + ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]; enableParallelBuilding = true; From 0033f6076ee5c462722bf6077c40ff7949ae6020 Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sat, 5 Nov 2016 08:51:49 +0000 Subject: [PATCH 017/295] agrep: init at 3.41.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In category `tools`, subcategory `text`, add a package definition for the program [`agrep`] [1] — "Approximate `grep` for fast fuzzy string searching". I have tested this patch per nixpkgs manual section 11.1 ("Making patches"). [1]: --- pkgs/tools/text/agrep/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/text/agrep/default.nix diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix new file mode 100644 index 00000000000..81c09840848 --- /dev/null +++ b/pkgs/tools/text/agrep/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "agrep-${version}"; + version = "3.41.5"; + + src = fetchFromGitHub { + owner = "Wikinaut"; + repo = "agrep"; + # This repository has numbered versions, but not Git tags. + rev = "eef20411d605d9d17ead07a0ade75046f2728e21"; + sha256 = "14addnwspdf2mxpqyrw8b84bb2257y43g5ccy4ipgrr91fmxq2sk"; + }; + + installPhase = '' + install -Dm 555 agrep -t "$out/bin" + install -Dm 444 docs/* -t "$out/doc" + ''; + + meta = { + description = "Approximate grep for fast fuzzy string searching"; + homepage = "https://www.tgries.de/agrep/"; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b9977b4cff..f50f1991036 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -367,6 +367,8 @@ in afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { }; + agrep = callPackage ../tools/text/agrep { }; + aha = callPackage ../tools/text/aha { }; ahcpd = callPackage ../tools/networking/ahcpd { }; From 22732fc656909e589001f171bb1cbb3edd2c6937 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 1 Nov 2016 10:10:58 +0100 Subject: [PATCH 018/295] opam: remove 1.0.0 --- pkgs/development/tools/ocaml/opam/1.0.0.nix | 62 --------------------- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/ocaml-packages.nix | 1 - 3 files changed, 64 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/opam/1.0.0.nix diff --git a/pkgs/development/tools/ocaml/opam/1.0.0.nix b/pkgs/development/tools/ocaml/opam/1.0.0.nix deleted file mode 100644 index d66b3880de2..00000000000 --- a/pkgs/development/tools/ocaml/opam/1.0.0.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, lib, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: - -assert lib.versionAtLeast ocaml.version "3.12.1"; - -let - srcs = { - cudf = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz"; - sha256 = "6e9f1bafe859df85c854679e2904a8172945d2bf2d676c8ae3ecb72fe6de0665"; - }; - extlib = fetchurl { - url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; - sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; - }; - ocaml_re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; - sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; - }; - ocamlgraph = fetchurl { - url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz"; - sha256 = "ba6388ffc2c15139b0f26330ef6dd922f0ff0f364eee99a3202bf1cd93512b43"; - }; - dose3 = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz"; - sha256 = "3a07a08345be157c98cb26021d7329c72c2b95c99cfdff79887690656ec9f1a3"; - }; - cmdliner = fetchurl { - url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz"; - sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81"; - }; - opam = fetchurl { - url = "https://github.com/OCamlPro/opam/archive/1.0.0.zip"; - sha256 = "f8d94a91c2b8d110fa5e3b0a87c512a860acbae110654498a164c5c888c40bda"; - }; - }; -in -stdenv.mkDerivation rec { - name = "opam-1.0.0"; - - buildInputs = [unzip curl ncurses ocaml]; - - src = srcs.opam; - - postUnpack = '' - ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} - ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} - ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} - ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} - ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} - ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} - ''; - - makeFlags = ["HOME=$(TMPDIR)"]; - - doCheck = false; - - meta = { - maintainers = [ stdenv.lib.maintainers.orbitz ]; - description = "A package manager for OCaml"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 159c90c0273..d5f694d759f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5111,7 +5111,6 @@ in nodejs = nodejs-4_x; }; - inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_0_0; inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_1; inherit (ocamlPackages) opam; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c8f36e14dfb..a63d8856299 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -625,7 +625,6 @@ let ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; - opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; opam = callPackage ../development/tools/ocaml/opam { }; From 01597adf07afed6e48bc32e394546cfffd9e2cb4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 1 Nov 2016 10:11:31 +0100 Subject: [PATCH 019/295] opam: remove 1.1 --- pkgs/development/tools/ocaml/opam/1.1.nix | 64 ----------------------- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/ocaml-packages.nix | 1 - 3 files changed, 66 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/opam/1.1.nix diff --git a/pkgs/development/tools/ocaml/opam/1.1.nix b/pkgs/development/tools/ocaml/opam/1.1.nix deleted file mode 100644 index a8a9463bb3d..00000000000 --- a/pkgs/development/tools/ocaml/opam/1.1.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, lib, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: - -# Opam 1.1 only works with ocaml >= 3.12.1 according to ./configure -assert lib.versionAtLeast ocaml.version "3.12.1"; - -let - srcs = { - cudf = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz"; - sha256 = "6e9f1bafe859df85c854679e2904a8172945d2bf2d676c8ae3ecb72fe6de0665"; - }; - extlib = fetchurl { - url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; - sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; - }; - ocaml_re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; - sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; - }; - ocamlgraph = fetchurl { - url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz"; - sha256 = "ba6388ffc2c15139b0f26330ef6dd922f0ff0f364eee99a3202bf1cd93512b43"; - }; - dose3 = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz"; - sha256 = "3a07a08345be157c98cb26021d7329c72c2b95c99cfdff79887690656ec9f1a3"; - }; - cmdliner = fetchurl { - url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz"; - sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81"; - }; - opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.1.1.zip"; - sha256 = "9c69eeb448af5a38950b2664446401ce240b9f028e0b4d26b6ac1a96938a5f03"; - }; - }; -in -stdenv.mkDerivation rec { - name = "opam-1.1.1"; - - buildInputs = [unzip curl ncurses ocaml]; - - src = srcs.opam; - - postUnpack = '' - ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} - ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} - ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} - ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} - ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} - ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} - ''; - - # Dirty, but apparently ocp-build requires a TERM - makeFlags = ["TERM=screen"]; - - doCheck = false; - - meta = { - maintainers = [stdenv.lib.maintainers.orbitz]; - description = "A package manager for OCaml"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5f694d759f..dc3552787c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5111,7 +5111,6 @@ in nodejs = nodejs-4_x; }; - inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_1; inherit (ocamlPackages) opam; picat = callPackage ../development/compilers/picat { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a63d8856299..c88b2135525 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -625,7 +625,6 @@ let ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; - opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; opam = callPackage ../development/tools/ocaml/opam { }; ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; From f9b4c1c04ae88a3508301790987d6348a006d50a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 1 Nov 2016 10:16:45 +0100 Subject: [PATCH 020/295] opam: move out of ocamlPackages --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc3552787c7..d5e13f3789b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5111,7 +5111,7 @@ in nodejs = nodejs-4_x; }; - inherit (ocamlPackages) opam; + opam = callPackage ../development/tools/ocaml/opam { }; picat = callPackage ../development/compilers/picat { stdenv = overrideCC stdenv gcc49; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c88b2135525..a2a1add4f6d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -625,8 +625,6 @@ let ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; - opam = callPackage ../development/tools/ocaml/opam { }; - ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; trv = callPackage ../development/tools/misc/trv { }; From 1ae2f86a328479c591519c935325b7b43c396e34 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 5 Nov 2016 22:27:42 -0400 Subject: [PATCH 021/295] rkt: 1.17.0 -> 1.18.0 --- pkgs/applications/virtualization/rkt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 7c5cc8de7ab..e22e8468e9f 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -4,7 +4,7 @@ let # Always get the information from # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1151.0.0"; + coreosImageRelease = "1192.0.0"; coreosImageSystemdVersion = "231"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.17.0"; + version = "1.18.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "1jbdnbd2h58zd5irllim6cfa9bf0fdk5nr8qxpjnsgd1fsyhkpld"; + sha256 = "0vvkwdpl9y0g5m00m1h7q8f95hj5qxigpxrb5zwfqrcv3clzn5a6"; }; stage1BaseImage = fetchurl { From 4e59b1a23c75af602f13455d8ffb6456a40e08b4 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 6 Nov 2016 11:01:39 +0800 Subject: [PATCH 022/295] k3d: 0.8.0.5 -> 0.8.0.6 --- pkgs/applications/graphics/k3d/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index a446ab5dd18..ba43a2e7f2a 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc +{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: stdenv.mkDerivation rec { - version = "0.8.0.5"; + version = "0.8.0.6"; name = "k3d-${version}"; src = fetchFromGitHub { owner = "K-3D"; repo = "k3d"; rev = name; - sha256 = "0q05d51vhnmrq887n15frpwkhx8w7n20h2sc1lpr338jzpryihb3"; + sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa"; }; - + + patches = [ + (fetchpatch { /* glibmm 2.50 fix */ + url = https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch; + sha256 = "162icv1hicr2dirkb9ijacvg9bhz5j30yfwg7b45ijavk8rns62j"; + }) + ]; + cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; preConfigure = '' From 20fe51661dcea78682420767fb8afd1170b06781 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 6 Nov 2016 11:42:13 +0100 Subject: [PATCH 023/295] xlaunch: remove; it was fine-tuned to an old NixOS state and such functionality is forbidden by systemd --- pkgs/tools/X11/xlaunch/default.nix | 64 ------------------------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 66 deletions(-) delete mode 100644 pkgs/tools/X11/xlaunch/default.nix diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix deleted file mode 100644 index b7927ca8cb8..00000000000 --- a/pkgs/tools/X11/xlaunch/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, xorgserver }: - -# !!! What does this package do, and does it belong in Nixpkgs? - -stdenv.mkDerivation { - name = "xlaunch"; - inherit xorgserver; - buildCommand = " - cat << EOF > realizeuid.c - #include - #include - #include - int main(int argc, char ** argv, char ** envp) - { - uid_t a,b,c; - int i; - char *nargv[10000]; - char arg1 [10]; - nargv[0]=argv[0]; - for (i=1; i<=argc; i++){ - nargv[i+1]=argv[i]; - } - nargv[1]=arg1; - getresuid (&a,&b,&c); - snprintf(arg1,8,\"%d\",a); - setresuid(c,c,c); - execve(\"\$out/libexec/xlaunch\", nargv, envp); - } -EOF - mkdir -p \$out/bin - mkdir -p \$out/libexec - gcc realizeuid.c -o \$out/bin/xlaunch - echo '#! ${stdenv.shell} - USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' ) - shift - case \"\$1\" in - :*) export _display=\"\$1\"; - shift - esac - _display=\${_display:-:0} - _display=\${_display#:} - echo Using :\$_display - if [ -n \"\$DO_X_RESET\" ]; then - RESET_OPTION=\"-once\" - else - RESET_OPTION=\"-noreset\" - fi; - XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver.out}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" - PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" - echo \"\$PRE_XCMD\" - echo \"\$PRE_XCMD\" | bash - echo \"\$XCMD\" - echo \"\$XCMD\" | bash & - while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done - su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\"; - ' >\$out/libexec/xlaunch - chmod a+x \$out/libexec/xlaunch - "; - meta = { - description = ''Wrapper to parse NixOS-specific X environment and launch a custom X session''; - 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 c20868a5503..20846fb951b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15296,8 +15296,6 @@ in xtrace = callPackage ../tools/X11/xtrace { }; - xlaunch = callPackage ../tools/X11/xlaunch { }; - xmacro = callPackage ../tools/X11/xmacro { }; xmove = callPackage ../applications/misc/xmove { }; From 80c6f9cb7812e87afda4ac70bc350c5a19fd469f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 6 Nov 2016 11:58:05 +0100 Subject: [PATCH 024/295] pythonPackages: fix indentation, remove tabs --- pkgs/top-level/python-packages.nix | 116 ++++++++++++++--------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d21281c598..b44676c72e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2550,7 +2550,7 @@ in { sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; }; - disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 + disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 }; iowait = buildPythonPackage rec { @@ -11164,15 +11164,16 @@ in { doCheck = false; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ paver feedparser sqlalchemy pyyaml rpyc - beautifulsoup_4_1_3 html5lib pyrss2gen pynzb progressbar jinja2 flask - cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 + propagatedBuildInputs = with self; [ + paver feedparser sqlalchemy pyyaml rpyc + beautifulsoup_4_1_3 html5lib pyrss2gen pynzb progressbar jinja2 flask + cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 guessit pathpy apscheduler ] - # enable deluge and transmission plugin support, if they're installed - ++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false) - pythonpackages.deluge - ++ stdenv.lib.optional (pkgs.transmission != null) - self.transmissionrpc; + # enable deluge and transmission plugin support, if they're installed + ++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false) + pythonpackages.deluge + ++ stdenv.lib.optional (pkgs.transmission != null) + self.transmissionrpc; meta = { homepage = http://flexget.com/; @@ -23141,7 +23142,7 @@ in { homepage = "http://sqlmap.org"; license = licenses.gpl2; description = "Automatic SQL injection and database takeover tool"; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; }; }; @@ -25846,10 +25847,10 @@ in { mv "$wrapper" "$wrapped" cat > "$wrapper" <<- EOF - export PATH="$PATH:\$PATH" - export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" - source "$wrapped" - EOF + export PATH="$PATH:\$PATH" + export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" + source "$wrapped" + EOF chmod -x "$wrapped" chmod +x "$wrapper" @@ -28834,28 +28835,28 @@ in { ofxclient = buildPythonPackage rec { name = "ofxclient-1.3.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxclient/${name}.tar.gz"; - sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; - }; + src = pkgs.fetchurl { + url = "mirror://pypi/o/ofxclient/${name}.tar.gz"; + sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; + }; - # ImportError: No module named tests - doCheck = false; + # ImportError: No module named tests + doCheck = false; - propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring argparse ]; + propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring argparse ]; }; ofxhome = buildPythonPackage rec { - name = "ofxhome-0.3.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxhome/${name}.tar.gz"; - sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d"; - }; + name = "ofxhome-0.3.1"; + src = pkgs.fetchurl { + url = "mirror://pypi/o/ofxhome/${name}.tar.gz"; + sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d"; + }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose ]; - # ImportError: No module named tests - doCheck = false; + # ImportError: No module named tests + doCheck = false; meta = { homepage = "https://github.com/captin411/ofxhome"; @@ -28865,13 +28866,13 @@ in { }; ofxparse = buildPythonPackage rec { - name = "ofxparse-0.14"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxparse/${name}.tar.gz"; - sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a"; - }; + name = "ofxparse-0.14"; + src = pkgs.fetchurl { + url = "mirror://pypi/o/ofxparse/${name}.tar.gz"; + sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a"; + }; - propagatedBuildInputs = with self; [ six beautifulsoup4 ]; + propagatedBuildInputs = with self; [ six beautifulsoup4 ]; meta = { homepage = "http://sites.google.com/site/ofxparse"; @@ -30102,34 +30103,33 @@ in { }; }; - Quandl = buildPythonPackage rec { - version = "3.0.0"; - name = "Quandl-${version}"; + version = "3.0.0"; + name = "Quandl-${version}"; - src = pkgs.fetchurl { - url= "mirror://pypi/q/quandl/${name}.tar.gz"; - sha256 = "d4e698eb39291e0b281975813054101f3dfb379dead10d34d7b536e1aad60584"; - }; + src = pkgs.fetchurl { + url= "mirror://pypi/q/quandl/${name}.tar.gz"; + sha256 = "d4e698eb39291e0b281975813054101f3dfb379dead10d34d7b536e1aad60584"; + }; - propagatedBuildInputs = with self; [ - numpy - ndg-httpsclient - dateutil - inflection - more-itertools - requests2 - pandas - ]; + propagatedBuildInputs = with self; [ + numpy + ndg-httpsclient + dateutil + inflection + more-itertools + requests2 + pandas + ]; - #No tests in archive - doCheck = false; + # No tests in archive + doCheck = false; - meta = { - homepage = https://github.com/quandl/quandl-python; - description = "A Python library for Quandl’s RESTful API"; - maintainers = with maintainers; [ NikolaMandic ]; - }; + meta = { + homepage = https://github.com/quandl/quandl-python; + description = "A Python library for Quandl’s RESTful API"; + maintainers = with maintainers; [ NikolaMandic ]; + }; }; queuelib = buildPythonPackage rec { From a97db109a20697a14d3ca72a112d05cc0411ae8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 6 Nov 2016 12:20:43 +0100 Subject: [PATCH 025/295] Disabling OABI_COMPAT on ARM platforms. Otherwise, systemd-logind fails to work because SECCOMP_FILTER cannot be enabled with OABI_COMPAT set. We don't need OABI_COMPAT at all on ARM, I guess. With this change, the rpi kernel boots fine for raspberrypi2. We discussed this change with Dezgeg. --- pkgs/top-level/platforms.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 3c94501b1a5..efeae9a9d20 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -86,6 +86,10 @@ rec { ZRAM m NETCONSOLE m + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + # Fail to build DRM n SCSI_ADVANSYS n @@ -187,6 +191,10 @@ rec { ZRAM m + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + # Fail to build DRM n SCSI_ADVANSYS n @@ -268,6 +276,10 @@ rec { ZRAM m + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + # Fail to build DRM n SCSI_ADVANSYS n From 492b2ee1d43465ceac195ae9d9d4c1b9892d789e Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 6 Nov 2016 13:09:22 +0100 Subject: [PATCH 026/295] wallabag: 2.1.2 -> 2.1.3 --- pkgs/servers/web-apps/wallabag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 68732b2e169..9db45d6a8e1 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.1.2"; + version = "2.1.3"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://framabag.org/wallabag-release-${version}.tar.gz"; - sha256 = "01i4xdzw126wwwkxy0d97dizrikvawpzqj95bykd1g25m7jzvb7k"; + sha256 = "0pl1sqigrp08r657jmfpf8m3wnw65g2k3mg50zsc8xbrzn6nwbgp"; }; outputs = [ "out" "doc" ]; From f49f90bfdd58e0f02d709c028a6e33a588dd56f4 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Fri, 4 Nov 2016 15:51:05 +0100 Subject: [PATCH 027/295] volnoti: init at 2013-09-23 --- pkgs/applications/misc/volnoti/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/volnoti/default.nix diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix new file mode 100644 index 00000000000..836deb656a2 --- /dev/null +++ b/pkgs/applications/misc/volnoti/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg +, dbus_glib, autoreconfHook, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "volnoti-unstable-${version}"; + version = "2013-09-23"; + + src = fetchFromGitHub { + owner = "davidbrazdil"; + repo = "volnoti"; + rev = "4af7c8e54ecc499097121909f02ecb42a8a60d24"; + sha256 = "155lb7w563dkdkdn4752hl0zjhgnq3j4cvs9z98nb25k1xpmpki7"; + }; + + patches = [ + # Fix dbus interface headers. See + # https://github.com/davidbrazdil/volnoti/pull/10 + (fetchpatch { + url = "https://github.com/davidbrazdil/volnoti/pull/10.patch"; + sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam"; + }) + ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; + + buildInputs = [ + dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg + ]; + + meta = with stdenv.lib; { + description = "Lightweight volume notification for Linux"; + homepage = "https://github.com/davidbrazdil/volnoti"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.gilligan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20846fb951b..082b2f5e89d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14964,6 +14964,8 @@ in VoiceOfFaust = callPackage ../applications/audio/VoiceOfFaust { }; + volnoti = callPackage ../applications/misc/volnoti { }; + vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; vscode = callPackage ../applications/editors/vscode { }; From ae5d404509ad57b4a739b02eb7fdd0c7eb288b88 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 6 Nov 2016 13:46:40 +0100 Subject: [PATCH 028/295] lttng-modules: 2.8.0 -> 2.8.3 Fixes build against linux >=4.8 Full changelog at https://git.lttng.org/?p=lttng-tools.git;a=blob_plain;f=ChangeLog;hb=13dc409a5ea439b96b805c3c71886a3fcfad18e8 Tested with nix-build -A linuxPackages.lttng-modules -A linuxPackages_latest.lttng-modules --- pkgs/os-specific/linux/lttng-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 083362489ad..7e29aa0f67d 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.8.0"; + version = "2.8.3"; src = fetchurl { url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "0a9xwq0kgpx1y800l232h524f19g3py6cnxff10j9p01q6lzhrxh"; + sha256 = "018lqxbksj9hpjfp2a3yc6lkjkj4rgf2x147l1jjh7mfgqvcb53b"; }; hardeningDisable = [ "pic" ]; From 9972b64a8242b799342e2d32bee199372e33989d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 6 Nov 2016 09:04:13 -0500 Subject: [PATCH 029/295] darktable: 2.0.6 -> 2.0.7 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index e75d5193fd3..a9ad0210baa 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.0.6"; + version = "2.0.7"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1h9qwxyvcv0fc6y5b6l2x4jd5mmw026blhjkcihj00r1aa3c2s13"; + sha256 = "1aqxiaw89xdx0s0h3gb9nvdzw4690y3kp7h794sihf2581bn28m9"; }; buildInputs = From 6779f68a411fe21b1688f7902c4079240b6fbdda Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 6 Nov 2016 09:04:49 -0500 Subject: [PATCH 030/295] lensfun: 0.2.8 -> 0.3.2 --- pkgs/development/libraries/lensfun/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index b3deabbde2d..776a7646bd7 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3 }: +{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3, cmake }: stdenv.mkDerivation rec { - name = "lensfun-0.2.8"; + version = "0.3.2"; + name = "lensfun-${version}"; src = fetchurl { - url = "mirror://sourceforge/lensfun/${name}.tar.bz2"; - sha256 = "0j0smagnksdm9gjnk13w200hjxshmxf2kvyxxnra4nc2qzxrg3zq"; + url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz"; + sha256 = "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf"; }; - patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure"; - - buildInputs = [ pkgconfig glib zlib libpng gnumake3 ]; + buildInputs = [ pkgconfig glib zlib libpng cmake gnumake3 ]; configureFlags = "-v"; From 2fcbe451f248ade39084c831c6b5bb6498bffce0 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sun, 6 Nov 2016 17:29:15 +0100 Subject: [PATCH 031/295] youtube-dl: add optional support for RTMP --- pkgs/tools/misc/youtube-dl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 21828f2c278..d1ba3ced99b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, pandoc +{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, rtmpdump, pandoc , atomicparsley # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the @@ -7,6 +7,7 @@ # included. , generateManPage ? false , ffmpegSupport ? true +, rtmpSupport ? true }: with stdenv.lib; @@ -24,9 +25,10 @@ buildPythonApplication rec { buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. + # rtmpdump is required to download files over RTMP # atomicparsley for embedding thumbnails postInstall = let - packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg; + packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg ++ optional rtmpSupport rtmpdump; in '' wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesthatwillbeusedbelow}" ''; From 184aefa3c48826038c9c618487f62ccf127b54c9 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sat, 5 Nov 2016 17:14:41 +0100 Subject: [PATCH 032/295] rtags: fix darwin build Adds dependency to MacOS_SDK 10.9 and accordingly to the macosx deployment target to configure SDK-based deployment in rtags. In detail, rtags makes use of launch_activate_socket() which is available in launchd.h >10.9. Latter is still not available through apple-opensource-releases, if ever. Thus, the deployment target and build input have to be added to let rtags build scripts make use of MAC_OS_X_VERSION_MAX_ALLOWED correctly. --- pkgs/development/tools/rtags/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 959681c7e1a..e0475bdad76 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchgit, cmake, llvmPackages, openssl, writeScript, bash, emacs }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs }: stdenv.mkDerivation rec { name = "rtags-${version}"; version = "2.3"; - buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]; + buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] + ++ lib.optional stdenv.isDarwin apple_sdk.sdk; preConfigure = '' - export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags)" \ - LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" + export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) " \ + + LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \ + + '' + lib.optionalString stdenv.isDarwin '' + export CXXFLAGS="-isysroot ${apple_sdk.sdk}/" \ + MACOSX_DEPLOYMENT_TARGET="10.9" ''; src = fetchgit { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38f1c00ffb..db1ef6faca0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5130,7 +5130,9 @@ in rgbds = callPackage ../development/compilers/rgbds { }; - rtags = callPackage ../development/tools/rtags/default.nix {}; + rtags = callPackage ../development/tools/rtags/default.nix { + inherit (darwin) apple_sdk; + }; rust = rustStable; rustStable = callPackage ../development/compilers/rust {}; From a9428f0c42dafeff0d669055c67e6ca1d528e9ee Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sun, 6 Nov 2016 18:55:43 +0100 Subject: [PATCH 033/295] Fix breaking empty line --- pkgs/development/tools/rtags/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index e0475bdad76..f8f9646182b 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { preConfigure = '' export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) " \ - LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \ '' + lib.optionalString stdenv.isDarwin '' From b1df5bf89b641f4e7f7538e460df69ee177dfa7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 6 Nov 2016 22:50:41 +0100 Subject: [PATCH 034/295] gstreamer: unbreak finding plugins in $NIX_PROFILES (#20207) * gstreamer-1.0: make gst-launch find plugins again gst-launch and friends are in the "dev" output now. * gstreamer-1.0: lower priority on plugins from $NIX_PROFILES Suffix the plugin paths from $NIX_PROFILES instead of prefixing them to $GST_PLUGIN_SYSTEM_PATH. If a program has specifically set up its plugin path to some custom/specific version, we don't want plugins from $NIX_PROFILES to mess things up by having higher priority. --- pkgs/development/libraries/gstreamer/core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index da15755355d..da6a8c7a74a 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" + for prog in "$dev/bin/"*; do + wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" done ''; From 91d6779b96999b0919448b93715445c4a3a85f16 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 7 Nov 2016 00:20:32 +0100 Subject: [PATCH 035/295] =?UTF-8?q?octave:=204.0.1=20=E2=86=92=204.0.3=20(?= =?UTF-8?q?+=20portaudio=20dep)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/interpreters/octave/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index df443cdc3e1..226f819ded9 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull -, libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk +, libsndfile, portaudio, 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, overridePlatforms ? null @@ -18,16 +18,16 @@ let in stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.3"; name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.xz"; - sha256 = "11y2w6jgngj4rxiy136mkcs02l52rxk60kapyfc4rgrxz5hli3ym"; + sha256 = "11day29k4yfvxh4101x5yf26ld992x5n6qvmhjjk6mzsd26fqayw"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw - fftwSinglePrec qrupdate arpack libwebp ] + fftwSinglePrec portaudio qrupdate arpack libwebp ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla) ++ (stdenv.lib.optional (ghostscript != null) ghostscript) From 0e78ed82bfe660ac3ef7ff343527dc47d9536468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 7 Nov 2016 00:50:42 +0100 Subject: [PATCH 036/295] dirb: init at 2.22 --- pkgs/tools/networking/dirb/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/dirb/default.nix diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix new file mode 100644 index 00000000000..abb64d4d896 --- /dev/null +++ b/pkgs/tools/networking/dirb/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, automake, autoconf, curl, autoreconfHook }: + +let + major = "2"; + minor = "22"; +in stdenv.mkDerivation rec { + name = "dirb-${version}"; + version = "${major}.${minor}"; + src = fetchurl { + url = "mirror://sourceforge/dirb/${version}/dirb${major}${minor}.tar.gz"; + sha256 = "0b7wc2gvgnyp54rxf1n9arn6ymrvdb633v6b3ah138hw4gg8lx7k"; + }; + + unpackPhase = '' + tar -xf $src + find . -exec chmod +x "{}" ";" + export sourceRoot="dirb222" + ''; + + buildInputs = [ automake autoconf curl ]; + preConfigure = "chmod +x configure"; + + meta = { + description = "A web content scanner"; + homepage = "http://dirb.sourceforge.net/"; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; + license = with stdenv.lib.licenses; [ gpl2 ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38f1c00ffb..80b7aa702a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -790,6 +790,8 @@ in aspellDicts_en = aspellDicts.en; }; + dirb = callPackage ../tools/networking/dirb { }; + direnv = callPackage ../tools/misc/direnv { }; discount = callPackage ../tools/text/discount { }; From e22346c35ee8cb872d0587320083ba44230bd44b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 6 Nov 2016 21:27:38 -0800 Subject: [PATCH 037/295] top-level: Make stdenvCross which appears at first glance normal... ...but actually is weird just like the original --- pkgs/stdenv/cross/default.nix | 27 +++++++++++++++++++++++++++ pkgs/stdenv/default.nix | 7 +++++-- pkgs/top-level/default.nix | 7 ++++++- pkgs/top-level/stdenv.nix | 33 ++++++++++++++------------------- 4 files changed, 52 insertions(+), 22 deletions(-) create mode 100644 pkgs/stdenv/cross/default.nix diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix new file mode 100644 index 00000000000..d78061db712 --- /dev/null +++ b/pkgs/stdenv/cross/default.nix @@ -0,0 +1,27 @@ +{ system, allPackages, platform, crossSystem, config, ... } @ args: + +rec { + vanillaStdenv = (import ../. (args // { + crossSystem = null; + allPackages = args: allPackages ({ crossSystem = null; } // args); + })).stdenv; + + # Yeah this isn't so cleanly just build-time packages yet. Notice the + # buildPackages <-> stdenvCross cycle. Yup, it's very weird. + # + # This works because the derivation used to build `stdenvCross` are in + # fact using `forceNativeDrv` to use the `nativeDrv` attribute of the resulting + # derivation built with `vanillaStdenv` (second argument of `makeStdenvCross`). + # + # Eventually, `forceNativeDrv` should be removed and the cycle broken. + buildPackages = allPackages { + # It's OK to change the built-time dependencies + allowCustomOverrides = true; + bootStdenv = stdenvCross; + inherit system platform crossSystem config; + }; + + stdenvCross = buildPackages.makeStdenvCross + vanillaStdenv crossSystem + buildPackages.binutilsCross buildPackages.gccCrossStageFinal; +} diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 3035d87e1fc..59088bfdf3b 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -5,7 +5,7 @@ # Posix utilities, the GNU C compiler, and so on. On other systems, # we use the native C library. -{ system, allPackages ? import ../.., platform, config, lib }: +{ system, allPackages ? import ../.., platform, config, crossSystem, lib }: rec { @@ -36,10 +36,13 @@ rec { # Linux standard environment. inherit (import ./linux { inherit system allPackages platform config lib; }) stdenvLinux; - inherit (import ./darwin { inherit system allPackages platform config;}) stdenvDarwin; + inherit (import ./darwin { inherit system allPackages platform config; }) stdenvDarwin; + + inherit (import ./cross { inherit system allPackages platform crossSystem config lib; }) stdenvCross; # Select the appropriate stdenv for the platform `system'. stdenv = + if crossSystem != null then stdenvCross else if system == "i686-linux" then stdenvLinux else if system == "x86_64-linux" then stdenvLinux else if system == "armv5tel-linux" then stdenvLinux else diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index baf314edece..73fe58ca7f3 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -12,6 +12,11 @@ # null, the default standard environment is used. bootStdenv ? null +, # This is used because stdenv replacement and the stdenvCross do benefit from + # the overridden configuration provided by the user, as opposed to the normal + # bootstrapping stdenvs. + allowCustomOverrides ? (bootStdenv == null) + , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for # files in standard system directories (/usr/include, etc.) @@ -109,7 +114,7 @@ let # attributes to refer to the original attributes (e.g. "foo = # ... pkgs.foo ..."). configOverrides = self: super: - lib.optionalAttrs (bootStdenv == null) + lib.optionalAttrs allowCustomOverrides ((config.packageOverrides or (super: {})) super); # The complete chain of package set builders, applied from top to bottom diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index f9ba5e7516e..20f20186959 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -2,28 +2,23 @@ rec { allStdenvs = import ../stdenv { - inherit system platform config lib; - # TODO(@Ericson2314): hack for cross-compiling until I clean that in follow-up PR - allPackages = args: nixpkgsFun (args // { crossSystem = null; }); + inherit system platform config crossSystem lib; + allPackages = nixpkgsFun; }; defaultStdenv = allStdenvs.stdenv // { inherit platform; }; stdenv = - if bootStdenv != null then (bootStdenv // {inherit platform;}) else - if crossSystem != null then - pkgs.stdenvCross - else - let - changer = config.replaceStdenv or null; - in if changer != null then - changer { - # We import again all-packages to avoid recursivities. - pkgs = nixpkgsFun { - # We remove packageOverrides to avoid recursivities - config = removeAttrs config [ "replaceStdenv" ]; - }; - } - else - defaultStdenv; + if bootStdenv != null then + (bootStdenv // { inherit platform; }) + else if crossSystem == null && config ? replaceStdenv then + config.replaceStdenv { + # We import again all-packages to avoid recursivities. + pkgs = nixpkgsFun { + # We remove packageOverrides to avoid recursivities + config = removeAttrs config [ "replaceStdenv" ]; + }; + } + else + defaultStdenv; } From ea7bf0226825e21555eda1fd57d93762b376188d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 27 Apr 2016 08:09:12 -0700 Subject: [PATCH 038/295] top-level: `top-level/stdenv.nix` no longer needs `pkg` argument --- pkgs/top-level/default.nix | 2 +- pkgs/top-level/stdenv.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 73fe58ca7f3..831b1db0cea 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -84,7 +84,7 @@ let stdenvDefault = self: super: import ./stdenv.nix { - inherit system bootStdenv crossSystem config platform lib nixpkgsFun pkgs; + inherit system bootStdenv crossSystem config platform lib nixpkgsFun; }; allPackages = self: super: diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index 20f20186959..d5d9288907f 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -1,4 +1,4 @@ -{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, pkgs }: +{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun }: rec { allStdenvs = import ../stdenv { From 6bfe04277f40a0da27fa6373edfb24a6b139548b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 27 Apr 2016 09:09:27 -0700 Subject: [PATCH 039/295] top-level: Make config-overriden stdenv bootstrap more normally --- pkgs/stdenv/cross/default.nix | 8 ++++++-- pkgs/stdenv/custom/default.nix | 17 +++++++++++++++++ pkgs/stdenv/default.nix | 3 +++ pkgs/top-level/stdenv.nix | 15 +++------------ 4 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 pkgs/stdenv/custom/default.nix diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index d78061db712..93c5a21d9d5 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -1,9 +1,13 @@ { system, allPackages, platform, crossSystem, config, ... } @ args: rec { - vanillaStdenv = (import ../. (args // { + argClobber = { crossSystem = null; - allPackages = args: allPackages ({ crossSystem = null; } // args); + # Ignore custom stdenvs when cross compiling for compatability + config = builtins.removeAttrs config [ "replaceStdenv" ]; + }; + vanillaStdenv = (import ../. (args // argClobber // { + allPackages = args: allPackages (argClobber // args); })).stdenv; # Yeah this isn't so cleanly just build-time packages yet. Notice the diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix new file mode 100644 index 00000000000..2f2f495b388 --- /dev/null +++ b/pkgs/stdenv/custom/default.nix @@ -0,0 +1,17 @@ +{ system, allPackages, platform, crossSystem, config, ... } @ args: + +rec { + vanillaStdenv = (import ../. (args // { + # Remove config.replaceStdenv to ensure termination. + config = builtins.removeAttrs config [ "replaceStdenv" ]; + })).stdenv; + + buildPackages = allPackages { + # It's OK to change the built-time dependencies + allowCustomOverrides = true; + bootStdenv = vanillaStdenv; + inherit system platform crossSystem config; + }; + + stdenvCustom = config.replaceStdenv { pkgs = buildPackages; }; +} diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 59088bfdf3b..10086ee6a85 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -40,9 +40,12 @@ rec { inherit (import ./cross { inherit system allPackages platform crossSystem config lib; }) stdenvCross; + inherit (import ./custom { inherit system allPackages platform crossSystem config lib; }) stdenvCustom; + # Select the appropriate stdenv for the platform `system'. stdenv = if crossSystem != null then stdenvCross else + if config ? replaceStdenv then stdenvCustom else if system == "i686-linux" then stdenvLinux else if system == "x86_64-linux" then stdenvLinux else if system == "armv5tel-linux" then stdenvLinux else diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index d5d9288907f..9f485b8c90e 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -9,16 +9,7 @@ rec { defaultStdenv = allStdenvs.stdenv // { inherit platform; }; stdenv = - if bootStdenv != null then - (bootStdenv // { inherit platform; }) - else if crossSystem == null && config ? replaceStdenv then - config.replaceStdenv { - # We import again all-packages to avoid recursivities. - pkgs = nixpkgsFun { - # We remove packageOverrides to avoid recursivities - config = removeAttrs config [ "replaceStdenv" ]; - }; - } - else - defaultStdenv; + if bootStdenv != null + then (bootStdenv // { inherit platform; }) + else defaultStdenv; } From 897a1ba8ff666b51e30e299cf67a57bcf2efb30a Mon Sep 17 00:00:00 2001 From: Erik Rybakken Date: Mon, 7 Nov 2016 06:56:15 +0100 Subject: [PATCH 040/295] neomutt: 20160910 -> 20161104 (#20221) --- .../applications/networking/mailreaders/neomutt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index e3cbd17e267..2033dfc8e91 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: stdenv.mkDerivation rec { - version = "20160910"; + version = "20161104"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1i1idqk9l3njqsiw8n8jgjawcz9n9h5180qvpxfwg7sg9zx2sjhj"; + sha256 = "070p18khvxsrcn30jhyrnagka5mgza9mi5vmrrr6xl8mpgkyrlaw"; }; buildInputs = @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = http://www.neomutt.org; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan vrthra ]; + maintainers = with maintainers; [ cstrahan vrthra erikryb ]; }; } From b69ef90fe7b05167dfa3ac6c7f29667fbdf3a9a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2016 19:02:52 +0100 Subject: [PATCH 041/295] Update to LTS Haskell 7.8. --- .../configuration-hackage2nix.yaml | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e135987a4cf..37b050d05d4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,7 +32,7 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # LTS Haskell 7.7 + # LTS Haskell 7.8 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -254,11 +254,11 @@ default-package-overrides: - bzlib ==0.5.0.5 - bzlib-conduit ==0.2.1.4 - c2hs ==0.28.1 - - Cabal ==1.24.0.0 + - Cabal ==1.24.1.0 - cabal-dependency-licenses ==0.1.2.0 - cabal-file-th ==0.2.3 - cabal-helper ==0.7.2.0 - - cabal-install ==1.24.0.0 + - cabal-install ==1.24.0.1 - cabal-rpm ==0.10.0 - cabal-sort ==0.0.5.3 - cabal-src ==0.3.0.2 @@ -276,9 +276,10 @@ default-package-overrides: - cassava-conduit ==0.3.2 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - - cayley-client ==0.2.0.0 + - cayley-client ==0.2.1.0 - cereal ==0.5.3.0 - cereal-conduit ==0.7.3 + - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 - cgi ==3001.3.0.1 - ChannelT ==0.0.0.2 @@ -448,7 +449,7 @@ default-package-overrides: - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.0.1.3 - - direct-sqlite ==2.3.17 + - direct-sqlite ==2.3.18 - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -472,7 +473,7 @@ default-package-overrides: - dotenv ==0.3.1.0 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.1.0 - - download ==0.3.2.4 + - download ==0.3.2.5 - dpor ==0.2.0.0 - drawille ==0.1.0.6 - DRBG ==0.5.5 @@ -579,7 +580,7 @@ default-package-overrides: - force-layout ==0.4.0.6 - forecast-io ==0.2.0.0 - foreign-store ==0.2 - - formatting ==6.2.2 + - formatting ==6.2.3 - fortran-src ==0.1.0.4 - Frames ==0.1.6 - free ==4.12.4 @@ -643,7 +644,7 @@ default-package-overrides: - gitrev ==1.2.0 - gitson ==0.5.2 - gl ==0.7.8.1 - - glabrous ==0.1.2.0 + - glabrous ==0.1.3.0 - GLFW-b ==1.4.8.1 - glib ==0.13.4.1 - Glob ==0.7.12 @@ -749,7 +750,7 @@ default-package-overrides: - gogol-youtube-analytics ==0.1.0 - gogol-youtube-reporting ==0.1.0 - google-cloud ==0.0.4 - - google-oauth2-jwt ==0.1.2.0 + - google-oauth2-jwt ==0.1.2.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graph-wrapper ==0.2.5.1 @@ -854,8 +855,8 @@ default-package-overrides: - hlint ==1.9.35 - hmatrix ==0.17.0.2 - hmatrix-gsl ==0.17.0.0 - - hmatrix-gsl-stats ==0.4.1.3 - - hmatrix-special ==0.4.0.0 + - hmatrix-gsl-stats ==0.4.1.4 + - hmatrix-special ==0.4.0.1 - hmpfr ==0.4.2 - hmt ==0.15 - hoauth2 ==0.5.4.0 @@ -1497,7 +1498,7 @@ default-package-overrides: - s3-signer ==0.3.0.0 - safe ==0.3.9 - safe-exceptions ==0.1.4.0 - - safecopy ==0.9.1 + - safecopy ==0.9.2 - SafeSemaphore ==0.10.1 - sampling ==0.2.0 - sandi ==0.4.0 @@ -1611,7 +1612,7 @@ default-package-overrides: - sql-words ==0.1.4.1 - sqlite-simple ==0.4.9.0 - srcloc ==0.5.1.0 - - stache ==0.1.7 + - stache ==0.1.8 - stack-run-auto ==0.1.1.4 - stackage-curator ==0.14.1.1 - stackage-types ==1.2.0 @@ -1628,7 +1629,7 @@ default-package-overrides: - stm-containers ==0.2.15 - stm-delay ==0.1.1.1 - stm-stats ==0.2.0.0 - - STMonadTrans ==0.3.3 + - STMonadTrans ==0.3.4 - stopwatch ==0.1.0.3 - storable-complex ==0.2.2 - storable-endian ==0.2.5 @@ -1891,7 +1892,7 @@ default-package-overrides: - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.10 - web-routes-hsp ==0.24.6.1 - - web-routes-th ==0.22.5 + - web-routes-th ==0.22.6 - web-routes-wai ==0.24.3 - webdriver ==0.8.4 - webdriver-angular ==0.1.11 @@ -1975,7 +1976,7 @@ default-package-overrides: - yesod-newsfeed ==1.6 - yesod-persistent ==1.4.0.6 - yesod-sitemap ==1.4.0.1 - - yesod-static ==1.5.0.5 + - yesod-static ==1.5.1.1 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - yesod-test ==1.5.3 From cefc24bf69694a9b765aed5275b0e1c082c8d294 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Nov 2016 23:36:48 +0100 Subject: [PATCH 042/295] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d2b9c38a115e41748a73a00bd866504090a2c4cb. --- .../haskell-modules/hackage-packages.nix | 528 +++++++++--------- 1 file changed, 272 insertions(+), 256 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e45070068ee..d1a08377698 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2308,7 +2308,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_1_24_0_0" = callPackage + "Cabal_1_24_1_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, old-time, pretty , process, QuickCheck, regex-posix, tagged, tasty, tasty-hunit @@ -2316,8 +2316,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "1.24.0.0"; - sha256 = "c00e9d372adb49ce1bd5b62ff049cf49adc4a312a271b238894e50eb707297aa"; + version = "1.24.1.0"; + sha256 = "dd2085dafae5cb2b5f8f0ef068ad66a779fb1bf2d68642d3906ac0c666a96a6b"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -6723,8 +6723,8 @@ self: { }: mkDerivation { pname = "HDBC-mysql"; - version = "0.7.0.0"; - sha256 = "cc46b7ae684062998a3eb4f8e710436d5e2ced94e09d40777116cf20a43df1e4"; + version = "0.7.1.0"; + sha256 = "81c985d4a243c965930fb412b3175ca799ba66985f8b6844014fd600df1da7cf"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring HDBC time utf8-string ]; librarySystemDepends = [ mysqlclient openssl zlib ]; @@ -10953,6 +10953,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "MBot" = callPackage + ({ mkDerivation, base, bytestring, hidapi, mtl }: + mkDerivation { + pname = "MBot"; + version = "0.1.0.2"; + sha256 = "147655ce2a168c963fa04130b0f6196cb3679dbc8512d04dbff3c12406d16ec2"; + libraryHaskellDepends = [ base bytestring hidapi mtl ]; + description = "Haskell interface for controlling the mBot educational robot"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "MC-Fold-DP" = callPackage ({ mkDerivation, base, Biobase, cmdargs, PrimitiveArray, split , tuple, vector @@ -14866,12 +14877,13 @@ self: { }) {}; "STMonadTrans" = callPackage - ({ mkDerivation, array, base, mtl }: + ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { pname = "STMonadTrans"; - version = "0.3.3"; - sha256 = "d9911c7634c42b94f57ac7c2a6d523f6d7124870b35fc3030cb72109ba3aa315"; + version = "0.3.4"; + sha256 = "44935ff710369da1614e00a40dabea6ba3a4dd02959d7b0e5ed17a915c3f0210"; libraryHaskellDepends = [ array base mtl ]; + testHaskellDepends = [ array base Cabal mtl ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -17488,6 +17500,25 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; + "Win32_2_4_0_0" = callPackage + ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 + , shfolder, shlwapi, user32, winmm + }: + mkDerivation { + pname = "Win32"; + version = "2.4.0.0"; + sha256 = "e99e020ddd510f3b7012e15346284288a4535c88b369fafa91584e0d9a86cecb"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ + advapi32 gdi32 shell32 shfolder shlwapi user32 winmm + ]; + homepage = "https://github.com/haskell/win32"; + description = "A binding to part of the Win32 library"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.none; + }) {advapi32 = null; gdi32 = null; shell32 = null; + shfolder = null; shlwapi = null; user32 = null; winmm = null;}; + "Win32-console" = callPackage ({ mkDerivation, base, Win32 }: mkDerivation { @@ -30308,21 +30339,21 @@ self: { }) {}; "bibdb" = callPackage - ({ mkDerivation, alex, array, base, bibtex, bytestring, containers - , curl, download-curl, filepath, happy, microlens, microlens-mtl - , microlens-th, mtl, optparse-applicative, parsec, pretty - , transformers + ({ mkDerivation, alex, array, async, base, bibtex, bytestring + , containers, curl, download-curl, filepath, happy, microlens + , microlens-mtl, microlens-th, mtl, optparse-applicative, parsec + , pretty, transformers }: mkDerivation { pname = "bibdb"; - version = "0.4.2"; - sha256 = "6f741fe0e4b1adacee03f7ca2a71c5727709e105dee5a67431b2c298233ca446"; + version = "0.5.2"; + sha256 = "afe2b25a3544994f32c62975f7eddeec5a690562e7ed234b9fb851aef0f7bc80"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base bibtex bytestring containers curl download-curl filepath - microlens microlens-mtl microlens-th mtl optparse-applicative - parsec pretty transformers + array async base bibtex bytestring containers curl download-curl + filepath microlens microlens-mtl microlens-th mtl + optparse-applicative parsec pretty transformers ]; executableToolDepends = [ alex happy ]; homepage = "https://github.com/cacay/bibdb"; @@ -35841,10 +35872,10 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "1.24.0.0"; - sha256 = "d840ecfd0a95a96e956b57fb2f3e9c81d9fc160e1fd0ea350b0d37d169d9e87e"; + version = "1.24.0.1"; + sha256 = "09f5fd8a2aa7f9565800a711a133f8142d36d59b38f59da09c25045b83ee9ecc"; revision = "1"; - editedCabalFile = "375b1a073b68c5531b11f70cdcf55a9add6f8337d9ff0c850c1da7e7bf7bbf39"; + editedCabalFile = "bf42e042bf673561d1d6c2c82d5679e1d0972e6ba8ee2d76604fd188174fa797"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38095,27 +38126,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions - , hspec, http-client, http-conduit, lens, lens-aeson, mtl, text - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.2.0.0"; - sha256 = "f42cff8dd066f219c8dca8e43cd2b6e29265d9064c8751873d22db7888e761fb"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_2_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -40272,6 +40282,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clay_0_12" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: + mkDerivation { + pname = "clay"; + version = "0.12"; + sha256 = "7bef7e086e7e3cd9f35c2e9b8ea7f6e7428e65090ea824cf680c645a350825e9"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base hspec hspec-expectations mtl text ]; + homepage = "http://fvisser.nl/clay"; + description = "CSS preprocessor as embedded Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base , blaze-html, bytestring, cereal, containers, directory, filepath @@ -45237,8 +45261,8 @@ self: { }: mkDerivation { pname = "cplex-hs"; - version = "0.5.0.0"; - sha256 = "22a3fbe663b18effaff54269d16e76aa9513d8a00d4773c3f5555d1a2f5d1567"; + version = "0.5.0.2"; + sha256 = "f39aa34ede9d79444fd6b4d8a3ca492bdce1b16054df5fa11b76acdb7eb81616"; libraryHaskellDepends = [ base containers hashable mtl primitive transformers unordered-containers vector @@ -53395,23 +53419,6 @@ self: { }) {}; "direct-sqlite" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, temporary, text - }: - mkDerivation { - pname = "direct-sqlite"; - version = "2.3.17"; - sha256 = "fade7c52d157cf145380a4818fa2e03163fa104fadf43d580c1d475b6b6fffc4"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base base16-bytestring bytestring directory HUnit temporary text - ]; - homepage = "https://github.com/IreneKnapp/direct-sqlite"; - description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "direct-sqlite_2_3_18" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory , HUnit, temporary, text }: @@ -53426,7 +53433,6 @@ self: { homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directed-cubical" = callPackage @@ -55110,20 +55116,6 @@ self: { }) {}; "download" = callPackage - ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: - mkDerivation { - pname = "download"; - version = "0.3.2.4"; - sha256 = "f8ef9cca18a4829ab640c6f00ed7e707e29e0ed40bc662dfaa1ef42d7ee358bc"; - libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; - testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/psibi/download"; - description = "High-level file download based on URLs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "download_0_3_2_5" = callPackage ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: mkDerivation { pname = "download"; @@ -56916,22 +56908,23 @@ self: { ({ mkDerivation, array, base, containers, directory, filepath, ghc , ghc-paths, Glob, haskeline, HUnit, mtl, parsec, process, random , regex-tdfa, test-framework, test-framework-hunit, text - , transformers, unordered-containers + , transformers, unordered-containers, vector }: mkDerivation { pname = "egison"; - version = "3.6.0"; - sha256 = "16ef278a19fdd9bbc7d58fa8864049b17c47f6ad236e020d00927467726833b2"; + version = "3.6.1"; + sha256 = "937ab976c09bf6c4b4376d9cb30504055814ad4079f15319c9126abf74cdbac9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers directory ghc ghc-paths haskeline mtl parsec process random regex-tdfa text transformers unordered-containers + vector ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline mtl parsec process regex-tdfa text transformers - unordered-containers + unordered-containers vector ]; testHaskellDepends = [ base Glob HUnit mtl test-framework test-framework-hunit @@ -64131,21 +64124,6 @@ self: { }) {}; "formatting" = callPackage - ({ mkDerivation, base, clock, old-locale, scientific, text - , text-format, time - }: - mkDerivation { - pname = "formatting"; - version = "6.2.2"; - sha256 = "4fdcd7e30c48e67e64be04bbf4fc315996898aba9fcdb2491f4bcd3f3fba3412"; - libraryHaskellDepends = [ - base clock old-locale scientific text text-format time - ]; - description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "formatting_6_2_3" = callPackage ({ mkDerivation, base, clock, old-locale, scientific, text , text-format, time }: @@ -64158,7 +64136,6 @@ self: { ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forml" = callPackage @@ -70546,26 +70523,6 @@ self: { }) {}; "glabrous" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , directory, either, hspec, text, unordered-containers - }: - mkDerivation { - pname = "glabrous"; - version = "0.1.2.0"; - sha256 = "ae66cf3c83a8da0095715aee111cd6e834c37501128e39adfb0e0eb2a90a70ad"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring either text - unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - homepage = "https://github.com/MichelBoucey/glabrous"; - description = "A template library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glabrous_0_1_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text , unordered-containers @@ -70584,7 +70541,6 @@ self: { homepage = "https://github.com/MichelBoucey/glabrous"; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -74242,23 +74198,6 @@ self: { }) {}; "google-oauth2-jwt" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL - , RSA, text, unix-time - }: - mkDerivation { - pname = "google-oauth2-jwt"; - version = "0.1.2.0"; - sha256 = "894d233d8253a69643aaeb2f230dbe6984cac4cdaf45c939835a523fadca66bf"; - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "google-oauth2-jwt_0_1_2_1" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL , RSA, text, unix-time }: @@ -88528,8 +88467,8 @@ self: { }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.4.1.3"; - sha256 = "d4852352ed9b5ee4b8e7f519d512047e5976804563151c3bd092589248fc7738"; + version = "0.4.1.4"; + sha256 = "98fe0e49be78a1ff7e5ca44ab086d57bafcf97b86bc249d940501a28dacffafa"; libraryHaskellDepends = [ base binary hmatrix storable-complex vector ]; @@ -88592,19 +88531,6 @@ self: { }) {}; "hmatrix-special" = callPackage - ({ mkDerivation, base, hmatrix, hmatrix-gsl }: - mkDerivation { - pname = "hmatrix-special"; - version = "0.4.0.0"; - sha256 = "1fba0cc75e22df1655ac5771180b26f8ce706783363c825aa6fac8cff5f02933"; - libraryHaskellDepends = [ base hmatrix hmatrix-gsl ]; - homepage = "https://github.com/albertoruiz/hmatrix"; - description = "Interface to GSL special functions"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hmatrix-special_0_4_0_1" = callPackage ({ mkDerivation, base, hmatrix, hmatrix-gsl }: mkDerivation { pname = "hmatrix-special"; @@ -95330,6 +95256,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htoml_1_0_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "htoml"; + version = "1.0.0.3"; + sha256 = "08f8d88a326f80fb55c0abb9431941c3a2a30f2d58f49c94349961ceeb4c856f"; + libraryHaskellDepends = [ + aeson base containers old-locale parsec text time + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed parsec tasty + tasty-hspec tasty-hunit text time unordered-containers vector + ]; + homepage = "https://github.com/cies/htoml"; + description = "Parser for TOML files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "htrace" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -95519,7 +95468,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_3_3" = callPackage + "http-client_0_5_3_4" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -95528,8 +95477,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.3.3"; - sha256 = "8faeb55e45f578c9aa7a17dab5a6cb4aa858fb8d64a18c18497c3af4569164ce"; + version = "0.5.3.4"; + sha256 = "34e9fee9939668a056dc0f8193cfd1906209a51a31853e7ee57f5a7548dd2689"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -100940,6 +100889,8 @@ self: { pname = "instant-generics"; version = "0.6"; sha256 = "b15e0566c0b060341e11ddd6bae9550c9a73c1b75c0e9acd6dc9092f4ce7ef15"; + revision = "1"; + editedCabalFile = "1c1174f7546fceb789fcc40882eb731a21cb88165dac4e59129ff2ec1a11a2fc"; libraryHaskellDepends = [ base containers syb template-haskell ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; @@ -107758,6 +107709,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-javascript_0_6_0_9" = callPackage + ({ mkDerivation, alex, array, base, blaze-builder, bytestring + , Cabal, containers, happy, hspec, mtl, QuickCheck, text + , utf8-light, utf8-string + }: + mkDerivation { + pname = "language-javascript"; + version = "0.6.0.9"; + sha256 = "a86b98d4fb8c27bbe54f7bedecde2acfea7e7d8e30a55434fd971b15238932cc"; + libraryHaskellDepends = [ + array base blaze-builder bytestring containers mtl text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + array base blaze-builder bytestring Cabal containers hspec mtl + QuickCheck utf8-light utf8-string + ]; + homepage = "https://github.com/erikd/language-javascript"; + description = "Parser for JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-kort" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, QuickCheck , random, razom-text-util, regex-applicative, smaoin, text @@ -110660,8 +110634,8 @@ self: { ({ mkDerivation, base, NumInstances, vector }: mkDerivation { pname = "lin-alg"; - version = "0.1.0.2"; - sha256 = "0cdf23a797b4e11be1a2b5c6b7c6228a6372b7ad2930e36b3214d763d21c22a4"; + version = "0.1.0.3"; + sha256 = "3e9622c7353f03d6a097ec4d12a5ba571d5c580811293c72ec8088434315dc79"; libraryHaskellDepends = [ base NumInstances vector ]; description = "Low-dimensional matrices and vectors for graphics and physics"; license = stdenv.lib.licenses.bsd3; @@ -113247,6 +113221,8 @@ self: { pname = "lowgl"; version = "0.3.1.1"; sha256 = "85f5a954970634aa41bc77b6a2932ed935b1411be4ad7badab31dad45b2365b0"; + revision = "1"; + editedCabalFile = "d16861021ff55cbb15185537758b01c3bf1eddf910c2dfd57cb3e51d73f5e591"; libraryHaskellDepends = [ base data-default gl linear vector ]; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; @@ -117314,6 +117290,8 @@ self: { pname = "mikmod"; version = "0.2.0.1"; sha256 = "b7d2b0aa2288f5874aad326043676f667bc61e930d0a5e9c5a90243807e023ed"; + revision = "1"; + editedCabalFile = "6b9bdb1899839287cfa2e355f5836d9d36a8f84a2adce83ec34aef2e6ad3d22a"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; @@ -120895,15 +120873,18 @@ self: { }) {}; "multifile" = callPackage - ({ mkDerivation, base, directory, HaXml, pretty, transformers }: + ({ mkDerivation, base, directory, HaXml, optparse-applicative + , pretty, process, transformers + }: mkDerivation { pname = "multifile"; - version = "0.1.0.3"; - sha256 = "f02f1c4fda7708c064735f7b5c5b8fec59c27522c0fce1c057c3705d9e70a322"; + version = "0.1.0.4"; + sha256 = "0c6224001af91ba477e08c774212ae48fd94cdc86666b2a686fe414ee8ac4973"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory HaXml pretty transformers + base directory HaXml optparse-applicative pretty process + transformers ]; homepage = "xy30.com"; description = "create many files from one"; @@ -121021,6 +121002,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multipath" = callPackage + ({ mkDerivation, base, parsec, utf8-string }: + mkDerivation { + pname = "multipath"; + version = "0.1.0.0"; + sha256 = "c33ea7b02ac8a409826b05900c103e2bdaffc0187808f93b0eafac180bac9c54"; + libraryHaskellDepends = [ base parsec utf8-string ]; + homepage = "https://github.com/SupraSummus/haskell-multipath"; + description = "Parser and builder for unix-path-like objects"; + license = stdenv.lib.licenses.mit; + }) {}; + "multiplate" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -124439,8 +124432,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.3.1"; - sha256 = "2c5b5a6199e6eb4e11fc25cf92663bfaed323f44d34f05991ede25429e8b322c"; + version = "0.2.4.0"; + sha256 = "83423a70e9d066a02ea3931b96de18cfcdc9866a47bd7a00c5b82a96f436d99c"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -138162,8 +138155,8 @@ self: { }: mkDerivation { pname = "pugixml"; - version = "0.3.2"; - sha256 = "91247ef3eb722e917e5ec4b078b66ff3be0dee41848694ae644799d0d8e97b5f"; + version = "0.3.3"; + sha256 = "2b8b6db68f0cb2987d1804537f7b81523af0a357ea3a08a940302120804ede9b"; libraryHaskellDepends = [ base bytestring data-default-class template-haskell ]; @@ -140905,6 +140898,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rating-systems" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "rating-systems"; + version = "0.1"; + sha256 = "099c4472a4251af6ac01c77535d05ac85ef25512206fb0f46971a7023776b89e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mightybyte/rating-systems"; + description = "Implementations of several rating systems: Elo, Glicko, etc"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ratio-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -140920,18 +140925,18 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bimap, binary , binary-bits, bytestring, containers, data-binary-ieee754 - , filepath, hlint, regex-compat, tasty, tasty-hspec - , template-haskell, text, vector + , filepath, hlint, tasty, tasty-hspec, template-haskell, text + , vector }: mkDerivation { pname = "rattletrap"; - version = "0.1.6"; - sha256 = "a1578ce6b94f5b2ad92eb2873fab947918a466f4c34e5a1e659ac15fe18a733d"; + version = "0.2.0"; + sha256 = "874bb97133deed106534ab4a8b387d3bb14a7ad89504a9e2767301491bc3c077"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bimap binary binary-bits bytestring containers - data-binary-ieee754 regex-compat text vector + data-binary-ieee754 text vector ]; executableHaskellDepends = [ aeson aeson-casing base binary bytestring template-haskell @@ -142800,6 +142805,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regex-do" = callPackage + ({ mkDerivation, array, base, bytestring, hspec, QuickCheck + , regex-base, regex-pcre, stringsearch, text + }: + mkDerivation { + pname = "regex-do"; + version = "1.1"; + sha256 = "655a035f10fdb6a9db733d28a63b4f8a943224c14c3811779539112796689edc"; + revision = "1"; + editedCabalFile = "407ea11d3fe9a9307983b11124fab217db7d02bf36498b4953b1cf8e25323f77"; + libraryHaskellDepends = [ + array base bytestring regex-base regex-pcre stringsearch text + ]; + testHaskellDepends = [ + array base bytestring hspec QuickCheck regex-base regex-pcre + stringsearch text + ]; + homepage = "https://github.com/ciez/regex-do"; + description = "PCRE regex wrapper functions"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "regex-easy" = callPackage ({ mkDerivation, array, base, bytestring, regex-pcre , string-conversions @@ -143288,6 +143315,8 @@ self: { pname = "regular"; version = "0.3.4.4"; sha256 = "85f22409b4a5413a7180286caada7375deca4d16010f4681fe343175841c5684"; + revision = "1"; + editedCabalFile = "3ce38f1af2edc138b690a138e776637e5fd1ede9ee5151a31c4be77a73133943"; libraryHaskellDepends = [ base template-haskell ]; description = "Generic programming library for regular datatypes"; license = stdenv.lib.licenses.bsd3; @@ -143376,8 +143405,8 @@ self: { }: mkDerivation { pname = "rei"; - version = "0.3.7"; - sha256 = "97577658fa9d9801ae3dda8ef3b75e8f59bae547b6dc7e91003381fc639d3e0c"; + version = "0.4.0.1"; + sha256 = "108fcfa34f91486946a25d5a1df58e8d2bb6930c852ea8ae4dc5ff81d882ed75"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147013,29 +147042,6 @@ self: { }) {}; "safecopy" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers, lens - , lens-action, old-time, QuickCheck, quickcheck-instances, tasty - , tasty-quickcheck, template-haskell, text, time, vector - }: - mkDerivation { - pname = "safecopy"; - version = "0.9.1"; - sha256 = "f480750c1d970c339a0c432ef216b3fff28c15b35b021192cc221f2a5df6dd6b"; - libraryHaskellDepends = [ - array base bytestring cereal containers old-time template-haskell - text time vector - ]; - testHaskellDepends = [ - array base cereal containers lens lens-action QuickCheck - quickcheck-instances tasty tasty-quickcheck template-haskell time - vector - ]; - homepage = "http://acid-state.seize.it/safecopy"; - description = "Binary serialization with version control"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "safecopy_0_9_2" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , lens-action, old-time, QuickCheck, quickcheck-instances, tasty , tasty-quickcheck, template-haskell, text, time, vector @@ -147056,7 +147062,6 @@ self: { homepage = "https://github.com/acid-state/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safeint" = callPackage @@ -154151,6 +154156,8 @@ self: { pname = "siphash"; version = "1.0.3"; sha256 = "cf81ce41c6ca40c4fec9add5dcebc161cb2d31f522f9ad727df23d30ac6a05f3"; + revision = "1"; + editedCabalFile = "d629325f124617deeb6f1b172c8cbb30556090b32f3533cf8ea93ecb3df04de0"; libraryHaskellDepends = [ base bytestring cpu ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -157332,16 +157339,16 @@ self: { "sparse-linear-algebra" = callPackage ({ mkDerivation, base, containers, criterion, hspec, mtl - , mwc-random, primitive, QuickCheck + , mwc-random, primitive, QuickCheck, vector }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.1.0"; - sha256 = "83e00cc3e244cea190c407b88660427ffe2019175d1b5aade1dbfb6c0e0ffaa7"; + version = "0.2.1.1"; + sha256 = "7a5c11c8cf52b79e141388583731ec35b74958c681eef57300e82ef507278253"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hspec mtl mwc-random primitive QuickCheck + base containers hspec mtl mwc-random primitive QuickCheck vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -158594,30 +158601,6 @@ self: { }) {}; "stache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, exceptions, file-embed, filepath, hspec - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "0.1.7"; - sha256 = "3c34eec3b6b8cfc1b3c5887ab2b209e277938e897c7b3787c3baf9f7a9d0ae30"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath megaparsec mtl template-haskell text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec text yaml - ]; - homepage = "https://github.com/stackbuilders/stache"; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stache_0_1_8" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, exceptions, file-embed, filepath, hspec , hspec-megaparsec, megaparsec, mtl, template-haskell, text @@ -158639,7 +158622,6 @@ self: { homepage = "https://github.com/stackbuilders/stache"; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack" = callPackage @@ -161381,6 +161363,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stt" = callPackage + ({ mkDerivation, base, mtl, primitive, tasty, tasty-hunit + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stt"; + version = "0.2.1"; + sha256 = "dbb5d53d9486c9375c52cbe9a3d3d53f52d9ed882cecc31b5564be9dddb5b176"; + libraryHaskellDepends = [ base mtl primitive ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck transformers + ]; + description = "A monad transformer version of the ST monad"; + license = stdenv.lib.licenses.mit; + }) {}; + "stunclient" = callPackage ({ mkDerivation, base, bytestring, cereal, crypto-api, cryptohash , cryptohash-cryptoapi, digest, network, QuickCheck, random @@ -167911,13 +167909,14 @@ self: { ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, dbus, directory, filepath, gi-gdk, gi-gio, gi-glib , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens - , mime-types, mtl, network, process, random, split, text - , transformers, utf8-string, xdg-basedir, xmonad, xmonad-contrib + , mime-types, mtl, network, process, random, scientific, split + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , utf8-string, vector, xdg-basedir, xmonad, xmonad-contrib }: mkDerivation { pname = "tianbar"; - version = "1.1.1.1"; - sha256 = "0cc35cd49ab80f083091dc085e942e1b3b0c5bf37aeab54e402b9dbc6aff9927"; + version = "1.2.0.0"; + sha256 = "f822b063d0c213ee931b75d13ec39a23f135fa08172bd6aeac3222db5cec9456"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167926,10 +167925,17 @@ self: { executableHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens - mime-types mtl network process random split text transformers - utf8-string xdg-basedir + mime-types mtl network process random scientific split text + transformers unordered-containers utf8-string vector xdg-basedir ]; executablePkgconfigDepends = [ gtk3 ]; + testHaskellDepends = [ + aeson base bytestring containers dbus directory filepath gi-gdk + gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens + mime-types mtl network process random scientific split tasty + tasty-quickcheck text transformers unordered-containers utf8-string + vector xdg-basedir + ]; homepage = "https://github.com/koterpillar/tianbar"; description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; @@ -171010,6 +171016,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tw" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "tw"; + version = "0.1.0.0"; + sha256 = "032194b50fe6b6e53c591df2e58c416244f21a59e5d699724e7ec9f4ce2a2511"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/lovasko/tw"; + description = "Trailing Whitespace"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tweak" = callPackage ({ mkDerivation, base, containers, lens, stm, transformers }: mkDerivation { @@ -171824,6 +171844,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "type-level-kv-list" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-level-kv-list"; + version = "1.1.0"; + sha256 = "4ff032e59108edc7dd27309ac0ee8987cc41ffba695d9699700bd37c6e7f7d73"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/type-level-kv-list#readme"; + description = "A module for hash map like object with type level keys"; + license = stdenv.lib.licenses.mit; + }) {}; + "type-level-natural-number" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -179053,22 +179086,6 @@ self: { }) {}; "web-routes-th" = callPackage - ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split - , template-haskell, text, web-routes - }: - mkDerivation { - pname = "web-routes-th"; - version = "0.22.5"; - sha256 = "1a4d3d51e67abb9c0906fbc586c2f8fa1fc2e251e944eb918ba38dd6796b3355"; - libraryHaskellDepends = [ - base parsec split template-haskell text web-routes - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; - description = "Support for deriving PathInfo using Template Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "web-routes-th_0_22_6" = callPackage ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split , template-haskell, text, web-routes }: @@ -179083,7 +179100,6 @@ self: { homepage = "https://github.com/happstack/web-routes-th"; description = "Support for deriving PathInfo using Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-routes-transformers" = callPackage @@ -185317,29 +185333,29 @@ self: { ({ 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 + , data-default, directory, exceptions, 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.5"; - sha256 = "3cf3f0a1da82caf974343fe03c8efa7794f56d13c6747846fa746f16b029f459"; + version = "1.5.1.1"; + sha256 = "cdb50763c4cbd2b8fcdb2b9f2f2526648e82454c62d49bfd6d165af80a192a92"; 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 + cryptohash-conduit css-text data-default directory exceptions + 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 + directory exceptions 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 ]; From 5dd3c227170fc61a8c1fe7ef84975c026a6c81c0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2016 03:34:46 +0100 Subject: [PATCH 043/295] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/17853c139c92a382d06780efc983a47c5d372c96. --- .../haskell-modules/hackage-packages.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d1a08377698..45839074b79 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -62996,20 +62996,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "flat-mcmc_1_1_1" = callPackage - ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras - , mwc-probability, pipes, primitive, transformers, vector + "flat-mcmc_1_2_2" = callPackage + ({ mkDerivation, base, formatting, mcmc-types, monad-par + , monad-par-extras, mwc-probability, pipes, primitive, text + , transformers, vector }: mkDerivation { pname = "flat-mcmc"; - version = "1.1.1"; - sha256 = "24e2bc1b4728dd54326908332322f227cc2bf3548e6e1b07f0695a1c3167a88c"; + version = "1.2.2"; + sha256 = "c70914ac35058f847e5faf173076403b8feb7bb8c8c96c34ba728aca031f6937"; libraryHaskellDepends = [ - base mcmc-types monad-par monad-par-extras mwc-probability pipes - primitive transformers vector + base formatting mcmc-types monad-par monad-par-extras + mwc-probability pipes primitive text transformers vector ]; testHaskellDepends = [ base vector ]; - homepage = "http://jtobin.github.com/flat-mcmc"; + homepage = "https://github.com/jtobin/flat-mcmc"; description = "Painless general-purpose sampling"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; From d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 5 Nov 2016 14:09:35 +0100 Subject: [PATCH 044/295] haskell-Cabal: update from 1.24.0.0 to 1.24.1.0 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 82073ff0989..aaa615f4caa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -5,7 +5,7 @@ with import ./lib.nix { inherit pkgs; }; self: super: { # Some packages need a non-core version of Cabal. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; 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 95629c37532..9710d139f8a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -37,10 +37,10 @@ self: super: { xhtml = null; # Enable latest version of cabal-install. - cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); + cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); # Build jailbreak-cabal with the latest version of Cabal. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_1_0; }; Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; From 488e460f27cbea516ba866ed5ea5320804642d73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2016 10:28:06 +0100 Subject: [PATCH 045/295] configuration-common.nix: update reference to http-client_0_5_3_4 --- 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 aaa615f4caa..02b20ccd75c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -974,7 +974,7 @@ self: super: { # https://github.com/commercialhaskell/stack/issues/2263 stack = super.stack.overrideScope (self: super: { - http-client = self.http-client_0_5_3_3; + http-client = self.http-client_0_5_3_4; http-client-tls = self.http-client-tls_0_3_3; http-conduit = self.http-conduit_2_2_3; optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; From d268cef94abd4a610d039232877046fa5baabcf2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2016 08:25:33 +0100 Subject: [PATCH 046/295] haskell-distributed-process-tests: don't run tests on Hydra --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02b20ccd75c..4f93b2f857c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1068,4 +1068,7 @@ self: super: { # http://hydra.cryp.to/build/498404/log/raw dbus = dontCheck (appendPatch super.dbus ./patches/hdbus-semicolons.patch); + # Test suite occasionally runs for 1+ days on Hydra. + distributed-process-tests = dontCheck super.distributed-process-tests; + } From c92a549f6ccf0cc128a563d597bfb8175c8ed068 Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Mon, 7 Nov 2016 08:38:20 +0100 Subject: [PATCH 047/295] pythonPackages.jug: 1.2.2 -> 1.3.0 Update jug to newest release. --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b44676c72e4..95bd6b4d1fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7609,25 +7609,27 @@ in { }; jug = buildPythonPackage rec { - version = "1.2.2"; + version = "1.3.0"; name = "jug-${version}"; buildInputs = with self; [ nose numpy ]; propagatedBuildInputs = with self; [ + bottle pyyaml redis six + pkgs.zlib ]; src = pkgs.fetchurl { url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "1riski56b93i8fddgixmmrh6cbprwv44r5wnzcqg9khky1wkg4ls"; + sha256 = "1262v63f1jljfd3rqvavzc2xfcray1m7vhqav3p6wlymgd342wrl"; }; meta = { description = "A Task-Based Parallelization Framework"; license = licenses.mit; - url = https://jug.readthedocs.org/; + url = https://jug.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; }; }; From ab21519858dabc9a1b841ccdd4bc80a40250098a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 7 Nov 2016 11:02:37 +0300 Subject: [PATCH 048/295] bumblebee: use fetchpatch for GitHub patches --- pkgs/tools/X11/bumblebee/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 116a7a014ea..0429faab2ef 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,7 +16,7 @@ # # To use at startup, see hardware.bumblebee options. -{ stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd , libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau , nvidia_x11, virtualgl, primusLib @@ -49,13 +49,13 @@ let xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); - modprobePatch = fetchurl { + modprobePatch = fetchpatch { url = "https://github.com/Bumblebee-Project/Bumblebee/commit/1ada79fe5916961fc4e4917f8c63bb184908d986.patch"; - sha256 = "0x9qvhw6sn606dqcp3394irj6jjhw3h75k3lpbys6gha1yshgjps"; + sha256 = "02vq3vba6nx7gglpjdfchws9vjhs1x02a543yvqrxqpvvdfim2x2"; }; - libkmodPatch = fetchurl { + libkmodPatch = fetchpatch { url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; - sha256 = "0j2v0lncjfn2nw3324q3n69lw3yz3hah6bscc8xn9a2df2dcawj1"; + sha256 = "00c05i5lxz7vdbv445ncxac490vbl5g9w3vy3gd71qw1f0si8vwh"; }; in stdenv.mkDerivation rec { @@ -104,9 +104,8 @@ in stdenv.mkDerivation rec { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ libX11 glib libbsd ] - ++ [ kmod automake111x autoconf ]; - nativeBuildInputs = [ makeWrapper pkgconfig help2man ]; + buildInputs = [ libX11 glib libbsd kmod ]; + nativeBuildInputs = [ makeWrapper pkgconfig help2man automake111x autoconf ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. From 9deb7821d92691788d1041ed3384027e6dddc2a0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 7 Nov 2016 09:35:55 +0100 Subject: [PATCH 049/295] prometheus-alertmanager: 0.4.2 -> 0.5.0 --- 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 e9223b3dafd..fcdc4beb3c3 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.4.2"; + version = "0.5.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1ngfilln259mh92x5wigiz70lnkgwpfbbmf5682j4pw7m3bxaam8"; + sha256 = "1k30v0z5awnd6ys2ybc2m580y98nlifpgl7hly977nfhc6s90kvh"; }; # Tests exist, but seem to clash with the firewall. From c5d9bcb1db5bde39362a4851656aed75145e7db7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 7 Nov 2016 09:36:38 +0100 Subject: [PATCH 050/295] prometheus: 1.1.2 -> 1.3.1 --- 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 f6e58e0a745..7f66aef9d11 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.1.2"; + version = "1.3.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "1k0lfmfkyibjan590wyswr65yr940w8d1zma6k3l2hc025xpi2i4"; + sha256 = "1q29ndi6dnflmv18y2qakipvialy7yfl308kv2vq9y2difij4pwi"; }; docheck = true; From 605cdd41e2864c73536996c0888cf2f8b16832da Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 7 Nov 2016 09:37:48 +0100 Subject: [PATCH 051/295] prometheus-nginx-exporter: 20160524 -> 20161104 --- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 280f7e0abd0..4c369f40610 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "20160524-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; + version = "20161104-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "1b2a3d124b6446a0159a68427b0dc3a8b9f32203"; goPackagePath = "github.com/discordianfish/nginx_exporter"; src = fetchgit { inherit rev; url = "https://github.com/discordianfish/nginx_exporter"; - sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; + sha256 = "19nmkn81m0nyq022bnmjr93wifig4mjcgvns7cbn31i197cydw28"; }; goDeps = ./nginx-exporter_deps.nix; From d17160b55dea97cf58c3a02da54c91ab4da12b5b Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 7 Nov 2016 17:05:19 +0800 Subject: [PATCH 052/295] fldigi: 3.23.07 -> 3.23.15 --- pkgs/applications/audio/fldigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index a75de090033..2ee03a3f399 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "3.23.07"; + version = "3.23.15"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0v78sk9bllxw640wxd4q2qy0h8z2j1d077nxhmpkjpf6mn6vwcda"; + sha256 = "1nxafk99fr6yb09cq3vdpzjcd85mnjwwl8rzccx21kla1ysihl5m"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio From 6b964d953a5dd46d5f97b4612939af3bc53028d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2016 12:04:41 +0100 Subject: [PATCH 053/295] erlang-R14: remove invalid meta.maintainer --- pkgs/development/interpreters/erlang/R14.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix index be7d775a668..0a93726fc0a 100644 --- a/pkgs/development/interpreters/erlang/R14.nix +++ b/pkgs/development/interpreters/erlang/R14.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 541b3fc7d2b63cc7610189c69ab8388e93f0be97 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 7 Nov 2016 12:07:29 +0100 Subject: [PATCH 054/295] cudnn5_cudatoolkit80: adding to main repo --- lib/maintainers.nix | 1 + .../science/math/cudnn/8.0-5.0/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cf996b6c32d..4de543b7d07 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -269,6 +269,7 @@ mbe = "Brandon Edens "; mboes = "Mathieu Boespflug "; mcmtroffaes = "Matthias C. M. Troffaes "; + mdaiter = "Matthew S. Daiter "; meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; mic92 = "Jörg Thalheim "; diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix new file mode 100644 index 00000000000..417e17e4bda --- /dev/null +++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, requireFile +, cudatoolkit +}: + +stdenv.mkDerivation rec { + version = "5.0"; + cudatoolkit_version = "8.0"; + + name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; + + src = requireFile rec { + name = "cudnn-${cudatoolkit_version}-linux-x64-v${version}-ga.tgz"; + message = '' + This nix expression requires that ${name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library + at https://developer.nvidia.com/cudnn, and run the following command in the download directory: + nix-prefetch-url file://${name} + ''; + sha256 = "af80eb1ce0cb51e6a734b2bdc599e6d50b676eab3921e5bddfe5443485df86b6"; + }; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib64/libcudnn.so + + mkdir -p $out + cp -a include $out/include + cp -a lib64 $out/lib64 + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + meta = with stdenv.lib; { + description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; + homepage = "https://developer.nvidia.com/cudnn"; + license = stdenv.lib.licenses.unfree; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b7aa702a8..84ba42b8737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1278,6 +1278,10 @@ in cudatoolkit = cudatoolkit75; }; + cudnn5_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.0 { + cudatoolkit = cudatoolkit8; + }; + curlFull = curl.override { idnSupport = true; ldapSupport = true; From 65fe0e98d7587b8bc0e3229cab68afcfbcf45ff3 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 7 Nov 2016 12:55:10 +0100 Subject: [PATCH 055/295] twitterBootstrap3: init at 3.3.7 (#19852) --- pkgs/development/web/twitter-bootstrap/v3.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/web/twitter-bootstrap/v3.nix diff --git a/pkgs/development/web/twitter-bootstrap/v3.nix b/pkgs/development/web/twitter-bootstrap/v3.nix new file mode 100644 index 00000000000..461a81db857 --- /dev/null +++ b/pkgs/development/web/twitter-bootstrap/v3.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "bootstrap-${version}"; + version = "3.3.7"; + + src = fetchurl { + url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; + sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l"; + }; + + buildInputs = [ unzip ]; + + dontBuild = true; + installPhase = '' + mkdir $out + cp -r * $out/ + ''; + + meta = { + description = "Front-end framework for faster and easier web development"; + homepage = http://getbootstrap.com/; + license = stdenv.lib.licenses.mit; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b7aa702a8..322c911095b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3931,6 +3931,7 @@ in ttylog = callPackage ../tools/misc/ttylog { }; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; txt2man = callPackage ../tools/misc/txt2man { }; From 78121c2118ecd8a7432e3a594b8744c67ce22898 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 12:59:05 +0100 Subject: [PATCH 056/295] build jack unstable without profiling --- pkgs/misc/jackaudio/unstable.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/misc/jackaudio/unstable.nix b/pkgs/misc/jackaudio/unstable.nix index 1f8a41da32f..deda40e7cba 100644 --- a/pkgs/misc/jackaudio/unstable.nix +++ b/pkgs/misc/jackaudio/unstable.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { python waf configure --prefix=$out \ ${optionalString (optDbus != null) "--dbus"} \ --classic \ - --profile \ ${optionalString (optLibffado != null) "--firewire"} \ ${optionalString (optAlsaLib != null) "--alsa"} \ --autostart=${if (optDbus != null) then "dbus" else "classic"} \ From b19b440cb8b9da74a62fb578c6e162c1a1320db5 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 30 Oct 2016 15:52:46 +0100 Subject: [PATCH 057/295] faust1: 0.9.73 -> 0.9.90 --- pkgs/applications/audio/faust/faust1.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 8749497c8ba..b9e98281a7c 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -9,11 +9,11 @@ with stdenv.lib.strings; let - version = "0.9.73"; + version = "0.9.90"; src = fetchurl { url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; - sha256 = "0x2scxkwvvjx7b7smj5xb8kr269qakf49z3fxpasd9g7025q44k5"; + sha256 = "0d1fqwymyfb73zkmpwv4zk4gsg4ji7qs20mfsr20skmnqx30xvna"; }; meta = with stdenv.lib; { @@ -167,7 +167,8 @@ let # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ - --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --set FAUSTLIB "${faust}/lib/faust" \ + --set FAUSTINC "${faust}/include/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ From 77afa8e6b7287abbf961fa03f73e9bdfe37bb542 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 30 Oct 2016 15:59:25 +0100 Subject: [PATCH 058/295] faust2: 2.0-a41 -> 2.0.a51 --- pkgs/applications/audio/faust/faust1git.nix | 210 ------------------ pkgs/applications/audio/faust/faust2.nix | 15 +- pkgs/applications/audio/faust/faust2lv2.nix | 7 +- .../applications/audio/faust/faust2lv2gui.nix | 14 -- pkgs/top-level/all-packages.nix | 6 +- 5 files changed, 16 insertions(+), 236 deletions(-) delete mode 100644 pkgs/applications/audio/faust/faust1git.nix delete mode 100644 pkgs/applications/audio/faust/faust2lv2gui.nix diff --git a/pkgs/applications/audio/faust/faust1git.nix b/pkgs/applications/audio/faust/faust1git.nix deleted file mode 100644 index 94e58f22428..00000000000 --- a/pkgs/applications/audio/faust/faust1git.nix +++ /dev/null @@ -1,210 +0,0 @@ -{ stdenv -, coreutils -, fetchgit -, makeWrapper -, pkgconfig -}: - -with stdenv.lib.strings; - -let - - version = "2016-07-19"; - - src = fetchgit { - url = "git://git.code.sf.net/p/faudiostream/code"; - rev = "16c22dc0193c10521b1dc16f98443d9c206bb5dd"; - sha256 = "01rbcjfhpd5casi72ffi1j95f65ji60l629sgav93pvs0kpdacz5"; - }; - - meta = with stdenv.lib; { - homepage = http://faust.grame.fr/; - downloadPage = http://sourceforge.net/projects/faudiostream/files/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ magnetophon pmahoney ]; - }; - - faust = stdenv.mkDerivation { - - name = "faust-${version}"; - - inherit src; - - buildInputs = [ makeWrapper ]; - - passthru = { - inherit wrap wrapWithBuildEnv; - }; - - preConfigure = '' - makeFlags="$makeFlags prefix=$out" - - # The faust makefiles use 'system ?= $(shell uname -s)' but nix - # defines 'system' env var, so undefine that so faust detects the - # correct system. - unset system - ''; - - # Remove most faust2appl scripts since they won't run properly - # without additional paths setup. See faust.wrap, - # faust.wrapWithBuildEnv. - postInstall = '' - # syntax error when eval'd directly - pattern="faust2!(svg)" - (shopt -s extglob; rm "$out"/bin/$pattern) - ''; - - postFixup = '' - # Set faustpath explicitly. - substituteInPlace "$out"/bin/faustpath \ - --replace "/usr/local /usr /opt /opt/local" "$out" - - # The 'faustoptflags' is 'source'd into other faust scripts and - # not used as an executable, so patch 'uname' usage directly - # rather than use makeWrapper. - substituteInPlace "$out"/bin/faustoptflags \ - --replace uname "${coreutils}/bin/uname" - - # wrapper for scripts that don't need faust.wrap* - for script in "$out"/bin/faust2*; do - wrapProgram "$script" \ - --prefix PATH : "$out"/bin - done - ''; - - meta = meta // { - description = "A functional programming language for realtime audio signal processing"; - longDescription = '' - FAUST (Functional Audio Stream) is a functional programming - language specifically designed for real-time signal processing - and synthesis. FAUST targets high-performance signal processing - applications and audio plug-ins for a variety of platforms and - standards. - The Faust compiler translates DSP specifications into very - efficient C++ code. Thanks to the notion of architecture, - FAUST programs can be easily deployed on a large variety of - audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, - puredata, csound, supercollider, pure, vst, coreaudio) without - any change to the FAUST code. - - This package has just the compiler, libraries, and headers. - Install faust2* for specific faust2appl scripts. - ''; - }; - - }; - - # Default values for faust2appl. - faust2ApplBase = - { baseName - , dir ? "tools/faust2appls" - , scripts ? [ baseName ] - , ... - }@args: - - args // { - name = "${baseName}-${version}"; - - inherit src; - - configurePhase = ":"; - - buildPhase = ":"; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" - for script in ${concatStringsSep " " scripts}; do - cp "${dir}/$script" "$out/bin/" - done - - runHook postInstall - ''; - - postInstall = '' - # For the faust2appl script, change 'faustpath' and - # 'faustoptflags' to absolute paths. - for script in "$out"/bin/*; do - substituteInPlace "$script" \ - --replace ". faustpath" ". '${faust}/bin/faustpath'" \ - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" - done - ''; - - meta = meta // { - description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing"; - }; - }; - - # Some 'faust2appl' scripts, such as faust2alsa, run faust to - # generate cpp code, then invoke the c++ compiler to build the code. - # This builder wraps these scripts in parts of the stdenv such that - # when the scripts are called outside any nix build, they behave as - # if they were running inside a nix build in terms of compilers and - # paths being configured (e.g. rpath is set so that compiled - # binaries link to the libs inside the nix store) - # - # The function takes two main args: the appl name (e.g. - # 'faust2alsa') and an optional list of propagatedBuildInputs. It - # returns a derivation that contains only the bin/${appl} script, - # wrapped up so that it will run as if it was inside a nix build - # with those build inputs. - # - # The build input 'faust' is automatically added to the - # propagatedBuildInputs. - wrapWithBuildEnv = - { baseName - , propagatedBuildInputs ? [ ] - , ... - }@args: - - stdenv.mkDerivation ((faust2ApplBase args) // { - - buildInputs = [ makeWrapper pkgconfig ]; - - propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; - - postFixup = '' - - # export parts of the build environment - for script in "$out"/bin/*; do - wrapProgram "$script" \ - --set FAUSTLIB "${faust}/lib/faust" \ - --set FAUSTINC "${faust}/include/faust" \ - --prefix PATH : "$PATH" \ - --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ - --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ - --set NIX_LDFLAGS "$NIX_LDFLAGS" - done - ''; - }); - - # Builder for 'faust2appl' scripts, such as faust2firefox that - # simply need to be wrapped with some dependencies on PATH. - # - # The build input 'faust' is automatically added to the PATH. - wrap = - { baseName - , runtimeInputs ? [ ] - , ... - }@args: - - let - - runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); - - in stdenv.mkDerivation ((faust2ApplBase args) // { - - buildInputs = [ makeWrapper ]; - - postFixup = '' - for script in "$out"/bin/*; do - wrapProgram "$script" --prefix PATH : "${runtimePath}" - done - ''; - - }); - -in faust diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 24cab4cdbcd..6289688c53c 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -16,11 +16,11 @@ with stdenv.lib.strings; let - version = "2.0-a41"; + version = "2.0.a51"; src = fetchurl { - url = "mirror://sourceforge/project/faudiostream/faust-2.0.a41.tgz"; - sha256 = "1cq4x1cax0lswrcqv0limx5mjdi3187zlmh7cj2pndr0xq6b96cm"; + url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; + sha256 = "1yryjqfqmxs7lxy95hjgmrncvl9kig3rcsmg0v49ghzz7vs7haxf"; }; meta = with stdenv.lib; { @@ -53,7 +53,7 @@ let # defines 'system' env var, so undefine that so faust detects the # correct system. unset system - sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix + # sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix # The makefile sets LLVM_ depending on the current llvm # version, but the detection code is quite brittle. @@ -67,7 +67,7 @@ let # # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION # to something the makefile will recognize. - sed '52iLLVM_VERSION=3.7.0' -i compiler/Makefile.unix + sed '52iLLVM_VERSION=3.8.0' -i compiler/Makefile.unix ''; # Remove most faust2appl scripts since they won't run properly @@ -151,7 +151,8 @@ let for script in "$out"/bin/*; do substituteInPlace "$script" \ --replace ". faustpath" ". '${faust}/bin/faustpath'" \ - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" + --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" \ + --replace " error " "echo" done ''; @@ -193,7 +194,9 @@ let # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ + --set FAUSTLIB "${faust}/lib/faust" \ --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --set FAUSTINC "${faust}/include/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix index 4d11395e738..3472ce5047e 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/applications/audio/faust/faust2lv2.nix @@ -1,11 +1,14 @@ -{ faust +{ boost +, faust , lv2 +, qt4 + }: faust.wrapWithBuildEnv { baseName = "faust2lv2"; - propagatedBuildInputs = [ lv2 ]; + propagatedBuildInputs = [ boost lv2 qt4 ]; } diff --git a/pkgs/applications/audio/faust/faust2lv2gui.nix b/pkgs/applications/audio/faust/faust2lv2gui.nix deleted file mode 100644 index af20bb1d745..00000000000 --- a/pkgs/applications/audio/faust/faust2lv2gui.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ boost -, faust1git -, lv2 -, qt4 - -}: - -faust1git.wrapWithBuildEnv { - - baseName = "faust2lv2"; - - propagatedBuildInputs = [ boost lv2 qt4 ]; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac69528d80..6c854018ae0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16923,14 +16923,14 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = faust2; + faust = self.faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust1git = callPackage ../applications/audio/faust/faust1git.nix { }; faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_37; + llvm = llvm_38; }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; @@ -16947,8 +16947,6 @@ in faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; - faust2lv2gui = callPackage ../applications/audio/faust/faust2lv2gui.nix { }; - faustCompressors = callPackage ../applications/audio/faustCompressors { }; fceux = callPackage ../misc/emulators/fceux { }; From f4e27735678f1861ecc6d73407bcd4a46ffb0ce1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 6 Nov 2016 09:05:08 -0500 Subject: [PATCH 059/295] libgphoto2: Refactor to use GitHub --- .../libraries/libgphoto2/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index a6c739017ee..68736608ad4 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext }: +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }: stdenv.mkDerivation rec { name = "libgphoto2-${meta.version}"; - src = fetchurl { - url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1wjf79ipqwb5phfjjwf15rwgigakylnfqaj4crs5qnds6ba6i1ld"; + src = fetchFromGitHub { + owner = "gphoto"; + repo = "libgphoto2"; + rev = "${meta.tag}"; + sha256 = "17k3jxib2jcr2wk83p34h3lvvjbs2gqhqfcngm8zmlrwb385yalh"; }; - patches = [(fetchurl { + patches = [(fetchpatch { + name = "libjpeg_turbo_1.5.0_fix.patch"; url = "https://anonscm.debian.org/cgit/pkg-phototools/libgphoto2.git/plain" + "/debian/patches/libjpeg_turbo_1.5.0_fix.patch?id=8ce79a2a02d"; - sha256 = "114iyhk6idxz2jhnzpf1glqm6d0x0y8cqfpqxz9i96q9j7x3wwin"; + sha256 = "1zclgg20nv4krj8gigq3ylirxqiv1v8p59cfji041m156hy80gy2"; })]; - nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg libusb1 ]; + nativeBuildInputs = [ pkgconfig gettext autoreconfHook ]; + buildInputs = [ libtool libjpeg libusb1 ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. propagatedBuildInputs = [ libexif ]; @@ -31,6 +34,7 @@ stdenv.mkDerivation rec { from digital cameras. ''; version = "2.5.10"; + tag = "libgphoto2-2_5_10-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; From f63c179b0b0eb08cd06adf5deb973370da80314c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 14:06:35 +0100 Subject: [PATCH 060/295] magnetophonDSP: update to new faust libraries --- .../audio/VoiceOfFaust/default.nix | 65 ------------------- pkgs/applications/audio/foo-yc20/default.nix | 1 + .../CharacterCompressor/default.nix | 11 ++-- .../{ => magnetophonDSP}/CompBus/default.nix | 20 ++++-- .../ConstantDetuneChorus}/default.nix | 15 +++-- .../LazyLimiter/default.nix | 15 +++-- .../MBdistortion/default.nix | 15 +++-- .../RhythmDelay/default.nix | 15 +++-- .../magnetophonDSP/VoiceOfFaust/default.nix | 56 ++++++++++++++++ .../faustCompressors/default.nix | 20 ++++-- .../magnetophonDSP/pluginUtils/default.nix | 41 ++++++++++++ .../magnetophonDSP/shelfMultiBand/default.nix | 38 +++++++++++ pkgs/top-level/all-packages.nix | 29 ++++----- 13 files changed, 213 insertions(+), 128 deletions(-) delete mode 100644 pkgs/applications/audio/VoiceOfFaust/default.nix rename pkgs/applications/audio/{ => magnetophonDSP}/CharacterCompressor/default.nix (77%) rename pkgs/applications/audio/{ => magnetophonDSP}/CompBus/default.nix (60%) rename pkgs/applications/audio/{constant-detune-chorus => magnetophonDSP/ConstantDetuneChorus}/default.nix (62%) rename pkgs/applications/audio/{ => magnetophonDSP}/LazyLimiter/default.nix (59%) rename pkgs/applications/audio/{ => magnetophonDSP}/MBdistortion/default.nix (58%) rename pkgs/applications/audio/{ => magnetophonDSP}/RhythmDelay/default.nix (58%) create mode 100644 pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix rename pkgs/applications/audio/{ => magnetophonDSP}/faustCompressors/default.nix (59%) create mode 100644 pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix create mode 100644 pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix diff --git a/pkgs/applications/audio/VoiceOfFaust/default.nix b/pkgs/applications/audio/VoiceOfFaust/default.nix deleted file mode 100644 index 17cb680c58c..00000000000 --- a/pkgs/applications/audio/VoiceOfFaust/default.nix +++ /dev/null @@ -1,65 +0,0 @@ - -{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, helmholtz, mrpeach, puredata-with-plugins }: -stdenv.mkDerivation rec { - name = "VoiceOfFaust-${version}"; - version = "0.7"; - - src = fetchFromGitHub { - owner = "magnetophon"; - repo = "VoiceOfFaust"; - rev = "v${version}"; - sha256 = "14jjs7cnhg20pzijgblr7caspcpx8p8lpkbvjzc656s9lqn6m9sn"; - }; - - plugins = [ helmholtz mrpeach ]; - - pitchTracker = puredata-with-plugins plugins; - - buildInputs = [ faust2jack ]; - - runtimeInputs = [ pitchTracker ]; - - patchPhase = '' - sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper - sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper - ''; - - buildPhase = '' - faust2jack -osc classicVocoder.dsp - faust2jack -osc CZringmod.dsp - faust2jack -osc FMsinger.dsp - faust2jack -osc FOFvocoder.dsp - faust2jack -osc Karplus-StrongSinger.dsp - faust2jack -osc -sch -t 99999 Karplus-StrongSingerMaxi.dsp - faust2jack -osc PAFvocoder.dsp - faust2jack -osc -sch -t 99999 stringSinger.dsp - faust2jack -osc subSinger.dsp - # doesn't compile on most systems, too big: - #faust2jack -osc -sch -t 99999 VocSynthFull.dsp - ''; - - installPhase = '' - mkdir -p $out/bin - cp launchers/* $out/bin/ - cp classicVocoder $out/bin/ - cp CZringmod $out/bin/ - cp FMsinger $out/bin/ - cp FOFvocoder $out/bin/ - cp Karplus-StrongSinger $out/bin/ - cp Karplus-StrongSingerMaxi $out/bin/ - cp PAFvocoder $out/bin/ - cp stringSinger $out/bin/ - cp subSinger $out/bin/ - #cp VocSynthFull $out/bin/ - mkdir $out/PureData/ - cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd - ''; - - meta = { - description = "Turn your voice into a synthesizer"; - homepage = https://github.com/magnetophon/VoiceOfFaust; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - }; -} - diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 4ccbb425612..073d28ef870 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { postInstallFixup = "rm -rf $out/lib/lv2"; meta = { + broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = https://github.com/sampov2/foo-yc20; license = "BSD"; diff --git a/pkgs/applications/audio/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix similarity index 77% rename from pkgs/applications/audio/CharacterCompressor/default.nix rename to pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 8e50a6f1744..206754a5195 100644 --- a/pkgs/applications/audio/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "CharacterCompressor-${version}"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "magnetophon"; repo = "CharacterCompressor"; rev = "V${version}"; - sha256 = "0ci27v5k10prsmcd0g6q5vhr31mz8hsmrsdk436vfbcv3s108rcc"; + sha256 = "1h0bhjhx023476gbijq842b6f8z71zcyn4c9mddwyb18w9cdamp5"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp - faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "lib/CharacterCompressor.lib" + faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp faust2lv2 -vec -time -gui -t 99999 CharacterCompressorMono.dsp ''; diff --git a/pkgs/applications/audio/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix similarity index 60% rename from pkgs/applications/audio/CompBus/default.nix rename to pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 25175f27162..467e11daaf6 100644 --- a/pkgs/applications/audio/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "CompBus-${version}"; - version = "1.1.02"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "CompBus"; - rev = "v${version}"; - sha256 = "025vi60caxk3j2vxxrgbc59xlyr88vgn7k3127s271zvpyy7apwh"; + rev = "V${version}"; + sha256 = "0yhj680zgk4dn4fi8j3apm72f3z2mjk12amf2a7p0lwn9iyh4a2z"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' for f in *.dsp; do - faust2jaqt -t 99999 $f - faust2lv2 -gui -t 99999 $f + faust2jaqt -time -vec -double -t 99999 $f + done + + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "CompBus.lib" + + for f in *.dsp; + do + faust2lv2 -time -vec -double -gui -t 99999 $f done ''; diff --git a/pkgs/applications/audio/constant-detune-chorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix similarity index 62% rename from pkgs/applications/audio/constant-detune-chorus/default.nix rename to pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 0f53d125911..b452d91426e 100644 --- a/pkgs/applications/audio/constant-detune-chorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "constant-detune-chorus-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "magnetophon"; repo = "constant-detune-chorus"; - rev = "v${version}"; - sha256 = "1ks2k6pflqyi2cs26bnbypphyrrgn0xf31l31kgx1qlilyc57vln"; + rev = "V${version}"; + sha256 = "1sipmc25fr7w7xqx1r0y6i2zwfkgszzwvhk1v15mnsb3cqvk8ybn"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 ConstantDetuneChorus.dsp - faust2lv2 -gui -t 99999 ConstantDetuneChorus.dsp + faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "ConstantDetuneChorus.dsp" + faust2lv2 -time -vec -t 99999 -gui ConstantDetuneChorus.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix similarity index 59% rename from pkgs/applications/audio/LazyLimiter/default.nix rename to pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 16aca9c3d32..d1959ec3ceb 100644 --- a/pkgs/applications/audio/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "LazyLimiter-${version}"; - version = "0.3.01"; + version = "0.3.2"; src = fetchFromGitHub { owner = "magnetophon"; repo = "LazyLimiter"; - rev = "v${version}"; - sha256 = "1yx9d5cakmqbiwb1j9v2af9h5lqzahl3kaamnyk71cf4i8g7zp3l"; + rev = "V${version}"; + sha256 = "10xdydwmsnkx8hzsm74pa546yahp29wifydbc48yywv3sfj5anm7"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 LazyLimiter.dsp - faust2lv2 -gui -t 99999 LazyLimiter.dsp + faust2jaqt -vec -time -t 99999 LazyLimiter.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "GUI.lib" + faust2lv2 -vec -time -t 99999 -gui LazyLimiter.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix similarity index 58% rename from pkgs/applications/audio/MBdistortion/default.nix rename to pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index aa71fff41c5..6216ba55593 100644 --- a/pkgs/applications/audio/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "MBdistortion-${version}"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "MBdistortion"; - rev = "v${version}"; - sha256 = "1rmvfi48hg8ybfw517zgj3fjj2xzckrmv8x131i26vj0fv7svjsp"; + rev = "V${version}"; + sha256 = "0mdzaqmxzgspfgx9w1hdip18y17hwpdcgjyq1rrfm843vkascwip"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 MBdistortion.dsp - faust2lv2 -gui -t 99999 MBdistortion.dsp + faust2jaqt -time -vec -t 99999 MBdistortion.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "MBdistortion.dsp" + faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix similarity index 58% rename from pkgs/applications/audio/RhythmDelay/default.nix rename to pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 05d3b4f193e..0bb2034fc46 100644 --- a/pkgs/applications/audio/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "RhythmDelay-${version}"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "RhythmDelay"; - rev = "v${version}"; - sha256 = "0n938nm08mf3lz92k6v07k1469xxzmfkgclw40jgdssfcfa16bn7"; + rev = "V${version}"; + sha256 = "1j0bjl9agz43dcrcrbiqd7fv7xsxgd65s4ahhv5pvcr729y0fxg4"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 RhythmDelay.dsp - faust2lv2 -gui -t 99999 RhythmDelay.dsp + faust2jaqt -time -vec -t 99999 RhythmDelay.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "RhythmDelay.dsp" + faust2lv2 -time -vec -t 99999 -gui RhythmDelay.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix new file mode 100644 index 00000000000..12d9679f97c --- /dev/null +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -0,0 +1,56 @@ +{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +stdenv.mkDerivation rec { + name = "VoiceOfFaust-${version}"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "VoiceOfFaust"; + rev = "V${version}"; + sha256 = "0la9b806qwrlsxgbir7n1db8v3w24wmd6k43p6qpr1fjjpkhrrgw"; + }; + + plugins = [ helmholtz mrpeach ]; + + pitchTracker = puredata-with-plugins plugins; + + buildInputs = [ faust2jack faust2lv2 ]; + + runtimeInputs = [ pitchTracker ]; + + patchPhase = '' + sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper + sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper + ''; + + buildPhase = '' + sh install.sh + # so it doesn;t end up in /bin/ : + rm -f install.sh + ''; + + installPhase = '' + mkdir -p $out/bin + + for file in ./*; do + if test -x "$file" && test -f "$file"; then + cp "$file" "$out/bin" + fi + done + + cp launchers/* $out/bin/ + mkdir $out/PureData/ + # cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd + cp PureData/* $out/PureData/ + + mkdir -p $out/lib/lv2 + cp -r *.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "Turn your voice into a synthesizer"; + homepage = https://github.com/magnetophon/VoiceOfFaust; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix similarity index 59% rename from pkgs/applications/audio/faustCompressors/default.nix rename to pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index ea0680568db..05e2b335f82 100644 --- a/pkgs/applications/audio/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "faustCompressors-${version}"; - version = "0.1.1"; + name = "faustCompressors-v${version}"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "faustCompressors"; rev = "v${version}"; - sha256 = "0x5nd2cjhknb4aclhkkjaywx75bi2wj22prgv8n47czi09jcj0jb"; + sha256 = "0mkram2hm7i5za7pfn5crh2arbajk8praksxzgjx90rrxwl1y3d1"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' for f in *.dsp; do - faust2jaqt -double -t 99999 $f - faust2lv2 -double -gui -t 99999 $f + faust2jaqt -time -double -t 99999 $f + done + + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "compressors.lib" + + for f in *.dsp; + do + faust2lv2 -time -double -gui -t 99999 $f done ''; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix new file mode 100644 index 00000000000..daa23baa966 --- /dev/null +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + name = "pluginUtils-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "pluginUtils"; + rev = "V${version}"; + sha256 = "1hnr5sp7k6ypf4ks61lnyqx44dkv35yllf3a3xcbrw7yqzagwr1c"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + buildPhase = '' + for f in *.dsp + do + echo "Building jack standalone for $f" + faust2jaqt -vec -time -t 99999 "$f" + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "$f" + echo "Building lv2 for $f" + faust2lv2 -vec -time -gui -t 99999 "$f" + done + ''; + + installPhase = '' + rm -f *.dsp + rm -f *.lib + mkdir -p $out/lib/lv2 + mv *.lv2/ $out/lib/lv2 + mkdir -p $out/bin + cp * $out/bin/ + ''; + + meta = { + description = "Some simple utility lv2 plugins"; + homepage = https://github.com/magnetophon/pluginUtils; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix new file mode 100644 index 00000000000..422aabb2829 --- /dev/null +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + name = "shelfMultiBand-${version}"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "shelfMultiBand"; + rev = "V${version}"; + sha256 = "1b1h4z5fs2xm7wvw11p9wnd0bxs3m88124f5phh0gwvpsdrd0im5"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + buildPhase = '' + faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp + faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "shelfMultiBand.lib" + faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBandMono.dsp + faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBand.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp shelfMultiBand $out/bin/ + cp shelfMultiBandMono $out/bin/ + mkdir -p $out/lib/lv2 + cp -r shelfMultiBand.lv2/ $out/lib/lv2 + cp -r shelfMultiBandMono.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "A multiband compressor made from shelving filters."; + homepage = https://github.com/magnetophon/shelfMultiBand; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c854018ae0..0bbb6efc827 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12260,8 +12260,6 @@ in amdappsdk = amdappsdk28; }; - CharacterCompressor = callPackage ../applications/audio/CharacterCompressor { }; - chatzilla = callPackage ../applications/networking/irc/chatzilla { }; chirp = callPackage ../applications/misc/chirp { @@ -12310,14 +12308,10 @@ in communi = qt5.callPackage ../applications/networking/irc/communi { }; - CompBus = callPackage ../applications/audio/CompBus { }; - compiz = callPackage ../applications/window-managers/compiz { inherit (gnome2) GConf ORBit2 metacity; }; - constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { }; - copyq = callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { @@ -13473,8 +13467,6 @@ in caps = callPackage ../applications/audio/caps { }; - LazyLimiter = callPackage ../applications/audio/LazyLimiter { }; - lastwatch = callPackage ../applications/audio/lastwatch { }; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; @@ -13604,6 +13596,19 @@ in lyx = callPackage ../applications/misc/lyx { }; + magnetophonDSP = { + CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; + CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; + ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { }; + faustCompressors = callPackage ../applications/audio/magnetophonDSP/faustCompressors { }; + LazyLimiter = callPackage ../applications/audio/magnetophonDSP/LazyLimiter { }; + MBdistortion = callPackage ../applications/audio/magnetophonDSP/MBdistortion { }; + pluginUtils = callPackage ../applications/audio/magnetophonDSP/pluginUtils { }; + RhythmDelay = callPackage ../applications/audio/magnetophonDSP/RhythmDelay { }; + VoiceOfFaust = callPackage ../applications/audio/magnetophonDSP/VoiceOfFaust { }; + shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { }; + }; + makeself = callPackage ../applications/misc/makeself { }; marathon = callPackage ../applications/networking/cluster/marathon { }; @@ -13612,8 +13617,6 @@ in matchbox = callPackage ../applications/window-managers/matchbox { }; - MBdistortion = callPackage ../applications/audio/MBdistortion { }; - mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; @@ -14317,8 +14320,6 @@ in retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); - RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; - ricochet = qt55.callPackage ../applications/networking/instant-messengers/ricochet { }; ripser = callPackage ../applications/science/math/ripser { }; @@ -14969,8 +14970,6 @@ in vnstat = callPackage ../applications/networking/vnstat { }; - VoiceOfFaust = callPackage ../applications/audio/VoiceOfFaust { }; - volnoti = callPackage ../applications/misc/volnoti { }; vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; @@ -16947,8 +16946,6 @@ in faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; - faustCompressors = callPackage ../applications/audio/faustCompressors { }; - fceux = callPackage ../misc/emulators/fceux { }; flat-plat = callPackage ../misc/themes/flat-plat { }; From eb9d126d2c1a8d3d52442c80b04c2d3dcda09397 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 7 Nov 2016 14:15:33 +0100 Subject: [PATCH 061/295] linux_mptcp: 0.91 -> 0.91.2 --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 52a52562d60..199ff9122cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.91"; - modDirVersion = "4.1.26"; + mptcpVersion = "0.91.2"; + modDirVersion = "4.1.35"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { @@ -12,7 +12,7 @@ import ./generic.nix (args // rec { src = fetchurl { url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "0rbvgz89j5wk781y201qdxy2kz4gmlamb72wdbxj8mxv92x56lh3"; + sha256 = "1jfxycg8i99ry2cr2ksarvqjzlr46sp192wkpb4sb2mynbzf3dmk"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac69528d80..1928c5fd5dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10826,7 +10826,6 @@ in linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.hiddev_CVE_2016_5829 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From f7b7d860158e7ccffc4e4f8346c1c89d52ee61c8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 14:17:49 +0100 Subject: [PATCH 062/295] lv2-unstable: init at 2016-10-23 --- .../libraries/audio/lv2/unstable.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/audio/lv2/unstable.nix diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix new file mode 100644 index 00000000000..034282c4f3a --- /dev/null +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "lv2-unstable-${version}"; + version = "2016-10-23"; + + src = fetchgit { + url = "http://lv2plug.in/git/cgit.cgi/lv2.git"; + rev = "b36868f3b96a436961c0c51b5b2dd71d05da9b12"; + sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm"; + }; + + buildInputs = [ gtk2 libsndfile pkgconfig python ]; + + configurePhase = "${python.interpreter} waf configure --prefix=$out"; + + buildPhase = "${python.interpreter} waf"; + + installPhase = "${python.interpreter} waf install"; + + meta = with stdenv.lib; { + homepage = http://lv2plug.in; + description = "A plugin standard for audio systems"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac69528d80..f3b7dd83a76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9023,6 +9023,7 @@ in lilv-svn = callPackage ../development/libraries/audio/lilv/lilv-svn.nix { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; + lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { }; lvtk = callPackage ../development/libraries/audio/lvtk { }; From c10d653ac53e235a09c33e6cd055f3bc52bf3234 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 14:19:02 +0100 Subject: [PATCH 063/295] ganv: svn 5675 -> unstable 2016-10-15 --- pkgs/development/libraries/ganv/default.nix | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 6af09bd5179..7530d82a7e3 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchsvn, graphviz, gtkmm2, pkgconfig, python }: +{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python }: stdenv.mkDerivation rec { - name = "ganv-svn-${rev}"; - rev = "5675"; + name = "ganv-unstable-${rev}"; + rev = "2016-10-15"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/ganv"; - rev = rev; - sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj"; + src = fetchgit { + url = "http://git.drobilla.net/cgit.cgi/ganv.git"; + rev = "31685d283e9b811b61014f820c42807f4effa071"; + sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56"; }; - buildInputs = [ graphviz gtkmm2 pkgconfig python ]; + buildInputs = [ graphviz gtk2 gtkmm2 pkgconfig python ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python.interpreter} waf install"; meta = with stdenv.lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; From 16c54ff2086892a04644579ed70d6c1c8876925f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 14:20:13 +0100 Subject: [PATCH 064/295] ingen: svn 5675 -> unstable 2016-10-29 --- pkgs/applications/audio/ingen/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 9a336576d3a..68990b11ef0 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv-svn -, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom +{ stdenv, fetchgit, boost, ganv, glibmm, gtk2, gtkmm2, libjack2, lilv +, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , suil }: stdenv.mkDerivation rec { - name = "ingen-svn-${rev}"; - rev = "5675"; + name = "ingen-unstable-${rev}"; + rev = "2016-10-29"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/ingen"; - rev = rev; - sha256 = "1dk56rzbc0rwlbzr90rv8bh5163xwld32nmkvcz7ajfchi4fnv86"; + src = fetchgit { + url = "http://git.drobilla.net/cgit.cgi/ingen.git"; + rev = "fd147d0b888090bfb897505852c1f25dbdf77e18"; + sha256 = "1qmg79962my82c43vyrv5sxbqci9c7gc2s9bwaaqd0fcf08xcz1z"; }; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv-svn lv2 makeWrapper pkgconfig - python raul serd sord-svn sratom suil + boost ganv glibmm gtk2 gtkmm2 libjack2 lilv lv2Unstable makeWrapper pkgconfig + python raul serd sord sratom suil ]; configurePhase = '' From 88c4cc866084844842f834f9f811569d26703636 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 7 Nov 2016 09:05:58 -0500 Subject: [PATCH 065/295] faust1git: remove, fixup PR #19992 --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a1fd674772..11c86d3410d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16927,8 +16927,6 @@ in faust1 = callPackage ../applications/audio/faust/faust1.nix { }; - faust1git = callPackage ../applications/audio/faust/faust1git.nix { }; - faust2 = callPackage ../applications/audio/faust/faust2.nix { llvm = llvm_38; }; From a2149d61abe2aa5aaac367748a95edac54d1af92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Faille?= Date: Sun, 16 Oct 2016 10:28:16 -0400 Subject: [PATCH 066/295] yamllint: init 0.5.2 yamllint: add myself as maintainer --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4de543b7d07..e463e852933 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -276,6 +276,7 @@ michaelpj = "Michael Peyton Jones "; michalrus = "Michal Rus "; michelk = "Michel Kuhlmann "; + mikefaille = "Michaël Faille "; mimadrid = "Miguel Madrid "; mingchuan = "Ming Chuan "; mirdhyn = "Merlin Gaillard "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95bd6b4d1fd..78f9187e7a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31123,4 +31123,25 @@ in { maintainers = with maintainers; [ bennofs ]; }; }; + + yamllint = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "yamllint"; + version = "0.5.2"; + + src = pkgs.fetchurl{ + url = "mirror://pypi/y/${pname}/${name}.tar.gz"; + sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84"; + }; + + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ pyyaml ]; + + meta = { + homepage = "https://github.com/adrienverge/yamllint"; + description = "A linter for YAML files"; + license = licenses.gpl3; + maintainers = with maintainers; [ mikefaille ]; + }; + }; } From 1667046505070067884668e0f2b96aab4c193165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 15:10:32 +0100 Subject: [PATCH 067/295] vim: factor common.nix from {default,configurable}.nix The derivations are unchanged. --- pkgs/applications/editors/vim/common.nix | 23 ++++++++++++ .../applications/editors/vim/configurable.nix | 36 ++++++------------- pkgs/applications/editors/vim/default.nix | 25 +++---------- 3 files changed, 38 insertions(+), 46 deletions(-) create mode 100644 pkgs/applications/editors/vim/common.nix diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix new file mode 100644 index 00000000000..7ceca4a8902 --- /dev/null +++ b/pkgs/applications/editors/vim/common.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub }: +rec { + version = "8.0.0005"; + + src = fetchFromGitHub { + owner = "vim"; + repo = "vim"; + rev = "v${version}"; + sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; + }; + + enableParallelBuilding = true; + + hardeningDisable = [ "fortify" ]; + + meta = with lib; { + description = "The most popular clone of the VI editor"; + homepage = http://www.vim.org; + license = licenses.vim; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 4ab0ca3f27c..dc7fa3fa398 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc -args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext -, composableDerivation, lib, config, glib, gtk2, python, perl, tcl, ruby +args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext +, composableDerivation, writeText, lib, config, glib, gtk2, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -11,8 +11,9 @@ args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgc , ... }: with args; -let inherit (args.composableDerivation) composableDerivation edf; - nixosRuntimepath = pkgs.writeText "nixos-vimrc" '' +let + inherit (args.composableDerivation) composableDerivation edf; + nixosRuntimepath = writeText "nixos-vimrc" '' set nocompatible syntax on @@ -37,25 +38,18 @@ let inherit (args.composableDerivation) composableDerivation edf; source /etc/vim/vimrc endif ''; + + common = callPackage ./common.nix {}; in composableDerivation { } (fix: rec { name = "vim_configurable-${version}"; - version = "8.0.0005"; - enableParallelBuilding = true; # test this + inherit (common) version hardeningDisable enableParallelBuilding meta; - src = - builtins.getAttr source { - "default" = - # latest release - args.fetchFromGitHub { - owner = "vim"; - repo = "vim"; - rev = "v${version}"; - sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; - }; + src = builtins.getAttr source { + "default" = common.src; # latest release "vim-nox" = { @@ -185,15 +179,5 @@ composableDerivation { ''; dontStrip = 1; - - hardeningDisable = [ "fortify" ]; - - meta = with stdenv.lib; { - description = "The most popular clone of the VI editor"; - homepage = http://www.vim.org; - license = licenses.vim; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; }) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 1511b386579..cf84609921e 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, ncurses, gettext, pkgconfig +{ stdenv, fetchurl, callPackage, ncurses, gettext, pkgconfig # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; @@ -8,18 +8,13 @@ # apple frameworks , Carbon, Cocoa }: +let + common = callPackage ./common.nix {}; +in stdenv.mkDerivation rec { name = "vim-${version}"; - version = "8.0.0005"; - src = fetchFromGitHub { - owner = "vim"; - repo = "vim"; - rev = "v${version}"; - sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; - }; - - enableParallelBuilding = true; + inherit (common) version src hardeningDisable enableParallelBuilding meta; buildInputs = [ ncurses pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; @@ -30,8 +25,6 @@ stdenv.mkDerivation rec { "--enable-nls" ]; - hardeningDisable = [ "fortify" ]; - postInstall = '' ln -s $out/bin/vim $out/bin/vi mkdir -p $out/share/vim @@ -62,12 +55,4 @@ stdenv.mkDerivation rec { # patchPhase = '' # sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure # ''; - - meta = with stdenv.lib; { - description = "The most popular clone of the VI editor"; - homepage = http://www.vim.org; - license = licenses.vim; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; } From 51feecbe88742dd4496c96981d1a87a12c1022e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 15:45:48 +0100 Subject: [PATCH 068/295] vim_configurable: misc improvements - fix wrongly used *native* build inputs; - remove confusing `prePatch = "cd src";` ; - adapt RPATH handling to multiple-output changes; - don't list full compiler flags in vim --version, as that would keep references to -dev paths. Together, the closure of the default feature-set drops almost by 100 MB. The lean vim attribute would *not* lose any references due to patching --version, so we only apply it for vim_configurable. --- .../editors/vim/cflags-prune.diff | 15 +++++++ .../applications/editors/vim/configurable.nix | 39 +++++++------------ 2 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/editors/vim/cflags-prune.diff diff --git a/pkgs/applications/editors/vim/cflags-prune.diff b/pkgs/applications/editors/vim/cflags-prune.diff new file mode 100644 index 00000000000..6bec4fec09e --- /dev/null +++ b/pkgs/applications/editors/vim/cflags-prune.diff @@ -0,0 +1,15 @@ +diff --git a/src/Makefile b/src/Makefile +index 864f54b..fd85f76 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -2806,8 +2806,8 @@ auto/pathdef.c: Makefile auto/config.mk + -@echo '#include "vim.h"' >> $@ + -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ + -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *all_cflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *all_lflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@ + -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@ + -@if test -n "$(COMPILEDBY)"; then \ + echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \ diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index dc7fa3fa398..793f554970f 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -61,31 +61,27 @@ composableDerivation { }.src; }; - prePatch = "cd src"; + patches = [ ./cflags-prune.diff ]; configureFlags = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; - nativeBuildInputs - = [ ncurses pkgconfig gtk2 libX11 libXext libSM libXpm libXt libXaw libXau + nativeBuildInputs = [ pkgconfig ]; + + buildInputs + = [ ncurses gtk2 libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ]; # most interpreters aren't tested yet.. (see python for example how to do it) flags = { ftNix = { - # because we cd to src in the main patch phase, we can't just add this - # patch to the list, we have to apply it manually - postPatch = '' - cd ../runtime - patch -p2 < ${./ft-nix-support.patch} - cd .. - ''; + patches = [ ./ft-nix-support.patch ]; }; } // edf { name = "darwin"; enable = { - nativeBuildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]; + buildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]; NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; }; @@ -99,7 +95,7 @@ composableDerivation { name = "python"; feat = "python${if python ? isPy3 then "3" else ""}interp"; enable = { - nativeBuildInputs = [ python ]; + buildInputs = [ python ]; } // lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes" @@ -108,13 +104,13 @@ composableDerivation { }; } - // edf { name = "tcl"; feat = "tclinterp"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. - // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. + // edf { name = "tcl"; feat = "tclinterp"; enable = { buildInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildInputs = [ruby]; };} #Include Ruby interpreter. // edf { name = "lua"; feat = "luainterp"; enable = { - nativeBuildInputs = [lua]; + buildInputs = [lua]; configureFlags = [ "--with-lua-prefix=${args.lua}" "--enable-luainterp" @@ -166,16 +162,11 @@ composableDerivation { */ postInstall = stdenv.lib.optionalString stdenv.isLinux '' - rpath=`patchelf --print-rpath $out/bin/vim`; - for i in $nativeBuildInputs; do - echo adding $i/lib - rpath=$rpath:$i/lib - done - echo $nativeBuildInputs - echo $rpath - patchelf --set-rpath $rpath $out/bin/{vim,gvim} + patchelf --set-rpath \ + "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ + "$out"/bin/{vim,gvim} - ln -sfn ${nixosRuntimepath} $out/share/vim/vimrc + ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc ''; dontStrip = 1; From 996d8ddd9907433b93b13f518abb0a6f36fa248e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 16:29:20 +0100 Subject: [PATCH 069/295] vim*: fix :Man a bit --- pkgs/applications/editors/vim/common.nix | 7 +++++++ pkgs/applications/editors/vim/configurable.nix | 2 +- pkgs/applications/editors/vim/default.nix | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 7ceca4a8902..c91df72f18c 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -13,6 +13,13 @@ rec { hardeningDisable = [ "fortify" ]; + postPatch = + # Use man from $PATH; escape sequences are still problematic. + '' + substituteInPlace runtime/ftplugin/man.vim \ + --replace "/usr/bin/man " "man " + ''; + meta = with lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 793f554970f..d0a0c63d9d0 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -46,7 +46,7 @@ composableDerivation { name = "vim_configurable-${version}"; - inherit (common) version hardeningDisable enableParallelBuilding meta; + inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; src = builtins.getAttr source { "default" = common.src; # latest release diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index cf84609921e..8c9a725ddd6 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { name = "vim-${version}"; - inherit (common) version src hardeningDisable enableParallelBuilding meta; + inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; buildInputs = [ ncurses pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; From d8652a053b018b14239e45d72e3d5a7eb30d2964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 18:23:14 +0100 Subject: [PATCH 070/295] vimPlugins: auto-update - Rename couldn't be fetched; new URL should be OK. - Two plugins got re-ordered (added ad-hoc, apparently). - ctrlp* is suspected to contain non-generated code; I left it untouched this round but it should be fixed. /cc @carlsverre for 71a94dfd9 --- pkgs/misc/vim-plugins/default.nix | 402 +++++++++++++------------ pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 203 insertions(+), 201 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a8abd86e194..a230902916c 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -133,11 +133,11 @@ rec { }; Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2015-10-25"; + name = "Gist-2016-10-10"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "88c331e2e07765090112a396e5e119b39b5aa754"; - sha256 = "0z7qnkgv8ryyiwikz6v6vpqypr2gh2hih27cil02rs4ci4041w74"; + rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; + sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; }; dependencies = []; @@ -177,11 +177,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-10-04"; + name = "Syntastic-2016-10-30"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "75b1095586b1cb685ccb0e69004bcd4ae75b37da"; - sha256 = "1hlw6ahlfm4k837zy079acv4lih2r2l9d8fwzb8d970r55p6qffb"; + rev = "734fde7f0b84ff3f670ab5772ed1b8b0c8c16770"; + sha256 = "18nw0zw8h537d189n0z244fllbyyb9fw47brnmsw82w90b771723"; }; dependencies = []; @@ -199,44 +199,44 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2016-09-25"; + name = "Tagbar-2016-11-07"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "2955f71856536d503c79c15daab3de890a6d83e9"; - sha256 = "16hz3mvfz4q4sxg2vq2m2gkmpwhchql14yxw1ws05qqnyy0jbxk2"; + rev = "01f57ac5643b0365021ab891f78519d849867a5e"; + sha256 = "0k0006r895m19kpwqy1ibiia5qm47v4h3mgrlr349wlzqibhmws1"; }; dependencies = []; }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2016-08-31"; + name = "The_NERD_Commenter-2016-10-10"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "fdc611c8f4dbb5bed57fe95d076cf82e9bcb5e7d"; - sha256 = "0qdryph7mjny3vcb6255q75fykxps7wvyzibfb3lxrkvqv6i1dlr"; + rev = "97cb982f1f0d0631b34b71b065e162916bee4036"; + sha256 = "136nirs1zi0pjz06yyw2q72ypwmmj25fkl9fjaqgc5q472d77d0v"; }; dependencies = []; }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2016-10-04"; + name = "The_NERD_tree-2016-10-21"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "f26eaf83551631e683e339f00e2c97bd6e8356d7"; - sha256 = "0vljxnnlm7sdhb61z4114lzjy6gi59y3ym5fynplvccsbv0s47r2"; + rev = "eee431dbd44111c858c6d33ffd366cae1f17f8b3"; + sha256 = "1fyz3fp2v77piydadcg47pbb7dds9b015kj1baqaxr4gn2gfwq7f"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2016-09-19"; + name = "UltiSnips-2016-10-24"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "97a280417b9ebcd098283b46ba9f144c6344bb8d"; - sha256 = "030n4f5mwxlq6qfizh82s5h8zlfm3qdh0lc3rc01p0nwbgpvyrg3"; + rev = "71c39721de9cb2d67478e8b8c1a543e006fb67df"; + sha256 = "13lm1fb007ny70pxsvc5wf9s0n90lvimya1n2nn2pyxsnwm416fw"; }; dependencies = []; @@ -342,11 +342,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-08-08"; + name = "fugitive-2016-11-05"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "aac85a268e89a6c8be79341e130ac90256fadbd6"; - sha256 = "1hsq8lgw1gn99y0rr214bcc9vlw0kx8yajci7dimwhbh817kq5v4"; + rev = "b3a8be6975dcc27b523b030bf5d35d9c737aef18"; + sha256 = "1qizj0xmpaj32b9f8p2d76s5rsvm8cxv0rh5yiczlgfvflbi587r"; }; dependencies = []; @@ -375,44 +375,44 @@ rec { }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2016-09-09"; + name = "vim-autoformat-2016-11-02"; src = fetchgit { url = "git://github.com/Chiel92/vim-autoformat"; - rev = "f6fabad46f34afd75ae74995c10813eab7021bbf"; - sha256 = "1n9ij49npiksdhzdkv2wn6cx2kyn62f3j2ins0ng85kzgh83a0jc"; + rev = "15ee797ad37093e9841b41c121c8d93cf1dedf93"; + sha256 = "10alg9a8mhasqp26mg7xlran1x474ip3k03s2sjhlvizy6mv5rba"; }; dependencies = []; }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2016-08-07"; + name = "vim-nix-2016-11-02"; src = fetchgit { url = "git://github.com/LnL7/vim-nix"; - rev = "a61495a762feacc00f24cab4392b09cc3250decf"; - sha256 = "0icq9nawm6s4qzb9q62y3fdq4ixbfwmmgk141fnfqzq6ya1azxac"; + rev = "b06cccd8ff61149b13d3fc8b7e0d06caa55c9888"; + sha256 = "0d1wxxijyyl449f81asl9d31kg0wvs3m0fypin172ahgpf3lyar4"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2016-10-01"; + name = "deoplete-nvim-2016-11-04"; src = fetchgit { url = "git://github.com/Shougo/deoplete.nvim"; - rev = "0e663c022a8f9b318ad494de4246754ad34effb3"; - sha256 = "1w3riv8x8x4hgdyhabcis25f1scapgw9r4xzlnfrz809l25wwxds"; + rev = "5fc5ed772de138439322d728b103a7cb225cbf82"; + sha256 = "1nn9k9rk6m3x48mm6mlji374vkrgwz1rf3pp8smd1hj30dy0njfk"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2016-06-04"; + name = "Spacegray-vim-2016-10-30"; src = fetchgit { url = "git://github.com/ajh17/Spacegray.vim"; - rev = "adb621e3d1df5f55d60383717bbae4533fda9c62"; - sha256 = "15n92rllri11ckdy1dykllx7xpgscvhfqa55z5sl66zicnrv89c9"; + rev = "79936a4434bf57b64c2d73320e62b4e67d84af74"; + sha256 = "0dg037aw99yjdirw6f8v6da1lyf5ba2c6bni2wnka6bmzqx0k53r"; }; dependencies = []; @@ -430,22 +430,22 @@ rec { }; vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2016-09-06"; + name = "vim-css-color-2016-10-11"; src = fetchgit { url = "git://github.com/ap/vim-css-color"; - rev = "499a3767d5d5af8cd427007d2a38623d339f2f85"; - sha256 = "026n85pi85jx5ph1v2ss2fhzm2x02v9kx7w97367p3vmd2cggba3"; + rev = "27903efc1b5330230d5c8c336c26ac7a8ac2e5dc"; + sha256 = "0kr9xf2y001d42x7fam50qbd09fb3rr374qv8m2p5z2d9c21par1"; }; dependencies = []; }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2016-10-03"; + name = "neomake-2016-11-04"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "4771be7bee6023568f80dc21fdda071693b81cca"; - sha256 = "1bkn98iwfx6fhccnwxjh694w2yjfvczkrbm7h6mjkl8n8zka93kc"; + rev = "0c8795de4519600c204227fdf86c83ca499db783"; + sha256 = "0vif3jxrxpq8imnhbkl82fb7vvfi4illxxm6drl6wd5wijfwq39k"; }; dependencies = []; @@ -474,44 +474,44 @@ rec { }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2016-09-15"; + name = "spacevim-2016-10-25"; src = fetchgit { url = "git://github.com/ctjhoa/spacevim"; - rev = "b90e12ebc43fdc4cf6b75004d319c25b29efdf8f"; - sha256 = "1hz84amsl9374mdsgg6szrsnf15kmqa3n2hmcagy5xmbj7fz1msc"; + rev = "51d936482ce0710f6211aefca45cd33ab59d8444"; + sha256 = "156sc8ynj1mg75i7n3dpm5nqlwcw727m41jw32fm3pahr3yq3ydq"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-10-02"; + name = "ctrlp-vim-2016-11-07"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2"; - sha256 = "0m23yrmgbwaj35yh38sj43r16q090l4vbgijpyv1danmf7ws6q1f"; + rev = "88b61e77a285d10d0163bd383d3bb2909ea2ddca"; + sha256 = "0zb5hcsbgvbsp5h0alkqyqbikzicl29mraw787p2chbps10n1qjw"; }; dependencies = []; }; agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2016-09-06"; + name = "agda-vim-2016-10-22"; src = fetchgit { url = "git://github.com/derekelkins/agda-vim"; - rev = "03e8cc9a8c7a58c431a32f50e80fe0fefe0c3f41"; - sha256 = "0qkfxyddp3j14hz1vmm499dnkrgqzr2xsaxi6dz61alq65r4xbl9"; + rev = "5c698a0dcc4881ea8fbe672e60aaca70d4c8b6f4"; + sha256 = "0ii9gmwnc97zjis7d0a230gbh4pqvx4ja83aypmpmy67s3sxhwvf"; }; dependencies = []; }; vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2016-06-28"; + name = "vim-jade-2016-10-31"; src = fetchgit { url = "git://github.com/digitaltoad/vim-jade"; - rev = "f3950a72ea92f2c372846e763dad1f1151a38fb1"; - sha256 = "1wa7zf24szmwchk608s5ikv14jzch9nl8isrn9ji9sz2511w50wp"; + rev = "cc1bddc890f4856aa0511fdfd7c55d2e66f688b5"; + sha256 = "1d5rbaslvr14lcdffrxp0ycsm2nzvq5zyjk0x0nzwhzvvs4fqi40"; }; dependencies = []; @@ -528,6 +528,17 @@ rec { }; + editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "editorconfig-vim-2016-07-16"; + src = fetchgit { + url = "git://github.com/editorconfig/editorconfig-vim"; + rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2"; + sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g"; + }; + dependencies = []; + + }; + acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "acp-2013-02-05"; src = fetchgit { @@ -551,11 +562,11 @@ rec { }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2016-08-18"; + name = "vim-localvimrc-2016-10-07"; src = fetchgit { url = "git://github.com/embear/vim-localvimrc"; - rev = "2d4c622da0bd04669cd149c6f424d0771708e8d6"; - sha256 = "0j5344riafqr330q9jiglcqaffmcppq6r1512866cmkk000r6lc0"; + rev = "f0c9b8d0b6f0d4c83d9dba5137772bd6c97afb4e"; + sha256 = "02dzh8gckbpdifh7nmfzwn6qs3swjm783ld4h7dl1ky6xq4f06mv"; }; dependencies = []; @@ -584,11 +595,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2016-10-04"; + name = "vim-go-2016-10-23"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "1f8e10cebdacfd7a6809741a9eb04b5e1c3bc6ec"; - sha256 = "1iyqa0pklba5badxmak8b8wp0xryk9fi8qky1fj9m8lchv7s69nn"; + rev = "10c805b83f160eb9e7f9cbe00d26c1b6d06ba636"; + sha256 = "0316kzmwb2p91rwz31ddr7r5bd52aa7jxzkb3vdhdb7f3bmcwx3q"; }; dependencies = []; @@ -606,44 +617,44 @@ rec { }; floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "floobits-neovim-2016-06-20"; + name = "floobits-neovim-2016-10-07"; src = fetchgit { url = "git://github.com/floobits/floobits-neovim"; - rev = "cd9247f2ddeab1f9da247d495127b1a836415783"; - sha256 = "12r0xmb5fl6gj47dr8xwiw0pan4xdwjxjjnyi5smfy4sg29lzwl7"; + rev = "85d3493d05ac1d7f5606d40fbe619df16af917bc"; + sha256 = "16c12dgk60mmhyijfk4f33k8i48r1hpjlnxlvdk5kymv7b2xq0fa"; }; dependencies = []; }; psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2016-09-07"; + name = "psc-ide-vim-2016-11-05"; src = fetchgit { url = "git://github.com/frigoeu/psc-ide-vim"; - rev = "3c376289d368b7175cb6c10e2960f08830ee4cb4"; - sha256 = "0mzczy73asw66qz3zqbf48i95qfjrv1rhky9zyl5qcwlay1gyfvj"; + rev = "bb7f0ef6620899cb6256e3ee5956d3b30769488b"; + sha256 = "1x47phq0shap338as120vf0srl69fas11kggzsxjg1dxblg69iww"; }; dependencies = []; }; vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2016-10-01"; + name = "vim-jsonnet-2016-10-11"; src = fetchgit { url = "git://github.com/google/vim-jsonnet"; - rev = "fb99d65bb42438fa65fb46051243bbae20a75e31"; - sha256 = "19c2jwpabsx16m23mzfspazlj565ra3xzsibm9283k46dlax9mwh"; + rev = "bf1997a5607912cc121fe617a6fef76d3d872aa4"; + sha256 = "04vgbzknz7x6r8gwvlajjqd653fvv1x4szib00bnzw87vsagdiiy"; }; dependencies = []; }; vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-leader-guide-2016-10-03"; + name = "vim-leader-guide-2016-11-06"; src = fetchgit { url = "git://github.com/hecal3/vim-leader-guide"; - rev = "0d08f2f5603d61b0099d2323e0ca4ab30f8a4d49"; - sha256 = "0035yzgswqfamcvrbxcjbxs5lywcg5vsrddlnawx8x0rzm4az5nh"; + rev = "b1dd2667cb74147c06853c39530984fbc629eb48"; + sha256 = "0xacamv3dcnkdh9xclvw76fp20rxgqb1m3068l582c6g5p7lj0yi"; }; dependencies = []; @@ -661,22 +672,22 @@ rec { }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-09-20"; + name = "calendar-vim-2016-11-06"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "38b2cf96acf2cb1dc033de4b499f5b223adebacd"; - sha256 = "1yi16vj3if5l55f7pava75fd412skj7nmj4r73dpkqa36dg0xljw"; + rev = "ca4b4b2ed364831ba27d50f17b44d1e9506715ef"; + sha256 = "1i2ywg0h3rb6f05k7ahng9bvjg7hxqdg1nzcijs5m6kxkn8kjj2k"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2016-10-05"; + name = "lightline-vim-2016-11-06"; src = fetchgit { url = "git://github.com/itchyny/lightline.vim"; - rev = "9e8d9f68dfe9b19eba343f796ffd16933a4dc77d"; - sha256 = "02sc5sv0clm79b0p0ayk20j750c6gmw0akg6k9lz9dp9aryx8r9i"; + rev = "836d4c84f76e7066bcfa4c6c60449714cf2b2c45"; + sha256 = "0qdhpwr4iyifmk0l463s4k5nm8k744ycvxmxgz3s38vkn8q5y06w"; }; dependencies = []; @@ -716,22 +727,22 @@ rec { }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2016-07-12"; + name = "vim-orgmode-2016-11-03"; src = fetchgit { url = "git://github.com/jceb/vim-orgmode"; - rev = "e76c0f07e9193e08df2b8eeb95ef6240b494797f"; - sha256 = "00ys1qf8hbigrdxshs5xvg662xcd6qaiw2g1nr21pfs682qdjsyf"; + rev = "304fd3ced3b929a8507e460b99b0bf4e6a9b3c7d"; + sha256 = "13r4mnqng5hsiarqdrr3vqa4frf6jlwlaxpl72czvpyrvd4mvc2m"; }; dependencies = []; }; vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2016-04-07"; + name = "vim-buffergator-2016-10-19"; src = fetchgit { url = "git://github.com/jeetsukumaran/vim-buffergator"; - rev = "611966d1ced784d5659c5dc07e984fabd95d917f"; - sha256 = "1brb6qwlgxq4zcmrqp7wf2zvfvdq4zm8ynzg8wg9rq5cmyp8f61z"; + rev = "c07d16dd3df10bbb5adc3e9b009e341bfa1f673e"; + sha256 = "0bj70lkqizfzmaxwrxcqv1151kx37v2v57aaqy4vcnfn04wq3h95"; }; dependencies = []; @@ -748,6 +759,17 @@ rec { }; + auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "auto-pairs-2016-07-17"; + src = fetchgit { + url = "git://github.com/jiangmiao/auto-pairs"; + rev = "1b3a1efb078fdf74d4013308b63de57dfda0cc8e"; + sha256 = "1g5gb9xvc9xw3rxg8p4w3qcsdl3xfpi5ax380916aq237kmrnzdk"; + }; + dependencies = []; + + }; + vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-nerdtree-tabs-2016-09-19"; src = fetchgit { @@ -793,11 +815,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2016-09-30"; + name = "fzf-vim-2016-10-29"; src = fetchgit { url = "git://github.com/junegunn/fzf.vim"; - rev = "7d1b007cb234d181fd09a50e40e50cb49642861b"; - sha256 = "1011n55n6anfd5cc4cafr1clkdbb2yd9lyzpk7yb4jzmvjvsx64b"; + rev = "0bc9b231fbab6749f18f2f34cc21c649b9a7d3ed"; + sha256 = "1gpy744qd7hch1ab7kfzz1njg74hasvh53w7kbm7ni5sw7pn5w64"; }; dependencies = []; @@ -859,33 +881,33 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-10-03"; + name = "vimtex-2016-11-04"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "abf50a3f04dff85e2e1fb7f8f5123e54dce32706"; - sha256 = "0vln1y2w13fjsvqd5pqjkqx62q3gbhmgkx49i5rdx9vblmg77n7y"; + rev = "fa1adca64aea62d512bbc9e0b0f4b88ac8667ed4"; + sha256 = "0gnz4jh5gagnk06jndmxqmjhymbnpjz18wx5i071q7imkv0420s4"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2016-05-07"; + name = "vim-easymotion-2016-10-19"; src = fetchgit { url = "git://github.com/lokaltog/vim-easymotion"; - rev = "5c6f3cd9a713491e6b32752a05c45198aa91540a"; - sha256 = "0nr50c6hsg43bc86gkiram5whkggjpszffl8xkqxdmlspz9h96v3"; + rev = "11632455de8caa40f264501df8f0a3e249cf0595"; + sha256 = "1lmmahpsghfqnri7wi2i9370q4dfzpdbafabi97vfxyyclxj4bz9"; }; dependencies = []; }; rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow-2016-08-08"; + name = "rainbow-2016-10-28"; src = fetchgit { url = "git://github.com/luochen1990/rainbow"; - rev = "eeb35ccece20f2648b44580c484c6e57eec3c92b"; - sha256 = "0s1ygjm5czzj1idrw4f13gg60zljznb6bs7fps4i3wl2mbmw5641"; + rev = "906094f73a46ab4636806541b50c5d4182fa09e1"; + sha256 = "1za2pwv24yiap2655wagyg4yd69g1xqwayazablwj7x1wvqdvd5p"; }; dependencies = []; @@ -907,22 +929,22 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2016-07-21"; + name = "vim-startify-2016-10-31"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "3f7b8d7b5e8b9f7670f7bcfab3596cb72930ca5e"; - sha256 = "00shnn7wmi3y3354ppd4dgjkxzdnj6cc9wa5sp998y7jlxnc84i9"; + rev = "9732427469c6933cbedeb7e662c70a2aaf4e63d2"; + sha256 = "022ibyqq140130x8c2901sskh03q516ghnc25i41qv6b2hcsq1ad"; }; dependencies = []; }; lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lushtags-2016-04-26"; + name = "lushtags-2016-10-12"; src = fetchgit { url = "git://github.com/mkasa/lushtags"; - rev = "641e4163d078e7c3844f2ac82a8153a3ef06484b"; - sha256 = "1zqgvflkw0pnrv6bzvlsd98sc2m7nk5w3bzqdzj3xdi8ahqx239g"; + rev = "ef6410cd66c6729e6f4795222bdc0e406251f27a"; + sha256 = "094cl57zfqjq7gpv4151zxipb6kd1czwx4nv6x8wsl3n0z4p3jkx"; }; dependencies = []; @@ -962,11 +984,11 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2016-09-08"; + name = "haskell-vim-2016-11-05"; src = fetchgit { url = "git://github.com/neovimhaskell/haskell-vim"; - rev = "962d39f9ef24b9f7af65f10058fd4fff31eb26b4"; - sha256 = "159lr2cl27chpcicdisaz8fk0iy8lz5c0p9mi2lw1advinjxz3zb"; + rev = "cf2f339d2b551547d4f5a365db17f0f12b99a0c0"; + sha256 = "1zdq7rc7bklz88df2cwgw7n43z0mn4fylx7gyfmi8sfm1bx5avnj"; }; dependencies = []; @@ -995,11 +1017,11 @@ rec { }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2016-10-01"; + name = "vim-racer-2016-10-18"; src = fetchgit { url = "git://github.com/racer-rust/vim-racer"; - rev = "78774aee6be126f5dcf576042ac4872e04a1a3a7"; - sha256 = "10rv21g72pkaakxqr016l9r42hjiys1rhhhbnv3pmmfqv38ifx0a"; + rev = "6c87080bdb145595e37c304fd8b570b349eda381"; + sha256 = "1hjf8j7jnf2vb62w6zv3xm0hdhjmm0hxqq18symxfqpkii1kwx6c"; }; dependencies = []; @@ -1017,33 +1039,33 @@ rec { }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2016-09-28"; + name = "vim-grammarous-2016-10-07"; src = fetchgit { url = "git://github.com/rhysd/vim-grammarous"; - rev = "580785b4313613c1fd47ac291d92e1458f3ac2e3"; - sha256 = "0fxnzyb0svmgb3jc9dh6kfxli59kx3289hgwzcclfcff0m9df7q0"; + rev = "81ff81d1ac5e2ea059600588165ba9b2ecb854eb"; + sha256 = "1xpm1j64f5c62d7dnpkc9lfg6qh0nwjbnk3a5gqmz3iy4z1hsdwb"; }; dependencies = []; }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2016-09-30"; + name = "rust-vim-2016-10-28"; src = fetchgit { url = "git://github.com/rust-lang/rust.vim"; - rev = "2030019e1a5d0593dc662a0c37f3d06c4de8c252"; - sha256 = "1d53aw4lprvf7qmk87jar8w7dkqara8k3hdm3qjhjlc1a7qv6i9v"; + rev = "59e5e2f8b7df21eb438124b95c7295da9c53e1d7"; + sha256 = "1zdx29l6lhini9562j75g3d41yvjf78pi8cady16i7644hw11r0m"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2016-09-23"; + name = "neoformat-2016-11-05"; src = fetchgit { url = "git://github.com/sbdchd/neoformat"; - rev = "c15243abdbfef8d0c6d626d6f3676f3694e13131"; - sha256 = "18qsw1z98mg0x3rdvd0j95vyl0n4kacxz4viv600aiisv20s30i3"; + rev = "8a4d9783879e404bd0a9e185dfec2cd6cd529c31"; + sha256 = "076cm2cg4kyps7n5d3kp2vjcwvkay20f1pl26yvdsjac14w6x9l9"; }; dependencies = []; @@ -1061,44 +1083,44 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-09-30"; + name = "neocomplete-vim-2016-10-19"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "16d650348538f780d282863ecbdcc45319d36522"; - sha256 = "0var0md485r6kfrsdbd9zmmid6z7zvqhl5n71q8fjnvsgsb9v6a6"; + rev = "4bf7526a1c8cca9f8614e8a09178f334eaca0481"; + sha256 = "1qpxqvdiglisl8bnh1wli957lwr56mq96pm266qmwj6d38h8yby7"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-09-26"; + name = "neosnippet-snippets-2016-11-05"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "be02928b14cae1effbe4388da4d5a75215344ba6"; - sha256 = "1r3v229plm8qizy0m83rrl0y4b5m2lawc3c22q4zpm9l28hxk084"; + rev = "4431bf176650696d5a8dd93814812afd0d06212c"; + sha256 = "0fbwzlvdbrmia97pyzgyffbqrimp2dxjn6cc45ia1kqgnhwdk4pd"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2016-09-11"; + name = "neosnippet-vim-2016-11-04"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "a1508f88729e1c5912dd12417553f178494c4dd2"; - sha256 = "14pjz6grz56ab65al2h9vn9nlqr6r9cqa8qghdg3rj0sy40lyz7a"; + rev = "22bf9611263fcc9fd2c4bd61031053624ff82714"; + sha256 = "0f0j0spw8zkvrfhbdlk020y19fh4awhhqwc3ylnxday3q5avxa16"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-09-30"; + name = "unite-vim-2016-11-04"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "504edce8c33207c522d6fe8f7864e0c25f25757f"; - sha256 = "0nn3h8nj258s55qwgsskcw028lnsl66x32mq0k6yyklwljplfn1s"; + rev = "f3f6df24c04faf29ae4d716aa776f85e88e7ea38"; + sha256 = "1yyw1blg82g6d8dbl6f4kgfka3d5lh0vgjmp310aysqdhnfag2az"; }; dependencies = []; @@ -1124,11 +1146,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2016-09-05"; + name = "vimshell-vim-2016-10-20"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "371f0774907713959fedbdb37973a55e60428f42"; - sha256 = "0jgfqsk2g6hlmks7c5ig0wlpzmdv6dlf91kdiiqfnli9xsfaq0i8"; + rev = "b42ba02a491d6a4b6daa3178a747e59e7b1800c7"; + sha256 = "1vpxyfyc9p8h5pwmkdqfvvyxgddbzbmycnzpn9kbyxz89r8k94kj"; }; dependencies = [ "vimproc-vim" ]; }; @@ -1178,11 +1200,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2016-09-22"; + name = "vim-quickrun-2016-10-16"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "25b23f3519aabf2515fa4c70390bbea507516377"; - sha256 = "1rb1i8bv2g95l5pp5rmaf4xidqjbkk05dz8kb6b9fdzjnskr0mca"; + rev = "c4c368c835b91c012b011dde613a914c0e167fd0"; + sha256 = "0hk7y7gkcxkzgp102x2b3igx7pq194h6ixahmv8s9qv5ndv2km4s"; }; dependencies = []; @@ -1244,11 +1266,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-10-04"; + name = "youcompleteme-2016-11-04"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "c1cd62dc3c522d49b1989aceb64566326db2fcf2"; - sha256 = "01bqgg7zlfhyri0cwx24mf2rbvr063c7sm5fz1kkccpqr77xiz7h"; + rev = "4f2494e87ebd5a6e9b5dc10a436d4d943f137fe6"; + sha256 = "03fl5ccql6v6da27wns0fiqcyhn0rmwx5vz7l3xqq1xg3x44m5n2"; }; dependencies = []; buildInputs = [ @@ -1287,22 +1309,22 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2016-10-03"; + name = "vim-airline-themes-2016-10-26"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline-themes"; - rev = "3e8ecba0dea8b4ea35e81780a9aa00f2ca6823e8"; - sha256 = "0dcf5pbysbfwrjf0ypnavw25h4k78y990l2j1ks1zbv6mpgg0kkw"; + rev = "e03e9f62d25f9afb04c88ec6ca66cf2098242016"; + sha256 = "0c6qnh7xjp7qiw5hdz4a3n9v4fk7vynm592aqs4cmhhgjfv1s845"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2016-09-13"; + name = "vim-pandoc-2016-11-05"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "035d0154fc9d5c974f810ee88a4b223c7e8bec31"; - sha256 = "00hrwdm5p5bjgwi29xv3hs84sxajwzy9iql6yg02qw3pgzyfa7gv"; + rev = "a92155e8d3a5d8d4e4636783bdebb72ab465b89a"; + sha256 = "0f4mf40h9h55nishgml833mj1n99wpxbahzgmmx3avfvhxcr97hm"; }; dependencies = []; @@ -1320,11 +1342,11 @@ rec { }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2016-07-27"; + name = "vim-pandoc-syntax-2016-11-05"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "34339e2a5fe936549fa758546c40d7a906537a4b"; - sha256 = "0mwhl2dn3hzj8275kaf01yjn401qb7nhi12lkdj7bdzmq856i1y1"; + rev = "c76442ccbdd7889184683dc1d39c16c612c2c19f"; + sha256 = "1ad60ls4xrbf01sjprksrx2j9x2y4m6gd7hq3p9ygrcmcxw64khm"; }; dependencies = []; @@ -1419,22 +1441,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-09-17"; + name = "vim-wakatime-2016-11-01"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "927ba8d2299a65ddab3e79644c48d06386dac2d5"; - sha256 = "1qlzp5gdchvzvnjshh2sz2933wwhky8jdvg3j0rv6yyr95n14zff"; + rev = "5fb34105de863ca90f3f8568b85fa017a42568af"; + sha256 = "1flsdmf60fp8z0k080qfzdcpcb761zrj5qa3np2y9w24wbff9m5p"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2016-06-14"; + name = "command-t-2016-10-27"; src = fetchgit { url = "git://github.com/wincent/command-t"; - rev = "354c429dad34f7d163663943c948f819588b53d3"; - sha256 = "1vkvc6ckza5b4ck52hv4rjclqi7x4f06dxkbqcqnia490m685v9q"; + rev = "d2467c84af8a1f1a2d0366127550d0a241dd2548"; + sha256 = "1r81a0wlj9aqx0s11h6ddkdwbahxbg1l425jdyrwvxwd973nwkj6"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1458,11 +1480,11 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2016-10-04"; + name = "deoplete-jedi-2016-10-22"; src = fetchgit { url = "git://github.com/zchee/deoplete-jedi"; - rev = "9df866cdf35eee085a3531c838659246ede686e9"; - sha256 = "1qi91q0znz5qfq4f0rs07nkf5mf4x55gwb8fkk0hlfnly0qgba80"; + rev = "57e5b61578d4d0a27fa75fd5f8dc21d110d60989"; + sha256 = "050ck7k37lbvw44z7hdk530cswcqywrdfvw5v1bs37mjnh3l9dnj"; }; dependencies = []; @@ -1502,11 +1524,11 @@ rec { }; pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2016-01-26"; + name = "pathogen-2016-10-13"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; - rev = "8c91196cfd9c8fe619f35fac6f2ac81be10677f8"; - sha256 = "17d1903spczg2rk0qzg94vvq41dwhmnxwajqgzcx4lmf606cfspi"; + rev = "7ba2e1b67a8f8bcbafedaf6763580390dfd93436"; + sha256 = "1g15wzyw9b93n3icwpscx4b4qkn23snbmqjqp867ba0w0z3h6hpv"; }; dependencies = []; @@ -1546,11 +1568,11 @@ rec { }; sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sleuth-2015-06-07"; + name = "sleuth-2016-11-06"; src = fetchgit { url = "git://github.com/tpope/vim-sleuth"; - rev = "a17462708aa40a7fc0afd4effa559087d8a2c908"; - sha256 = "12s7nl3c15i9wyinhzw9biymsyw74akx96nzix9p9979nxhmi09m"; + rev = "62c4f261874dd44e6cdc6788b4a6bc59f9dfe746"; + sha256 = "13w4gv2k91ahdc25vhi0ilqphlnix1q5gddcihi8k7fapx990a9k"; }; dependencies = []; @@ -1853,11 +1875,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-09-28"; + name = "vim-airline-2016-11-04"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "2be9a044e09f68bef0eb4dff27af7d22405968fe"; - sha256 = "0n9p2pdh9cw6lfhf43nh71g8r73smnq65c0kadr88ywa54y92bxg"; + rev = "258430db82329c1298750af91391c1b21a5a5b58"; + sha256 = "16m884mfrhmnn12nclmdngkcknkhy1kcn4dhpkk7fs5i89yik1rj"; }; dependencies = []; @@ -1897,11 +1919,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-09-30"; + name = "vim-gitgutter-2016-10-27"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "4f9c5b0f3e2a20081edc1ec60a79640f7d55e3e0"; - sha256 = "1bd7vvljgrbs6phwa8axpzzfhf4kcczmp0i1wwv3rn35sklnqc47"; + rev = "1742a8f568df549f4daeda90174b54d0c371501f"; + sha256 = "1d4d4lpf43dd5fpn3cqb3lrfr4k6ilmanmk9cymwf9byri3s4xdv"; }; dependencies = []; @@ -1952,44 +1974,44 @@ rec { }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2016-07-25"; + name = "vim-signature-2016-10-17"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "537651a3a6dac10442f3e5ea2bb55a0bfd3324a6"; - sha256 = "0s0m75h8jqk0jykhhnjpw02ynvxw5pnsyjv0zb7n0azv96dvvznk"; + rev = "f1f7108aacac5dc3a7e3b697c489f8271fa054b8"; + sha256 = "0y9ls3m9l2f5jwkbfn26xhw1brp03c9ylmzxfnw28z2bfh5778iy"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-09-28"; + name = "vim-signify-2016-10-07"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "faf7a0307180ec10418fa0eae85e68b526eed267"; - sha256 = "18wklbvx632d106wbnkh06qpvkkh6zdxsgp5cvrqwfk73scwkgh5"; + rev = "a7e3219de8f603aaec35b30027778aa417fcb691"; + sha256 = "1dq369s2bavwkv59cklbjz2zr6vk5ahqs53x1pj0l1xx3rg9h3aq"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-10-04"; + name = "vim-snippets-2016-11-05"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "0acb605c5fa6058403fb2510c807b17b9a27d460"; - sha256 = "0jdjcqigsv6dsvpc4zbavpwhx71f1g84zmwysgvsyraiqdiakq7z"; + rev = "93c3241c79886d027c802c93804e597f5b9d742f"; + sha256 = "0m0k2czyhf9lwla4pyzf6jrb0h1xclcww1pqwnmbf1g10ns7n2zh"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2016-10-01"; + name = "vim-webdevicons-2016-11-06"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "77bf4cef436955fb40719526746f3ba718c6fa36"; - sha256 = "0i3rdz08xs8nia0n0m9xd2hdipnb8khrr9zb3bxvhvzd32rfqfv5"; + rev = "4fbf39a8984ed9a450b5cd078d65955de472bace"; + sha256 = "0m549vm5qzk1hiixf4p740fkqw58y46pdimb5jhpm484sqyggvj5"; }; dependencies = []; @@ -2029,35 +2051,15 @@ rec { }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2016-08-05"; + name = "vundle-2016-10-22"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "fef1c2f31862c44cf5295ef86c086efba4af20a9"; - sha256 = "18prk9axxj418hjh1yflijww39bgbvf3vq7z6a1501wq88d7z8zs"; + rev = "88688fe453038ac1ac26e31646cfbec50fca2fb7"; + sha256 = "1i46xjn0zklcrdp4yf856jpl7lwf14x4y67qhnc41q12rcvimvr5"; }; dependencies = []; }; - auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "auto-pairs-2016-07-17"; - src = fetchgit { - url = "git://github.com/jiangmiao/auto-pairs"; - rev = "1b3a1efb078fdf74d4013308b63de57dfda0cc8e"; - sha256 = "1g5gb9xvc9xw3rxg8p4w3qcsdl3xfpi5ax380916aq237kmrnzdk"; - }; - dependencies = []; - }; - - editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "editorconfig-vim-2016-07-16"; - src = fetchgit { - url = "git://github.com/editorconfig/editorconfig-vim"; - rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2"; - sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g"; - }; - dependencies = []; - - }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bebfbd1b7c0..099b4c12ff9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -2,7 +2,6 @@ "CheckAttach" "Gist" "Hoogle" -"Rename" "Solarized" "Supertab" "Syntastic" @@ -106,6 +105,7 @@ "github:vim-pandoc/vim-pandoc-after" "github:vim-pandoc/vim-pandoc-syntax" "github:vim-scripts/Colour-Sampler-Pack" +"github:vim-scripts/Rename" "github:vim-scripts/a.vim" "github:vim-scripts/align" "github:vim-scripts/changeColorScheme.vim" From f28dd2c735844679ada3055af2359ca7c854d0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 18:54:06 +0100 Subject: [PATCH 071/295] vim-youcompleteme: clang 3.8 -> 3.9 It seems to work fine on my NixOS. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 082b2f5e89d..d72c1779cde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17284,7 +17284,7 @@ in vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { inherit (darwin.apple_sdk.frameworks) Cocoa; - llvmPackages = llvmPackages_38; + llvmPackages = llvmPackages_39; }); vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { From 8e86d3d45193cc13b0699a3b260716c8092e4e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 20:21:11 +0100 Subject: [PATCH 072/295] vim-plugins: add clighter8 --- pkgs/misc/vim-plugins/default.nix | 14 ++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + .../vim2nix/additional-nix-code/clighter8 | 4 ++++ 3 files changed, 19 insertions(+) create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a230902916c..f9ea101d3eb 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -440,6 +440,20 @@ rec { }; + clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "clighter8-2016-11-08"; + src = fetchgit { + url = "git://github.com/bbchung/clighter8"; + rev = "a264494b6dd3e7636fa31b8aee9b3a42a635a69f"; + sha256 = "1dg22yfr0za7milqzm7xywa6j9dfs2kvkjlwa046jjkjaqzlfx48"; + }; + dependencies = []; + preFixup = '' + sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ + -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim + ''; + }; + neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neomake-2016-11-04"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 099b4c12ff9..263970be386 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -27,6 +27,7 @@ "github:ajh17/Spacegray.vim" "github:alvan/vim-closetag" "github:ap/vim-css-color" +"github:bbchung/clighter8" "github:benekastah/neomake" "github:bitc/vim-hdevtools" "github:christoomey/vim-tmux-navigator" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 new file mode 100644 index 00000000000..8965ebe2981 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 @@ -0,0 +1,4 @@ + preFixup = '' + sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ + -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim + ''; From 95b5e4c46a5bc95b427aeacfe0f73ac228fbc309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20N=C3=B6tzli?= Date: Mon, 7 Nov 2016 11:24:15 -0800 Subject: [PATCH 073/295] NixOS manual: Update link to list of AMIs --- nixos/doc/manual/installation/obtaining.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index f6e8b218e2b..20a4838be88 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -32,7 +32,7 @@ running NixOS system through several other means: Using AMIs for Amazon’s EC2. To find one for your region and instance type, please refer to the list + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list of most recent AMIs. From d0d5a6dbcc84fc051ba3b804c7d2a178dbf87c47 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Mon, 7 Nov 2016 20:42:26 +0100 Subject: [PATCH 074/295] libgeotiff: enable darwin support --- pkgs/development/libraries/libgeotiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 496306c254d..389f899e3ef 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = http://www.remotesensing.org/geotiff/geotiff.html; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } From 9141b8cad1b36511856732aaf00a5f788f1edbc0 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Mon, 7 Nov 2016 20:42:53 +0100 Subject: [PATCH 075/295] gdal: enable darwin support Also some minor tweaks: There didn't seem any need to use -O0 optimization level anymore. Also the option "with-libpng" should have been "with-png" all along. --- pkgs/development/libraries/gdal/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index ce3e0f61972..173e6411182 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -20,14 +20,13 @@ composableDerivation.composableDerivation {} (fixed: rec { hardeningDisable = [ "format" ]; - # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. - preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; + preConfigure = "unset CC CXX"; configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) - "--with-libpng=${libpng.dev}" # optional + "--with-png=${libpng.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" @@ -53,6 +52,6 @@ composableDerivation.composableDerivation {} (fixed: rec { homepage = http://www.gdal.org/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; }) From 6de20a7fe4d076cadea078b77cd2bc3d52e409aa Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 7 Nov 2016 14:36:41 -0600 Subject: [PATCH 076/295] virtualbox-demo: Add modesetting to drivers This needs to be included for VirtualBox to detect that it needs to start the video driver. "modesetting" is also set in virtualbox-image.nix but this line seems to take precedence over that one (even though the virtualbox-image.nix has a higher override?) This should fix the problems that I and a few others have been having with the .ova files built for nixos.org. Fixes #20007. --- nixos/modules/installer/virtualbox-demo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 49ec0899610..5316cfce906 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -18,5 +18,5 @@ with lib; # Add some more video drivers to give X11 a shot at working in # VMware and QEMU. - services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ]; + services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ]; } From 7fa157c5587d40ca757658e2c8017055c3c0419e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sun, 30 Oct 2016 20:39:53 +0100 Subject: [PATCH 077/295] services: Add Interplanetary File System service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/network-filesystems/ipfs.nix | 111 ++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/ipfs.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c75c22472bd..80a9a520e24 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -278,6 +278,7 @@ postgrey = 258; hound = 259; leaps = 260; + ipfs = 261; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -526,6 +527,7 @@ postgrey = 258; hound = 259; leaps = 260; + ipfs = 261; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 356cb5a92ed..8254ada3ddf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -318,6 +318,7 @@ ./services/monitoring/zabbix-server.nix ./services/network-filesystems/cachefilesd.nix ./services/network-filesystems/drbd.nix + ./services/network-filesystems/ipfs.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix ./services/network-filesystems/openafs-client/default.nix diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix new file mode 100644 index 00000000000..c26a7073703 --- /dev/null +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -0,0 +1,111 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + inherit (pkgs) ipfs; + + cfg = config.services.ipfs; + + ipfsFlags = ''${if cfg.autoMigrate then "--migrate" else ""} ${if cfg.enableGC then "--enable-gc" else ""} ${toString cfg.extraFlags}''; + +in + +{ + + ###### interface + + options = { + + services.ipfs = { + + enable = mkEnableOption "Interplanetary File System"; + + user = mkOption { + type = types.str; + default = "ipfs"; + description = "User under which the IPFS daemon runs"; + }; + + group = mkOption { + type = types.str; + default = "ipfs"; + description = "Group under which the IPFS daemon runs"; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/ipfs"; + description = "The data dir for IPFS"; + }; + + autoMigrate = mkOption { + type = types.bool; + default = false; + description = '' + Whether IPFS should try to migrate the file system automatically. + ''; + }; + + enableGC = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable automatic garbage collection. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + description = "Extra flags passed to the IPFS daemon"; + default = []; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.ipfs ]; + + users.extraUsers = mkIf (cfg.user == "ipfs") { + ipfs = { + group = cfg.group; + home = cfg.dataDir; + createHome = false; + uid = config.ids.uids.ipfs; + description = "IPFS daemon user"; + }; + }; + + users.extraGroups = mkIf (cfg.group == "ipfs") { + ipfs = { + gid = config.ids.gids.ipfs; + }; + }; + + systemd.services.ipfs = { + description = "IPFS Daemon"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + path = [ pkgs.ipfs pkgs.su pkgs.bash ]; + + preStart = + '' + install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} + if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then + cd ${cfg.dataDir} + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs init" + fi + ''; + + serviceConfig = { + ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + }; + }; + }; +} From f17e13a0d589725efbdda19a9a966e6321f705e4 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Tue, 8 Nov 2016 05:18:29 +0800 Subject: [PATCH 078/295] xdotool: 3.20150503.1 -> 3.20160805.1 --- pkgs/tools/X11/xdotool/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 4c675a69842..f69d5d80649 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -2,15 +2,20 @@ stdenv.mkDerivation rec { name = "xdotool-${version}"; - version = "3.20150503.1"; + version = "3.20160805.1"; + src = fetchurl { url = "https://github.com/jordansissel/xdotool/releases/download/v${version}/xdotool-${version}.tar.gz"; - sha256 = "1lcngsw33fy9my21rdiz1gs474bfdqcfxjrnfggbx4aypn1nhcp8"; + sha256 = "1a6c1zr86zb53352yxv104l76l8x21gfl2bgw6h21iphxpv5zgim"; }; nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ libX11 libXtst xextproto libXi libXinerama libxkbcommon ]; + preBuild = '' + mkdir -p $out/lib + ''; + makeFlags = "PREFIX=$(out)"; meta = { From 3e6d04da57429810ee4bfb1e92779bde2f47c5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 22:57:41 +0100 Subject: [PATCH 079/295] texlive: disable xindy on Darwin for now (#20062) --- pkgs/tools/typesetting/tex/texlive/bin.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index d41dbcfef0d..5591f64cee9 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -279,6 +279,10 @@ xdvi = stdenv.mkDerivation { # TODO: it's suspicious that mktexpk generates fonts into ~/.texlive2014 }; +} # un-indented + +// stdenv.lib.optionalAttrs (!stdenv.isDarwin) # see #20062 +{ xindy = stdenv.mkDerivation { name = "texlive-xindy.bin-${version}"; @@ -309,6 +313,6 @@ xindy = stdenv.mkDerivation { ''; }; +} -} # un-indented From c950840544f0a6fdf260692e67245f5c2028ce4d Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Mon, 7 Nov 2016 11:38:23 +1100 Subject: [PATCH 080/295] motion: init at 4.0.1 --- pkgs/applications/video/motion/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/video/motion/default.nix diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix new file mode 100644 index 00000000000..d5215488707 --- /dev/null +++ b/pkgs/applications/video/motion/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libjpeg, ffmpeg }: + +stdenv.mkDerivation rec { + name = "motion-${version}"; + version = "4.0.1"; + src = fetchFromGitHub { + owner = "Motion-Project"; + repo = "motion"; + rev = "release-${version}"; + sha256 = "172bn2ny5r9fcb4kn9bjq3znpgl8ai84w4b99vhk5jggp2haa3bb"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libjpeg ffmpeg ]; + meta = with stdenv.lib; { + homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome; + description = "Monitors the video signal from cameras"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.puffnfresh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b7aa702a8..6bc2ee34452 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2378,6 +2378,8 @@ in most = callPackage ../tools/misc/most { }; + motion = callPackage ../applications/video/motion { }; + mkcast = callPackage ../applications/video/mkcast { }; multitail = callPackage ../tools/misc/multitail { }; From b61b2806dbf996a6af1359179dfe3a86a191974f Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 7 Nov 2016 19:34:12 -0500 Subject: [PATCH 081/295] elpa-packages: 2016-11-07 --- pkgs/applications/editors/emacs-modes/elpa-generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 8c5b24e7ad8..2e050d730fc 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -1351,10 +1351,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161031"; + version = "20161102"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20161031.tar"; - sha256 = "0b4dzdimdkp7116cyyq80n4h71qc477akiblbabnpb8sg87qqg7r"; + url = "https://elpa.gnu.org/packages/org-20161102.tar"; + sha256 = "12v9jhakdxcmlw9zrcrh1fwi3kh6z0qva90hpnr0zjqyj72i0wir"; }; packageRequires = []; meta = { From 19aad5c98490bbc17d11287a5821869bc3903ea6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 7 Nov 2016 19:34:25 -0500 Subject: [PATCH 082/295] org-packages: 2016-11-07 --- .../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 642b3ebdb5f..bdade742b04 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 = "20161031"; + version = "20161102"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20161031.tar"; - sha256 = "1nabn8kj50bxvm3b429j73xipq557kx5j4nr7s5bwxs85i89133q"; + url = "http://orgmode.org/elpa/org-20161102.tar"; + sha256 = "1mj100pnxskgrfmabj0vdmsijmr7v5ir7c18aypv92nh3fnmiz0f"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20161031"; + version = "20161102"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20161031.tar"; - sha256 = "1j0mwqmdyslvdfhd3x9c9li8s41wsaxk81qzfizdwxl9csdf9ki4"; + url = "http://orgmode.org/elpa/org-plus-contrib-20161102.tar"; + sha256 = "124rizp50jaqshcmrr7x2132x5sy7q81nfb37482j9wzrc9l7b95"; }; packageRequires = []; meta = { From 6449b122ebc9b835b5fcd27fd888574582505efb Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 7 Nov 2016 19:34:35 -0500 Subject: [PATCH 083/295] melpa-stable-packages: 2016-11-07 Removals: - closql: repository moved, recipe not updated - epkg: repository moved, recipe not updated - frame-restore: recipe removed from melpa - gulp-task-runner: version tag no longer present - weblogger: moved to github, version tag no longer present --- .../emacs-modes/melpa-stable-generated.nix | 474 +++++++++--------- 1 file changed, 227 insertions(+), 247 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 6c1f92a69ef..c7d7c5b5ed1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1031,12 +1031,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "9266eeb6ab2eef04389850422d7da059c707380e"; - sha256 = "169g2dk3m0f7z64pjxcs918r6j5g2pzphrylr2vm40kppigy8gmw"; + rev = "692ac0816783725600b80b5307bf48a83053a378"; + sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1627,12 +1627,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "0.1.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "6fe75d409323554d4c4f35ac0e90963fe90d3a43"; - sha256 = "0lc0j6ffd6cpqnpfvpqm7rfxblj34pg9vw3zs1hkg15g7qw0nh5c"; + rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4"; + sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -3418,12 +3418,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "1.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "43931dbb96c3aa5df8dda030503f1458dc6ca1c5"; - sha256 = "0kn3nsdlsgd6hlq7c32kp29bhh9zych727sbx028w1bidjsvjlly"; + rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4"; + sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -3888,27 +3888,6 @@ license = lib.licenses.free; }; }) {}; - closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "closql"; - version = "0.2.0"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "closql"; - rev = "8e4d0b3b31913a2362a45fcdaf05745dfc188b66"; - sha256 = "1189drdpzp05kafg5wfi556n2v6a957qs9xm3v9k2rsbgnyd2hgk"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql"; - sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l"; - name = "closql"; - }; - packageRequires = [ emacs emacsql-sqlite ]; - meta = { - homepage = "https://melpa.org/#/closql"; - license = lib.licenses.free; - }; - }) {}; cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; @@ -3954,12 +3933,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.0pre2"; + version = "3.7.0pre3"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "876da11858ab6649bb088c4bb7758fc84910ba20"; - sha256 = "179925wbpnfiazqizw5zrhcdb5pi5a8x2x9m5wp0mvw9gxvmnwvn"; + rev = "adf5f253ec029aec4ee7aadb95c6f908030fb98b"; + sha256 = "1dbpxhs3ss91b9q4cvx8fl60zf7w8jad4cbm5cqpzhi6jfac5gxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4374,12 +4353,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "c77e9c6f87a7853787c70eae885e12b6162d4cc5"; - sha256 = "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd"; + rev = "3dad255d6928e28e7a700d8cbac060f87d43d25e"; + sha256 = "1g4dxps5s93ivs0ca6blia8spchdykny12c1gygm6jh9m6k7kfvh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -4779,12 +4758,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "41169a10cc41c0a3e0b9a61fd8cae7f964347ed7"; - sha256 = "1n56g7n4nsqrgyhn9lwwqjivmpllibmpgnvy34gbwifkmnq4wz0b"; + rev = "5a13e7deda80adb40553f1c256531d040a4c99a1"; + sha256 = "011z47hkynss8a56c2fi702laqxicmwai6anald58436pdxi3y6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -5846,12 +5825,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5"; - sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw"; + rev = "c91edab065f413910354940742b35bdffeb52029"; + sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -6265,12 +6244,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "11348456ba73ab045f68ba79c51d93855ee85c31"; - sha256 = "0q35p9p26ywfaw6k8q05zmr8vmkiakykwns4ffgyl57dafkpjfj0"; + rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; + sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -6286,12 +6265,12 @@ dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix-evil"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "11348456ba73ab045f68ba79c51d93855ee85c31"; - sha256 = "0q35p9p26ywfaw6k8q05zmr8vmkiakykwns4ffgyl57dafkpjfj0"; + rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; + sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -6612,8 +6591,8 @@ version = "0.3"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "6ff00cc2f12b"; - sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3"; + rev = "18cd7ba257ca"; + sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -7196,12 +7175,12 @@ egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egison-mode"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "a3241316207b6b623c5ae61e8fe8fb17783b981b"; - sha256 = "07vdvjy4x21gyw2r4rxrj929hj1jp4a8igwgb2m5a5x50capwzhy"; + rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd"; + sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -7851,12 +7830,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "elx"; - rev = "0f80390bcf2a1dd9a3ba609e92f50a4a3463036e"; - sha256 = "07k8kq444ki7pxbz3vnrwqgycm9hfcdxgsnvf7qihqvzs2y1qm3d"; + rev = "84c9cd5721be9594de743330e7abcec092d2838c"; + sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; @@ -7935,12 +7914,12 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -7956,12 +7935,12 @@ emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-mysql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -7977,12 +7956,12 @@ emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: melpaBuild { pname = "emacsql-psql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -7998,12 +7977,12 @@ emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -8452,27 +8431,6 @@ license = lib.licenses.free; }; }) {}; - epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "epkg"; - version = "1.0.2"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "epkg"; - rev = "b0606f9800c971085d5fef17dfe242aece378fb3"; - sha256 = "195y4clhs8lwbl3f5a9181v60n424s69nfzy9xrwzqclbyj42lr3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg"; - sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q"; - name = "epkg"; - }; - packageRequires = [ closql dash emacs ]; - meta = { - homepage = "https://melpa.org/#/epkg"; - license = lib.licenses.free; - }; - }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -9436,6 +9394,27 @@ license = lib.licenses.free; }; }) {}; + evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-mc"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "gabesoft"; + repo = "evil-mc"; + rev = "ccda120de2fea505147a85232c9500285edd98e8"; + sha256 = "199wcxjqyr9grvw0kahzhkh8kcg53baxhahizrknwav8mpmrvj9z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; + sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs"; + name = "evil-mc"; + }; + packageRequires = [ cl-lib emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-mc"; + license = lib.licenses.free; + }; + }) {}; evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; @@ -11669,27 +11648,6 @@ license = lib.licenses.free; }; }) {}; - frame-restore = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "frame-restore"; - version = "0.5"; - src = fetchFromGitHub { - owner = "lunaryorn"; - repo = "frame-restore.el"; - rev = "5bfd06e18cdf5031062de5e052e9a877c3953804"; - sha256 = "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50ab397e8841f686e098caf6dae5dfafb0550581/recipes/frame-restore"; - sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm"; - name = "frame-restore"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/frame-restore"; - license = lib.licenses.free; - }; - }) {}; fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fringe-helper"; @@ -12791,12 +12749,12 @@ gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmail2bbdb"; - version = "0.0.4"; + version = "0.0.6"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "gmail2bbdb"; - rev = "2043fb8ee90c119b13bc8caf85fdf0a05f494b98"; - sha256 = "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x"; + rev = "181ef6039227bb30a02041d8cfdc435551a7d948"; + sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb"; @@ -13295,12 +13253,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "1a7df5e3b156e6f9a3da8402147b0bb32dc3a185"; - sha256 = "0f14z2yzf76shkwjwfypbdgdrll6mn4m9fm7r15bwrdzm5f72d9k"; + rev = "cd80b8e8a7075484941720e24faa3c9a98cfa2cc"; + sha256 = "0l6vlh8sszsxjs49xsiwfbzcbc55fmiry96g3h1p358nfrg20017"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -13541,8 +13499,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "25414dff1fc5"; - sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z"; + rev = "fe70088c54b9"; + sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -13763,27 +13721,6 @@ license = lib.licenses.free; }; }) {}; - gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "gulp-task-runner"; - version = "1.0"; - src = fetchFromGitHub { - owner = "NicolasPetton"; - repo = "gulp-task-runner"; - rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2"; - sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; - sha256 = "0211mws99bc9ipg7r3qqm1n7gszvwil31psinf0250wliyppjij7"; - name = "gulp-task-runner"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gulp-task-runner"; - license = lib.licenses.free; - }; - }) {}; guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; @@ -14623,22 +14560,22 @@ license = lib.licenses.free; }; }) {}; - helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }: + helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-go-package"; - version = "0.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-go-package"; - rev = "2204710b8a8e68c8cd4c8528eb6de4ad900941da"; - sha256 = "0h3iql8dxq80vpr1cv7fdaw0aniykp2rfzh07j5941jkiy4q63h0"; + rev = "7db5ea9ce97502152a6bb1fe38f8fabb5a49abd2"; + sha256 = "08llqkswilzsigh28w9qjbqi5g5z0ylfabz5sqia7c18gjshvz0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package"; sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6"; name = "helm-go-package"; }; - packageRequires = [ deferred go-mode helm ]; + packageRequires = [ deferred emacs go-mode helm-core ]; meta = { homepage = "https://melpa.org/#/helm-go-package"; license = lib.licenses.free; @@ -15739,12 +15676,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2"; - sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982"; + rev = "17e0db99ca41f10a8cc2daff812d1c7bae048a8b"; + sha256 = "0my7xaphyh3rm6yfnim2p5fpp6ldj8y57g4kpnldw6vw4kd57x3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -16474,12 +16411,12 @@ imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; - rev = "f3aca4c07178c56080e4c85875f78321e94a9649"; - sha256 = "15lflvpapm5749qq7jzdwbd0isb89i6df3np4wn9y9gjl7y92wk7"; + rev = "a879ddc36fedc30311693f308f414c520fdfc370"; + sha256 = "0rx4r6822iwl4gb9j0fii0sqinqvp3lzrc768rasgicgpklaqkjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter"; @@ -16639,22 +16576,22 @@ license = lib.licenses.free; }; }) {}; - import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: + import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "import-popwin"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-import-popwin"; - rev = "34c3b34ffcadafea71600acb8f4e5ba385e6da19"; - sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w"; + rev = "6a21efc7fd44f8c2484d22eadf298e4bfd4bc003"; + sha256 = "1h4c3cib87hvgp37c30lx7cpyxvgdsb9hp7z0nfrkbbif0acrj2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin"; sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy"; name = "import-popwin"; }; - packageRequires = [ cl-lib popwin ]; + packageRequires = [ emacs popwin ]; meta = { homepage = "https://melpa.org/#/import-popwin"; license = lib.licenses.free; @@ -17019,12 +16956,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "3d64dec24b01bc582801db537ed12a5812f4f0ee"; - sha256 = "1y72xhs978ah53fmp10pa8riscx94y9bjvr26wk2f3zc94c6cq3d"; + rev = "250ed1e03359fe5b29070da13cd55abc6deb0cda"; + sha256 = "168bnirfqpgiqmrjs52ixzqzq074y9szvxi6bml9zbxi8dcmafaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -17269,12 +17206,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.23"; + version = "0.24"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "67174f42c38eeeda73cfed62197abf59f19b3b9c"; - sha256 = "080dvzxymbrnaazx64lbvigd982z237a8427myi4mg5wnk68q1wg"; + rev = "c669a9b28dc09806c30864659f6ac924045a083d"; + sha256 = "0fykdci5vi84xrnghaqfs79zsi8x6kv77wx5xw6yphjksdqrp2f3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -19236,12 +19173,12 @@ magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-stgit"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; - rev = "d1793345a8d32b2c509077d634ca73148a68de4b"; - sha256 = "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb"; + rev = "1b064485d512ab547d606dcea9ad4298f355095c"; + sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; @@ -19257,12 +19194,12 @@ magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-svn"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "magit"; repo = "magit-svn"; - rev = "c6222981d4aae088d658cce5e58a14efea8590d6"; - sha256 = "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68"; + rev = "63a47732cc112d24db26052ffad93895319b60cf"; + sha256 = "1g2isa8n2j8kk0c5iwx8qai8k14sazwkc3dwhcpchm3zs0bfpdm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; @@ -19278,12 +19215,12 @@ magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-topgit"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "magit"; repo = "magit-topgit"; - rev = "732de604c31c74e9da24616428c6e9668b57c881"; - sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33"; + rev = "11489ea798bc88d0ea5244bbf725285eedfefbef"; + sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit"; @@ -21209,12 +21146,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "537e584d115fb056a23a0b055e0a28f543182c45"; - sha256 = "1cma5047c3486bjfshb612iq6j3yml0c02gqy8d0ms9507r60igq"; + rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50"; + sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -22138,12 +22075,12 @@ org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "org-elisp-help"; - rev = "0ead4f715b0a8fd21428f763cfc502177d82b3db"; - sha256 = "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl"; + rev = "23506883074b65943987d09f1c0ecd6dc1e4a443"; + sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; @@ -22407,22 +22344,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: melpaBuild { pname = "org-projectile"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "9e7453874e472ade60b95af44167d5a6d4e24317"; - sha256 = "0nccb2w3zjgx2w2x207w3100c7c4d1ii22j1qaz3v623d7azn0qq"; + rev = "e17aa19d50284cd2c7ff45ce201f33c06626295e"; + sha256 = "0i7fy95jyi7nbgafb9xxfdgwfgs0cyqagx7s7z3b07sr6p0krxcv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs pcache projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -22847,12 +22784,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "3747e49964fc4e96c41aa10a5553d7ad609e8f43"; - sha256 = "1x3pdk5wgk4cw9qq2l2d0baidnrjxj1qjdp6ajx7hlmwmxl7c203"; + rev = "adcfef22dc9bfa6503513d0a937bf4b32ad7ab94"; + sha256 = "0f3lqw2b9xr0278s7502sa2hkyhml45j8jpssaicyliz2k1kiyzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -23183,12 +23120,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "d9847c7e7c1df384088726217e65a6c0067a67c7"; - sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai"; + rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28"; + sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -23414,12 +23351,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "2.20"; + version = "2.22"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "f0fd4fe8b6cd368cab077177c3eb8be092856b49"; - sha256 = "069crk0xdm061m4jipkgwh1n4845cpa9j7dvg8ngqzrd4j2f243x"; + rev = "b4e03ab345043fa7447dd59e59234dd33395e3cc"; + sha256 = "08yxi878l1hibcsq0bb93g2rjwlc0xw415rgn1rzs3zib2hqj1qc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -23477,12 +23414,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "2.4.1"; + version = "2.5"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "9086bd2241f86488e816682af0ef9897569ab31b"; - sha256 = "1vq3xjllgvzwp18mv2y1qydbbl6j1nk58vw7sm99zsf3wdpls465"; + rev = "e9053ef6a7c9a433f2e5e612ba507459ded2840b"; + sha256 = "00jm904qnj9d6286gfixbcd5awwza5pv9vkisfpz6j7705bjvmap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -23538,12 +23475,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3"; - sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw"; + rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; + sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -23580,12 +23517,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "3831280b746049ab0dd76c4ab1facf35a7e91ff5"; - sha256 = "14wj10yc0qg1g9sky8sgrlimc9a4fxk1jxvmacswb71s51vm906n"; + rev = "a1a5bce179fe694f07d28a75339bf8e4f5b285db"; + sha256 = "0m0k4lb79qy61j0n2a9amx6zz36vgxhadlvyjg9kqg9xwlks5yxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -25549,12 +25486,12 @@ qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "coldnew"; repo = "qml-mode"; - rev = "efb465917f260b4b18c30bd45c58bc291c8246f0"; - sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a"; + rev = "6c5f33ba88ae010bf201a80ee8095e20a724558c"; + sha256 = "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4/recipes/qml-mode"; @@ -25633,12 +25570,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "0f0246ddad7d89205b1babe228c4b132c19dded3"; - sha256 = "0zvv83rrchq92yqi6w14q5m88fva7gcm8q4vhj226acf5iq1xwdm"; + rev = "8ad54e7674e49735390d63e3aea828a4d4bcddd0"; + sha256 = "0xj5iki10cg8j8vvqjlw6lfx97k3agwirhchcjnzbnkry48x9qi6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -25651,6 +25588,27 @@ license = lib.licenses.free; }; }) {}; + railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "railscasts-reloaded-theme"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "thegeorgeous"; + repo = "railscasts-reloaded-theme"; + rev = "c2b6f408606c3f89ddbd19325bdbfc9a9d3d2168"; + sha256 = "1lkm0shfa7d47qmpjg1q4awazvf6ci68d98zy04r018s31isavxr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; + sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz"; + name = "railscasts-reloaded-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/railscasts-reloaded-theme"; + license = lib.licenses.free; + }; + }) {}; rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-blocks"; @@ -26578,12 +26536,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "da75268b1caa973402ab17e501718da7fc748b34"; - sha256 = "0pir76xhi58nqfmjcijn5s7dz3pjjz43g97hh7sd1m32s8saddm1"; + rev = "129cc5dece4a22fb0d786d1309bcba523252e744"; + sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -26743,6 +26701,27 @@ license = lib.licenses.free; }; }) {}; + rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rust-mode"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rust-mode"; + rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; + sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; + sha256 = "1i1mw1v99nyikscg2s1m216b0h8svbzmf5kjvjgk9zjiba4cbqzc"; + name = "rust-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rust-mode"; + license = lib.licenses.free; + }; + }) {}; rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rvm"; @@ -27983,12 +27962,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "2350913f1db3b3744d2ff23c9f0f1676c8c9289e"; - sha256 = "1bz8k56w50mfdsyg3m7x4iibkzv4jiwwlxqlqmxclx9l45hz4ppx"; + rev = "253afc49ff30a19ea1a7af10e1e8abdb46546ac1"; + sha256 = "0ml0fdvgx60vqansh4j17ihkrnyjdndkijysqhqx1q78d97vnhi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -29929,6 +29908,27 @@ license = lib.licenses.free; }; }) {}; + textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "textx-mode"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "novakboskov"; + repo = "textx-mode"; + rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61"; + sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; + sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn"; + name = "textx-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/textx-mode"; + license = lib.licenses.free; + }; + }) {}; theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; @@ -30120,12 +30120,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "5e20a6fbbed0a74a16c834a8e3e7950bdd5a9149"; - sha256 = "0nsh2rz9w33m79rrr8nrz3g1wcgfrv7dc8q9g3s82ckj5g8gxfpr"; + rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; + sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -31320,26 +31320,6 @@ license = lib.licenses.free; }; }) {}; - weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { - pname = "weblogger"; - version = "1.4.5"; - src = fetchbzr { - url = "lp:weblogger-el"; - rev = "38"; - sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4e08837a9af8185951df9b44b9b94a799f0de923/recipes/weblogger"; - sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk"; - name = "weblogger"; - }; - packageRequires = [ xml-rpc ]; - meta = { - homepage = "https://melpa.org/#/weblogger"; - license = lib.licenses.free; - }; - }) {}; webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; @@ -31511,12 +31491,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "fc7482e4a2063697738a405686ebc62d87697ab8"; - sha256 = "1a52pc4iwr2mmby6h16vl436cm0psxnfgd3lhkqbq86sw3p78bx8"; + rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278"; + sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -32284,22 +32264,22 @@ license = lib.licenses.free; }; }) {}; - yaml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "a817e46cc55eb90b7e1dd7cff74e43e080f0f690"; - sha256 = "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1"; + rev = "2ace378bef2047a980fba0e42e3e6b5d990f2c66"; + sha256 = "1wx4gqkg0v0mcykimiihrp4lg2s9qac31w8rw5frbs1r37v3l8x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc"; name = "yaml-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/yaml-mode"; license = lib.licenses.free; @@ -32494,22 +32474,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: melpaBuild { pname = "zerodark-theme"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "0c662244a7d619938ec3673c21c735c19ee4e659"; - sha256 = "1c0r12dnhax5amiy01y0npm57r4wg8ln0ay4bick1f2jgc47g36k"; + rev = "a9fc16f317cade7db85433e66c80ba784e07a975"; + sha256 = "1b5zg2w7nfcszwbqhxan470vvsrpqwddwjj9kzgh6qxcl81y7s1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline s ]; + packageRequires = [ all-the-icons flycheck magit powerline ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; From 4fc5946d5f5b9352dc2237eb9e471d69c1816e7d Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 7 Nov 2016 19:41:26 -0500 Subject: [PATCH 084/295] melpa-packages: 2016-11-07 Removals: - closql: repository moved, recipe not updated - epkg: repository moved, recipe not updated - flycheck-protobuf: recipe removed from melpa - frame-restore: recipe removed from melpa --- .../editors/emacs-modes/melpa-generated.nix | 1416 +++++++++-------- 1 file changed, 751 insertions(+), 665 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index b074e657309..3130ded9f62 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -1549,12 +1549,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "20161007.132"; + version = "20161102.415"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "692ac0816783725600b80b5307bf48a83053a378"; - sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8"; + rev = "a7ef8e703c17c978a82f442c88d250371c5e06f7"; + sha256 = "0gfa1a17wwp66jl0v6pbp9fcn45kp3jsvpd7ha4j590ijikz2yv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1570,12 +1570,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20161021.251"; + version = "20161103.139"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "0c4832d86e87cc2768d8ef6827d2e367ea8de403"; - sha256 = "0449xh64lxng6pkavln4gxkrsrhngm2zmvc7lqawniq4j5j2izr3"; + rev = "01c487419f2785a4573bdd7e49800414a6f83fe7"; + sha256 = "0fxca3mg3335n4frl332ng1zndw1j3dski7gwa4j4pixc2ihi02m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -2365,18 +2365,19 @@ license = lib.licenses.free; }; }) {}; - applescript-mode = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: + applescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "applescript-mode"; - version = "20120205.307"; - src = fetchsvn { - url = "http://svn.osdn.jp/svnroot/macemacsjp/applescript-mode/trunk"; - rev = "584"; - sha256 = "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml"; + version = "20090320.2332"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "applescript-mode"; + rev = "8f888cd80af1e0902b5609143facd3051bc94892"; + sha256 = "0d3bqx6346vmniv001jgd6wggp80kv1kqc38sdgd88862gkqnqyg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/79d8790798305d5e0a75b289c5d8d1b6567c0c7d/recipes/applescript-mode"; - sha256 = "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/576e42b33a5245e1aae0f0d879fd18762342db32/recipes/applescript-mode"; + sha256 = "0rj03xw8yx79xj9ahdwfxicxna0a0lykn2n39xng5gnm4bh2n6z4"; name = "applescript-mode"; }; packageRequires = []; @@ -2695,12 +2696,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20161010.2322"; + version = "20161103.1036"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "31b169150c58b8d40db552094018ed7b053d234d"; - sha256 = "0m9kqyd0krfvp5vliqj3rcdd9j32r4hlxhhvb6mx2lvjxfmdi1wi"; + rev = "82428780ec96e18ae801783f8d7388749fafd5fa"; + sha256 = "17kznp00gs162b205q8mzy6abcf3jrmnqfb1vdv86rk1gzsr483q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async"; @@ -2758,12 +2759,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20160914.1337"; + version = "20161101.1955"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "7e2c683d2d45f0c4901c4c492004b78345425d41"; - sha256 = "1p2vv7cwaa00qnjxhd4d7nv6lms3v0fsnwdpxck1p4a96zcgm0dz"; + rev = "ff2990e56f5ff7abf6c20dac7d4d96fa9090221b"; + sha256 = "1mph3sr9mb2hizx02xn4yaag5h6yanhg5zabrpg5cqz2w6ifagaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2779,12 +2780,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "20161030.629"; + version = "20161106.1438"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "f9a7d4c5d6bdcb0d689d41b6b9c604997b7971ab"; - sha256 = "1v6d9l7db85ql01grx7nyz4516q41rqwyzb85xk2zx6zhx3d99ns"; + rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4"; + sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -3879,11 +3880,11 @@ axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; - version = "20160325.1515"; + version = "20161106.509"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "bc294e47f51c"; - sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q"; + rev = "4d70a7ec2429"; + sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; @@ -5254,12 +5255,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20161031.1257"; + version = "20161106.723"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "6012b4b98c1934e567f74b48b27fd67f46ad2208"; - sha256 = "0xyqjfmi0jnhbb8jwr6q0ynkr20vbi1npxc94kf7ddn2cgxvp0j1"; + rev = "dea1f7e830b38e6b70db5a318eaa269f417444d4"; + sha256 = "0f6yrls2l37rpq932n7h5fr6688vsk32my300z66mszcqfvmr566"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -6357,12 +6358,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20161019.542"; + version = "20161107.426"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "6964b08c9474a2cd4809e66efa646b871139b5d1"; - sha256 = "17jc1jvys1a3rg5hvcwkzcq98slwcidff89f7vri23hks69dc2bp"; + rev = "059b1ca83e58a4ced0a0f1cd1b4e06525fdc257a"; + sha256 = "15bgxdz65wywkckwm9rxf595hc8gabqb2015hwp1n9pa8k511jkg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6798,7 +6799,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11866"; + rev = "11867"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6939,12 +6940,12 @@ cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; - version = "20151203.151"; + version = "20161106.1219"; src = fetchFromGitHub { owner = "darksmile"; repo = "cheatsheet"; - rev = "c4d9af19bf563977dd74863bb70d1aa783952f1c"; - sha256 = "15kam5hf2f4nwp29nvxqm5bs8nyhqf5m44fdb21qljgbmjdlh38y"; + rev = "329ac84def1af01c19761bd745ee4f275003161f"; + sha256 = "0981dkn8vkjyw50cbsx1zsa2nmyhsbz6kmrprj5jd828m49c1kc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet"; @@ -6981,12 +6982,12 @@ chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "chee"; - version = "20161020.45"; + version = "20161105.1306"; src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "e0a001819033b01e95aae81246dbcd5db659695d"; - sha256 = "0w1napa2zmxmh5dvk5sdxl1w7pl27vjjmqhbjxljh4vs2vy2v9zi"; + rev = "04d2104286ca6b92dcc28e448eeadfcc8fb7b548"; + sha256 = "0lwp2hh8rxg1f98hzpdrz91snwryp9fqin9sch1vnyxywfp3g9kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -7149,12 +7150,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20161031.414"; + version = "20161106.1712"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "4e5267fab7765661075c0e79122ec358cfb7feb5"; - sha256 = "0lhs6skd6jvgs9hk1f564mc94cd2fxn56dhnpdwqijrg9a4c06m5"; + rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4"; + sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7566,12 +7567,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20161023.1346"; + version = "20161104.1348"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "85d8c18cacbf9c006deb331867cde65fad90b47f"; - sha256 = "0skbqd38lb0xh55xfd13c80s6xn70sqg67cpvdx6qck644apg4af"; + rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef"; + sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7653,7 +7654,7 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "285627"; + rev = "286103"; sha256 = "09109zh6dx1af4jqdrc448wb5rmjgm6k6630l4z931aqwfw004kx"; }; recipeFile = fetchurl { @@ -8039,12 +8040,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20161017.1134"; + version = "20161105.2359"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "d3034dcbfeb5e818b5a891034a91cbc5eea87a73"; - sha256 = "04qcgj7c4z8cxq7qh25nailqv9sv2ijjbdxipb0bkvp6kvarnmn6"; + rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9"; + sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8064,8 +8065,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "d3034dcbfeb5e818b5a891034a91cbc5eea87a73"; - sha256 = "04qcgj7c4z8cxq7qh25nailqv9sv2ijjbdxipb0bkvp6kvarnmn6"; + rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9"; + sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8141,27 +8142,6 @@ license = lib.licenses.free; }; }) {}; - closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "closql"; - version = "20161025.947"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "closql"; - rev = "c230818f23f0663c5775c4ec05136b8ff5862367"; - sha256 = "0qnxfzancvpn36fq4q0v7fj0p5ra1qm1rkh5yw4ldiz6bj7h6r67"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql"; - sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l"; - name = "closql"; - }; - packageRequires = [ emacs emacsql-sqlite ]; - meta = { - homepage = "https://melpa.org/#/closql"; - license = lib.licenses.free; - }; - }) {}; closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closure-lint-mode"; @@ -8295,8 +8275,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "098a18c476b5e60b3bacc0e47f23359fc4a3ea2c"; - sha256 = "0aqza32r1rwhhrzckprcs7gch55l952007h2n7pf2jx0napk9rid"; + rev = "9df1cb0fa68869f8125025f20fa8c64467aab2e8"; + sha256 = "0p3xi5jhz0k6hf1nx6srfaidckwlw2bcsvb63q9bbchaap17lpia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8330,6 +8310,27 @@ license = lib.licenses.free; }; }) {}; + cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "cmd-to-echo"; + version = "20161105.505"; + src = fetchFromGitHub { + owner = "mallt"; + repo = "cmd-to-echo"; + rev = "b8915d5f0a79767c29f38ccb7b4416390436e932"; + sha256 = "1z79pd169ml8cx6rzyv8gbivdcg49g4s0w4cabw85rv45fd7rpfa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d559cee8b263d3615f48924d62341f1ce1ab2630/recipes/cmd-to-echo"; + sha256 = "0bz0zbzagrz26cvqpwl1pfwayyc49bjawk641yc6kl8gnsnv3z73"; + name = "cmd-to-echo"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/cmd-to-echo"; + license = lib.licenses.free; + }; + }) {}; cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmds-menu"; version = "20160830.1130"; @@ -8975,12 +8976,12 @@ commify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "commify"; - version = "20160724.2032"; + version = "20161106.1534"; src = fetchFromGitHub { owner = "ddoherty03"; repo = "commify"; - rev = "61db2dd77fc68a82767ae71a81a7059a97bcf115"; - sha256 = "0z6zpxrv0c21vv3k4kzahfl32db33h7v1x4ip1adskjdj4pa013g"; + rev = "78732c2fa6c1a10288b7436d7c561ec9ebdd41be"; + sha256 = "1kb3cbjp69niq8ravh273dma0mnkf1v2ja372ahxfsq1janrkkm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fec4b048e1dc78a07acce7d2e6527b9f417d06d5/recipes/commify"; @@ -9197,8 +9198,8 @@ src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "38674bb993874a40c7a7b96f7a3f326d29d34e46"; - sha256 = "06197qn3739bcjzlgr45a3c11xgq151f40g39am5998dj3156524"; + rev = "1929d2172875a27133d06196cd3427b7c475b7c5"; + sha256 = "16zy87nzc0aa7zc9wmbx6x0dxkhcs7q787gwf50s1hkxlw80djgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9326,12 +9327,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "20160331.1641"; + version = "20161105.2138"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "00ff8210cf80b4bc4ec0fe8f42b8a00315241f32"; - sha256 = "1ipknikwyd6h2w72s5sn32mfql4p2cmgv868n13r3wg42c619blq"; + rev = "af70f5d12a38919d5728a32784674e70566cbce6"; + sha256 = "0a1ak43js2ag157mvzyjvjh3z1x4r3r2541rbh5ihwlix6c5v637"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -9435,8 +9436,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "478b96fe0e77b4451b866559e2adb407fbce7120"; - sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3"; + rev = "82514c86ff1b37eb29aa979fe51238846857935d"; + sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9903,8 +9904,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "140079b822452b141ce022bbf082deae17edd6d3"; - sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25"; + rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; + sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -9983,12 +9984,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20160922.1700"; + version = "20161103.743"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "41169a10cc41c0a3e0b9a61fd8cae7f964347ed7"; - sha256 = "1n56g7n4nsqrgyhn9lwwqjivmpllibmpgnvy34gbwifkmnq4wz0b"; + rev = "5a13e7deda80adb40553f1c256531d040a4c99a1"; + sha256 = "011z47hkynss8a56c2fi702laqxicmwai6anald58436pdxi3y6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10234,12 +10235,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161030.48"; + version = "20161104.828"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; - sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10486,12 +10487,12 @@ creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "creamsody-theme"; - version = "20161024.2339"; + version = "20161105.144"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-creamsody"; - rev = "bc8ef72dd2b974354bdb108d73fd5468304d1b51"; - sha256 = "0p7f47n10ckd8iqa9r2gps5yf235v88ssla177fn370j0lnhhayi"; + rev = "a0071bf037a7f2d87097918fe5338e23f4736edd"; + sha256 = "0ch5xm2mnkd7inh7m5ir12w2b6zprzsqsl9asayhd0kpnk7r0yz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; @@ -10715,12 +10716,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20160909.1316"; + version = "20161105.512"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "b87332e7f9fd543e4b3d32ed97b96daf7426c31f"; - sha256 = "138kkwq5dflypz52b2md53jmp3j1z8nyivwf4bs22j5skp4p9411"; + rev = "4516a18c0dd1797a2d1eb2ae3069c0e16efa14a7"; + sha256 = "0v5kd8n9hd3aqd4p1z30rnbqiwxxd1mv30d4bkwrba6k5814qy4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11520,12 +11521,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20161018.136"; + version = "20161106.410"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "b7ba21202ec876775768fca08163e2cbfd130799"; - sha256 = "11kj6hd7cc02b6b32ay1dnzlwq1slvwyv7qsslgcf2kbk7qpsn94"; + rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295"; + sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -11566,8 +11567,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "b7ba21202ec876775768fca08163e2cbfd130799"; - sha256 = "11kj6hd7cc02b6b32ay1dnzlwq1slvwyv7qsslgcf2kbk7qpsn94"; + rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295"; + sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12043,12 +12044,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20161029.1731"; + version = "20161103.1337"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "bc5d373bf22bb2458d5a5f9a9cf1917ab34b32f8"; - sha256 = "1kj8pr42cijk6xzj94hrkbplbark4dqrb0hcy7929ps80zbjqkn2"; + rev = "830a1f10982abe586c9d13685007d191eda6fbdc"; + sha256 = "0fkwzx681df0p4a8f2z6lh5j94vln0i6cvrfzym5v8cdhyhd0p80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -12228,22 +12229,22 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20161023.1607"; + version = "20161102.1726"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "fa74f2f513351464f01a133b145339014811d042"; - sha256 = "0s5rdhghcr26qwk8xlankbivayg5246knbkkaifpy64gpl3v0k51"; + rev = "c476e4080de7bea98a7a9a1173df20397d1c7671"; + sha256 = "185gl1p80yx68d2hzawhrz26zy75z30qr1lb7c0gzmk5ryy5yzgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl"; sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6"; name = "diff-hl"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/diff-hl"; license = lib.licenses.free; @@ -12356,12 +12357,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "20161008.1332"; + version = "20161023.1329"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5"; - sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw"; + rev = "c91edab065f413910354940742b35bdffeb52029"; + sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -13875,12 +13876,12 @@ doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20161009.1630"; + version = "20161103.1722"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "af85fb024a5d18852cc86ad791f966e77aa7e4ad"; - sha256 = "02rpcziiqaqfzj36aldcpx9z5r8bz1ngp6fqwdya8jxpzydvcz9a"; + rev = "6a33ec057419e14ef0494e5ed1291cff4c8723e2"; + sha256 = "0c5v0ry6bk47hb90ghry96arvdzdhfidy0d9ffslxdf0j7zfw4i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14216,6 +14217,27 @@ license = lib.licenses.free; }; }) {}; + drone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "drone"; + version = "20161106.118"; + src = fetchFromGitHub { + owner = "olymk2"; + repo = "emacs-drone"; + rev = "1d4ee037ad3208847a4235426edf0c4a3e7b1899"; + sha256 = "1dwxgzf32cvfi7b6zw3qzamj82zs2c0ap6i1w0jqqgzmkz20dqvf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3b62e697798627b07000ac72c19ecd1d89c22229/recipes/drone"; + sha256 = "0wjbmgic715i4nxk90nasfamk04lskl8dll9y5klk32w1lsj546q"; + name = "drone"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/drone"; + license = lib.licenses.free; + }; + }) {}; dropbox = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, oauth }: melpaBuild { pname = "dropbox"; @@ -14302,7 +14324,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1767359"; + rev = "1768508"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14361,12 +14383,12 @@ dts-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dts-mode"; - version = "20150403.1604"; + version = "20161103.523"; src = fetchFromGitHub { owner = "bgamari"; repo = "dts-mode"; - rev = "6ec1443ead16105234765f9b48df9b4aca562e61"; - sha256 = "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l"; + rev = "9ee0854446dcc6c53d2b8d2941051768dba50344"; + sha256 = "1k8lljdbc90nd29xrhdrsscxavzdq532wq2mg7ljc94krj7538b1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/864a7ec64c46a0357710bc80ad4880dd35b2fda1/recipes/dts-mode"; @@ -14487,11 +14509,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20161015.530"; + version = "20161103.628"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "6ff00cc2f12b"; - sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3"; + rev = "18cd7ba257ca"; + sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -14843,12 +14865,12 @@ easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }: melpaBuild { pname = "easy-lentic"; - version = "20160727.2025"; + version = "20161031.2119"; src = fetchFromGitHub { owner = "tumashu"; repo = "easy-lentic"; - rev = "751a1d717840d9f526f26cf43e88d44981a6b14f"; - sha256 = "027w2sjagv74g9bx1k4w2f79fmxwvdsk2625abjlv7mly3aigzyy"; + rev = "6f43c8d575274349757173b9bcad3bf5b59300ac"; + sha256 = "0jw1m2ff23b99rz137ndy0gjbk3fs7srsyjd8f8fssl4xm8mzb39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic"; @@ -14927,12 +14949,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "20161029.1119"; + version = "20161106.2351"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "cbe1e6dad9fe5a1fbe48e2f74d734c82d920be88"; - sha256 = "0w58jfj4mnhniq6n78y1yffs0md2xnrs8d1iqn34vagnp9zlr589"; + rev = "4617ea9cc952ab63dddf8a38ce21ae32442f51f0"; + sha256 = "01f71sxbif5hmgfd9696cwp541a93138d00y58szl1my0wxk0j4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15365,12 +15387,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20160904.1508"; + version = "20161105.2212"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "bf3bedb6f3740b1df20d7ab344c16984b141eac4"; - sha256 = "0aam813888m3smnh8ycmsmlb9nlkrxfv9myd7crvjgbsc6413bnp"; + rev = "0946f6672d95a943f1071e678aa91af6e614a143"; + sha256 = "1v5gf3jlb7pi08yjcglghsrwzvdms3r2cpgg2hzd2panwm623wz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15525,8 +15547,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "1d5b34e4813000b61255f56af15d005a5947ef92"; - sha256 = "19jdix3r1pl2p6v9jrhgpf3h0fdl74js8xrj83c4lffhi3ry5w3x"; + rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd"; + sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15712,8 +15734,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "2e03d2d12af7b38c92a89ab6f61dd69f163fbd90"; - sha256 = "1csxihkh874p8jm0ndhwl1pnk3k5jdazxba439rzd8ni0rppsi4q"; + rev = "4b767b8565c5090538b1d73500dd50f2102150cb"; + sha256 = "1ddfz4b0bphixg3maa4mrbjc82q94s08pz0990b4pgqgh4als7sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16786,12 +16808,12 @@ elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-separate-buffer-list"; - version = "20150521.2345"; + version = "20161106.1958"; src = fetchFromGitHub { owner = "wamei"; repo = "elscreen-separate-buffer-list"; - rev = "1aa66cdbf2b1dc87689725aef004a29bb79dd0f9"; - sha256 = "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f"; + rev = "7652d827aa1b8c1b04303c5b4b0bda5e8f85565e"; + sha256 = "1cpmpms3r9lywmxgciz4xq7vjw2c1mxmpd89shssqck16563zwxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f5e5c8e2cd45a25e47c74bef59b9114aa7685eb/recipes/elscreen-separate-buffer-list"; @@ -16828,12 +16850,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20160523.528"; + version = "20161104.1831"; src = fetchFromGitHub { owner = "tarsius"; repo = "elx"; - rev = "0f80390bcf2a1dd9a3ba609e92f50a4a3463036e"; - sha256 = "07k8kq444ki7pxbz3vnrwqgycm9hfcdxgsnvf7qihqvzs2y1qm3d"; + rev = "84c9cd5721be9594de743330e7abcec092d2838c"; + sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; @@ -16933,12 +16955,12 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20160824.1308"; + version = "20161102.1605"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -16958,8 +16980,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -16979,8 +17001,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -17000,8 +17022,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -17101,12 +17123,12 @@ ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ember-mode"; - version = "20160609.539"; + version = "20161105.855"; src = fetchFromGitHub { owner = "madnificent"; repo = "ember-mode"; - rev = "9ad372808ded188b8741e7e6864f88e170232be1"; - sha256 = "0if1h4vcajkhjy56d5zili3i2bvgxhhkhhgf6l37bnnly243zr3q"; + rev = "3e45cf3e290ac422c1b9713f3e7db5c634bcdaf2"; + sha256 = "0g6xmqrjqzwl67ij05lwk72fdhm77p3b45jf7vc8xfn050nvn06l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode"; @@ -17288,12 +17310,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20161002.855"; + version = "20161102.940"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "2fcc970436142b8f4ce4911f2a04680fc77699b8"; - sha256 = "0ncax0vlgdah8mlqi3kr63ymf45bngr38vk6m6q3i2wdx6fbrxm9"; + rev = "aa7e2af7f2a40ae9691d8d8183060c947f4ba55e"; + sha256 = "062s55qhznd04vas602zzgxba3wd9yvx489ww7qjssj4wqgkckb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -17573,12 +17595,12 @@ engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "engine-mode"; - version = "20161009.1718"; + version = "20161104.650"; src = fetchFromGitHub { owner = "hrs"; repo = "engine-mode"; - rev = "5d6c6495b31a8029b5122cfe9790c1c2609dd731"; - sha256 = "1y23yj749i14r373cfymqw6bakqvrsdgyjn91i0rp51y1rzdpp3p"; + rev = "9a1271b0051b9c939a63fa395cda2b5b64c5f36b"; + sha256 = "1nvf7anv2yplfhs4xbvrxdgd3mb41mzv4y1119lrqfvhsfd07ii5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; @@ -17682,8 +17704,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "8f3f3f1e46aaeaabd87748c8f89c2bd4bc420dd0"; - sha256 = "0z62lmajsf2f8027lncv8bz1hwpfl2x84l10gx0qs6pdj59x1c5a"; + rev = "0dedd95b8e9ad09be9521160a7893eb58514c992"; + sha256 = "1xsbw32fysl3pdxbnczdgczbrhl3qqghgk5mcbb1j4a7rnp4js3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17788,27 +17810,6 @@ license = lib.licenses.free; }; }) {}; - epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "epkg"; - version = "20161028.1231"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "epkg"; - rev = "979cb9cd6143a3672b4b175073ec3a8cd22d3863"; - sha256 = "00xqqnvp13ipbw1ilx42pb670z2h8rlvdpwa9cirkmvv8c54wkji"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg"; - sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q"; - name = "epkg"; - }; - packageRequires = [ closql dash emacs ]; - meta = { - homepage = "https://melpa.org/#/epkg"; - license = lib.licenses.free; - }; - }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -17938,12 +17939,12 @@ erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-crypt"; - version = "20161029.2101"; + version = "20161105.623"; src = fetchFromGitHub { owner = "atomontage"; repo = "erc-crypt"; - rev = "2d7e5bec956f17203b916772a980c8115d6c70d1"; - sha256 = "0k77l8mj28c0z5d9wq07sblb4w1z0asy0vdxpl74n6r68sr66y57"; + rev = "d30f426b4cae10efcb91ea57afa9cc51feb4c39f"; + sha256 = "0r9n9jhd0sbf1mf3mzizaal5kqd20msm20vl73z589ph2q5vxnii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; @@ -18210,12 +18211,12 @@ ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: melpaBuild { pname = "ereader"; - version = "20160924.1342"; + version = "20161103.1834"; src = fetchFromGitHub { owner = "bddean"; repo = "emacs-ereader"; - rev = "d673666315075e449b5c555a06ba50ae8cd8cad2"; - sha256 = "1pkjm4dh4ly4angbcnn3cyyyxpc3h38b4jlyx4050nabim13vh2k"; + rev = "af00d57441e6fe92d8f03d2557f4dec0a410e5e5"; + sha256 = "1rgh2p8sz4hcqavalm48dzp1gsnccmc8zd27rv1a4xhaaihw23cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader"; @@ -18319,8 +18320,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "056789659edec99e5500c4508f00460b98d6c73f"; - sha256 = "10p04f4r9qyqlwxlvjcfhblgjh565108bvxxqjqcv34651qdvikx"; + rev = "3e06b82f0f29d90bff0783e7f3d1dabb435782f5"; + sha256 = "1i6zjj4pl5cdvqxv2ghcm0dml3jdm82hk3yp4l20zs49i1j3f43p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18458,12 +18459,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: melpaBuild { pname = "es-mode"; - version = "20160927.1351"; + version = "20161103.1024"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "b2e4403197834c06bf47a9b72b57a65a28589fbf"; - sha256 = "19wzyc8qxdgm69k3nrv6x1yi3lajyxp1xhm6w54x14yqw2l8d67g"; + rev = "673506ec3d9eedc06f1e9f2953ac2720bf66f992"; + sha256 = "07r7zr38hqv0njc8zwdqmslh422kwahri2s7gp56abfk6wc0ndkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -18836,12 +18837,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20161022.447"; + version = "20161101.215"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "c5282d4dc4d6fc07155e694d8a0f33e100c7697a"; - sha256 = "1lywwy0lhsjdd5sxm1i69np98l6y1ya3s44ga8fkm2zg2yl72wcb"; + rev = "bcb5fff9e9fc4f17f780149c6ba38002ce044176"; + sha256 = "1h3jlfblwsrqzw98lw4dq550zidab1f6l557fdcjkqlgjf74c4bb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19316,8 +19317,8 @@ src = fetchFromGitHub { owner = "wbolster"; repo = "evil-colemak-basics"; - rev = "77dc58134233a2e044d0a2d4a5abc46c28470850"; - sha256 = "1k7gmivs5dpk672hjxkkpjlxzxd69133rkdchrhjk95nz0sdzq0b"; + rev = "69fd9db21bb2a281d5232d45555714b195825043"; + sha256 = "16g7322ib53cd8f12mqw25j77g0q8vivnc6q483i5kvaivnbqvd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; @@ -19337,8 +19338,8 @@ src = fetchFromGitHub { owner = "bmallred"; repo = "evil-colemak-minimal"; - rev = "334a1809ac4d3af3aeb8a18ca05c96c0c6ea6ad1"; - sha256 = "0608vcj2birsfm12w89gnpmcsalcpva61qkhh7m4kxqafglq7bzf"; + rev = "5f1db93959359d3efd57abb5a0d06e94dec92556"; + sha256 = "08dfmny7z03h6hbj21f344jv9kpzlzk31j5sd78w1c68mgx9hj6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal"; @@ -19442,8 +19443,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "evil-embrace.el"; - rev = "9c40afed6603bf6367b58fa1ccf8aa6feb66eff3"; - sha256 = "05hshgfkp8lkmz5bky95ky53jdb869w3x3sv30lq7qc6b7qxrjfg"; + rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7"; + sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace"; @@ -19753,12 +19754,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20161025.1223"; + version = "20161104.859"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "bb6733d5ac08dad8754507c642f6a03f05f339eb"; - sha256 = "1xbkai747ql2kh6g80i35hgfbaqv9is98qxcw6g8zzvl8rrwkh4a"; + rev = "494cbf6fc0eba4cbe7b6dbd3c75add14e2aca63c"; + sha256 = "06ywfq7vwqhqf9a715wfbpvl5va7sj6dfavizi4xjzaysmg8sn29"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20047,12 +20048,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20160928.508"; + version = "20161103.1020"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "eaf97a09b38024d6bc7d44db5734bad16716c66a"; - sha256 = "1inw88n96wki9mja9xvdfc0qpwffh0l0kjnxpka5636sl7pl4i74"; + rev = "c3b9db1628192299cc3901ff21aec316bdbdb1b8"; + sha256 = "19s0d2c9d942zqi5pyav4srn0cn4yrdhd2dlds4pn7qxmvdkvyvb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -20278,12 +20279,12 @@ evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: melpaBuild { pname = "evil-vimish-fold"; - version = "20161017.1837"; + version = "20161103.333"; src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; - rev = "37fa430eb435ef6a6ac8ac01a6ea0102f5d751c6"; - sha256 = "0g9r9b95b3g5p8wcd0r5akmdxb7vb4wp8fj75dc5v3frgfssd1pc"; + rev = "674a8a894e4ae7e7f4b2608b0c9f801a548c69eb"; + sha256 = "1v2yr5q9c239xf002ymgwndmp5yp617rj7shw2zvfl13d7x229sg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold"; @@ -20383,12 +20384,12 @@ ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ewmctrl"; - version = "20150630.138"; + version = "20161104.1833"; src = fetchFromGitHub { owner = "flexibeast"; repo = "ewmctrl"; - rev = "4e1ad0d54bccf2eddb7844eefb8253440aa80f28"; - sha256 = "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv"; + rev = "ba1879cc803a63d5a4047ec6f2990e369ae5af3a"; + sha256 = "12h2fgabfmaq1cpr7y7ckyyfgy53ww3v25p2kk5fq77rn40zbniy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2a7679f0961b171bf23080e628ae80f50c446e4/recipes/ewmctrl"; @@ -21993,12 +21994,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20161030.316"; + version = "20161106.149"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "f8c20f4f986ba79f1e6960d3bc59498e6fb5eff3"; - sha256 = "09ydncdd8jkh22mfdq3ykzrxrscf05ks5dp1x6frv5ybf4dz33ql"; + rev = "f44a5f7d6f0da7f656b6167f566b72cdd7c62dbb"; + sha256 = "0nyp7aw0144klm5mkq21lalma25g0pqs1y2f7j7rv6phg4mmnk1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22788,27 +22789,6 @@ license = lib.licenses.free; }; }) {}; - flycheck-protobuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, protobuf-mode }: - melpaBuild { - pname = "flycheck-protobuf"; - version = "20160211.700"; - src = fetchFromGitHub { - owner = "edvorg"; - repo = "flycheck-protobuf"; - rev = "3d4c71b535bb456045e4d0e88d63791dbe2093b5"; - sha256 = "1adcijysw4v8rrxzswi8zhd6w99iaqq7asps0jp21gr9nqci8vdj"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8f8d8e4d849400823d738c198665d46fa24d7661/recipes/flycheck-protobuf"; - sha256 = "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc"; - name = "flycheck-protobuf"; - }; - packageRequires = [ protobuf-mode ]; - meta = { - homepage = "https://melpa.org/#/flycheck-protobuf"; - license = lib.licenses.free; - }; - }) {}; flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-purescript"; @@ -22984,8 +22964,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "140079b822452b141ce022bbf082deae17edd6d3"; - sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25"; + rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; + sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -23820,12 +23800,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20161013.401"; + version = "20161106.702"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "741a94586651d8f07bbfa939de25e3c2d76444a7"; - sha256 = "15fns0wpvj0lgq3ax14zhqkpfbkss68zib542cppnnl3q88jvbf6"; + rev = "ffd97a5a3663103aa96945bb1d2f03481ab6229f"; + sha256 = "1f5q99mhhcb75v2c06sxbg7psqclnlqci7fjaa484a8hyback24r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -24313,27 +24293,6 @@ license = lib.licenses.free; }; }) {}; - frame-restore = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "frame-restore"; - version = "20140811.1409"; - src = fetchFromGitHub { - owner = "lunaryorn"; - repo = "frame-restore.el"; - rev = "3fc6a84d1629f3c219bf3fd4309b2253fdcc99b5"; - sha256 = "11k3jmabf2i5ivb5gk19k2ij3svfzwlwxvrxaby1k0isp537fabr"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50ab397e8841f686e098caf6dae5dfafb0550581/recipes/frame-restore"; - sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm"; - name = "frame-restore"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/frame-restore"; - license = lib.licenses.free; - }; - }) {}; frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-tag"; @@ -24481,12 +24440,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20161031.959"; + version = "20161103.300"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "d5b9fde6dec186972f6ea457582504ca813b8778"; - sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879"; + rev = "cb70988aae85b03a26be9b3e2a70742658ff2502"; + sha256 = "111mz7fgacmfvrbv32yzmmxmx1pf7xb6rj7n7pwz51raid7a23p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -24534,8 +24493,8 @@ version = "20161007.2213"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "e9cd20604c557ced77c19393da43a4a0821c2e37"; - sha256 = "1np02migjmwj3l1jajjafw35vqhshkwizdx30kl474c5f5iibk1i"; + rev = "bbcd039c6cb4f73a2e0a262eb32a7d100f4aa40b"; + sha256 = "1rjfzw4l0cykfvj1hlzayzn63iyb818i7a591fcv4sbviqcg9c65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -24963,12 +24922,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20161018.819"; + version = "20161104.1437"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "ae3c4e653c89dc3455f4cd8e75eb53fe41830de5"; - sha256 = "0lw189b05aq5l12qrb54wm2rw8dvcpw7ryx5ank7kbaza0nmx0mx"; + rev = "e628ab784703410e1451616953fcde9878d00301"; + sha256 = "1al3m9wgqbq3lkqw81gy0h15d4jis392nfdpybf5s0bvxbpfm29l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -24984,12 +24943,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20160921.520"; + version = "20161104.1235"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "4544040b3498d7f734ecce251708cd70089cd63b"; - sha256 = "07gh8awa37g7kyj3z44ffir98l5rk5zpk19a59b9s9jmkz1zixhg"; + rev = "3e19cca8452e3461d7797d63511ccb77cfb0e4a7"; + sha256 = "17lmg5qlakwm09j32fpkvwcxfzrkx4l16iiw38lbrlm505qnzlh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -25110,12 +25069,12 @@ gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20160728.1525"; + version = "20161102.2016"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "87cd3e9dcdefeb1a6d781a3fad78eaeb6ef2ac7f"; - sha256 = "13wch5vp837nvw2ilcv40j3q9j6dx0j0a3q74g23vy3sn42r8znc"; + rev = "ed4c8a7b3c347c7c6680bd39c7f4ca632030eb74"; + sha256 = "0h5mkjipq9yw2djdq61kwp1g8bgkmqnkmgzzkg0vk1ix7crqbjif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -25156,8 +25115,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "a0ff7155e6a567db5a40a4f22c479b27cba25248"; - sha256 = "1sbx7sx4j9cvi5h004z2hhyaxp2qi1mlxwsfs8rmn5vw7djl40j1"; + rev = "9ef3e67f219ab24246f0e73246f08533ff53b9cf"; + sha256 = "0v5bibr5mhllgsh2j3cjl8nh4x7sqjlyydvy3vl1zxhxwrx825iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25450,8 +25409,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "63e2c3af0d39530802dccc5d23df293753947a6c"; - sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr"; + rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; + sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -25506,22 +25465,22 @@ license = lib.licenses.free; }; }) {}; - git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-gutter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-gutter"; - version = "20161030.1851"; + version = "20161105.656"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter"; - rev = "0e33154a7d78bd7739fe081537dea49e309fbdd2"; - sha256 = "0q6cx0v2b96abxspx6czahvsccz3rsaqvphrhfv6gn6p1b95a8fi"; + rev = "00c05264af046b5ce248e5b0bc42f117d9c27a09"; + sha256 = "1c7byzv27sqcal0z7113s1897prxhynk6y89mq1fjlxmr0g20vzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg"; name = "git-gutter"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/git-gutter"; license = lib.licenses.free; @@ -25828,8 +25787,8 @@ src = fetchFromGitHub { owner = "10sr"; repo = "github-elpa"; - rev = "2c813e0092acbe2fdeccece6f57d2a95ff85e0cd"; - sha256 = "0dlndpybh166dkjqcbqw2qwqqa9dc8g974nijyas74gi17zw93q9"; + rev = "7619a564edb1985b0487786a3b4ec6d12f897b5b"; + sha256 = "176x0dclclpa6am091f866ybqhhdnlq7jgsik5b5m74dl26bcxcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa"; @@ -25866,12 +25825,12 @@ github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-notifier"; - version = "20160702.2112"; + version = "20161102.755"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "github-notifier.el"; - rev = "7fa3e5fd519711bcc241af73abc72fd0b6c1b3a9"; - sha256 = "0mi2yn6b1vhs4zdwqzyifi20bjy3ac0ycvza7ybvwanbkxb1kmfh"; + rev = "12621caa8d78bf2b559d2113ef476a8f2c2a4e0e"; + sha256 = "1cwabnm6nirmrwdq14l3pqdjh40h49icbfjx3z86rppp7cj3dmlm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier"; @@ -26076,12 +26035,12 @@ gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmail2bbdb"; - version = "20150909.1839"; + version = "20161104.2041"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "gmail2bbdb"; - rev = "f0e23a1262bb683285b381b1d142478ba345af1a"; - sha256 = "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z"; + rev = "181ef6039227bb30a02041d8cfdc435551a7d948"; + sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb"; @@ -26392,8 +26351,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "478b96fe0e77b4451b866559e2adb407fbce7120"; - sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3"; + rev = "82514c86ff1b37eb29aa979fe51238846857935d"; + sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -26535,12 +26494,12 @@ go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-guru"; - version = "20161013.1055"; + version = "20161103.1316"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "965dcbc5eb06d73cb700724535dd449a00082b84"; - sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin"; + rev = "adea2e5149bb976f956d994a0a9e510167481e72"; + sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -26581,8 +26540,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "965dcbc5eb06d73cb700724535dd449a00082b84"; - sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin"; + rev = "adea2e5149bb976f956d994a0a9e510167481e72"; + sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -26665,8 +26624,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "965dcbc5eb06d73cb700724535dd449a00082b84"; - sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin"; + rev = "adea2e5149bb976f956d994a0a9e510167481e72"; + sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -27187,8 +27146,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "1a7df5e3b156e6f9a3da8402147b0bb32dc3a185"; - sha256 = "0f14z2yzf76shkwjwfypbdgdrll6mn4m9fm7r15bwrdzm5f72d9k"; + rev = "aac2f2f2927d6a95d507538f70f94a142cd83fd2"; + sha256 = "1vik0fh9hi81d8pai9sz9h3nrn7qkyhp289hd9p8cflkz7g9cd6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27430,8 +27389,8 @@ src = fetchFromGitHub { owner = "davazp"; repo = "graphql-mode"; - rev = "7798aef2a8d369d0cf6a3cbf1f85d2495969c253"; - sha256 = "1phmpj77hv2f5cq6685r6nngp2c5ssml55w7mdh4x4yji5mndn42"; + rev = "6e1f5335fa0b252b2bc422a837b82fdc82492eac"; + sha256 = "1x47abqqsry5f0ww01hp3470rqdzzr3yia8ljqq3ixpbnspp5q83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode"; @@ -27489,11 +27448,11 @@ grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grass-mode"; - version = "20160317.614"; + version = "20161102.621"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "25414dff1fc5"; - sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z"; + rev = "fe70088c54b9"; + sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -27840,12 +27799,12 @@ gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gulp-task-runner"; - version = "20161030.646"; + version = "20161103.1523"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "gulp-task-runner"; - rev = "72ac9e8b2e69d7348e10003f4b434b7b96856781"; - sha256 = "0iamindbxhqiq8w6rkjway35nv2df347bsfakszzk68ggl2i73xh"; + rev = "f13da9e619c1838571df0a0462c273ed6e76defc"; + sha256 = "1xai81v7c58hy9rh63kxybzmlyfkv0m7qfdp7zia60ml5xhib31r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; @@ -27903,12 +27862,12 @@ gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gxref"; - version = "20161031.451"; + version = "20161101.633"; src = fetchFromGitHub { owner = "dedi"; repo = "gxref"; - rev = "ddcd81ddcddd1715c8363848bf9d49553a91f148"; - sha256 = "1irg6jrk6wq6gzfbx79993qc82p9ilrs9gnz96hghrk2m8maizaj"; + rev = "24bc54ff2f8756609089f5f48f34d718db629381"; + sha256 = "184dnbg7sddck39qhnydzaa4sxxnz6mcicjb9n1632xlyg6q5wrl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; @@ -28281,12 +28240,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20161027.139"; + version = "20161101.751"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "cde6c60b0e511a7e22290542c4e8e5bb9b253cd0"; - sha256 = "0xpp1n8x9359139cndqpmggf18d6y2zlvwh96i0dqwqq3nniplxp"; + rev = "cc432999b49bf9bb8844375436381b21f0344ebd"; + sha256 = "1dgkz5drnkdqm8lbf9d6qh35xlakzizm61yq6qkifhyisxlkg1rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -28549,12 +28508,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161029.1047"; + version = "20161106.2328"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "12c5de20c8d224820800eb6eaf6be9e2e7ee42c6"; - sha256 = "0824rmbcw3ksdyvm9j2z6r825nshjhqsffj75lrnxsfrk4978cgy"; + rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9"; + sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -28633,12 +28592,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20161025.809"; + version = "20161105.744"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "7a687f97e0ae7cb4cc4520aee9c97f84f2088ed9"; - sha256 = "01bl45i841h8n0ndjyj472m7w3pv0mnzmw8fy9ggbh8rcbhr61wp"; + rev = "34cddd7591e2b68bc91215da8f31036d83525909"; + sha256 = "0yr35rkfidly57fklacvh03yvpb50nyhj3cb0d1yg2xmm6civ5gn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -28738,12 +28697,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161031.258"; + version = "20161101.2345"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "46285116549fec9933fd035067773f5084937526"; - sha256 = "0vx6i1as0mxlzgzk183dg71wj6y693r1fn5j6q3xbhcpglz1f19q"; + rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462"; + sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29095,12 +29054,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161028.2141"; + version = "20161107.47"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "12c5de20c8d224820800eb6eaf6be9e2e7ee42c6"; - sha256 = "0824rmbcw3ksdyvm9j2z6r825nshjhqsffj75lrnxsfrk4978cgy"; + rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9"; + sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29620,12 +29579,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20161016.407"; + version = "20161105.813"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "21ae7521a6ea0268b88a95c15c5ceb46851a44d3"; - sha256 = "1vx94f1vx0rj9by74q8gmxf06kjska06l3il4qzpsn2wasky2pr3"; + rev = "b0bb524d6c69d1d43729d68dbd28b67a723a4b90"; + sha256 = "0n7xsrblnl9awvljczg4a6g00bczw47q69fnmqwk76ndigyhx8n0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -29701,22 +29660,22 @@ license = lib.licenses.free; }; }) {}; - helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }: + helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-go-package"; - version = "20160321.115"; + version = "20161102.1853"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-go-package"; - rev = "469bbbe4c6cdd4c80444ece10f07cfb62fc4f13e"; - sha256 = "0iyfn58h50xms5915i29b54wfyxh6vi9vy3v3r91g6dwlxrjibka"; + rev = "e86914b0469d390f908b44401a31b1825af0b10d"; + sha256 = "1vxfc6dh1dahxvzz5vchx5gj33f8dyz7gqa5j1xcrxs49bqca7ad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package"; sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6"; name = "helm-go-package"; }; - packageRequires = [ deferred go-mode helm ]; + packageRequires = [ deferred emacs go-mode helm-core ]; meta = { homepage = "https://melpa.org/#/helm-go-package"; license = lib.licenses.free; @@ -31484,10 +31443,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20160617.617"; + version = "20161103.1410"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight.el"; - sha256 = "1g0csgabcaxfvv92bmqkmyqp2jlal8gj6c6ghz83a2r185ba0jji"; + sha256 = "15l0bg0pa24bm9lg3f8ghf326k5k5sa1x4lpg1749asvj5q8bjk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; @@ -31894,8 +31853,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "ed127251c80be3c1606913868fea09683ed0e8fb"; - sha256 = "1xdnvfq32pj5gkmwr32wa8ly5968kkibirhvaviy3wq2dzs2qbb9"; + rev = "295246ef496f3f2bff45a098433f171e0350b889"; + sha256 = "0g5k67znhzvxczby8pq8hcisjcgikf7yv2pwxz62cspfr2ylhvwk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -32196,12 +32155,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "20161008.1357"; + version = "20161102.1337"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2"; - sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982"; + rev = "a23312464fc6462d559462a44cd74735e9f73421"; + sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -32217,12 +32176,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20161026.710"; + version = "20161031.709"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "589f0d36b9bb15665d84f0fc7bb401928d704449"; - sha256 = "0bid6y0nyikwzi1nqczds2p3p7glm7hiwj0mgqfminpyaldvgfi1"; + rev = "912d78a9e211f588fdb59a487d6fae3e13089023"; + sha256 = "0fnd2y0w07k0rz6k3ghmk9jkx2mzdymnizrbx4ykysqdwwwnj4lw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -32527,6 +32486,27 @@ license = lib.licenses.free; }; }) {}; + html-to-hiccup = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "html-to-hiccup"; + version = "20161028.701"; + src = fetchFromGitHub { + owner = "plexus"; + repo = "html-to-hiccup"; + rev = "99217a5058626d253ed8ada51a7642071fe54ba5"; + sha256 = "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/55a0355077a16f82b45113d37a10b26676f5f507/recipes/html-to-hiccup"; + sha256 = "10d0fafqn6f1mwjbx8zizkc5ql9njs4f3ghplirqy82cx4w8rgbq"; + name = "html-to-hiccup"; + }; + packageRequires = [ dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/html-to-hiccup"; + license = lib.licenses.free; + }; + }) {}; html-to-markdown = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "html-to-markdown"; @@ -32947,12 +32927,12 @@ ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-vc"; - version = "20150714.1320"; + version = "20161103.2358"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-vc"; - rev = "daae8b8cec4b8e572b065e00c8c8a368fd0a8b8b"; - sha256 = "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp"; + rev = "de75fb3345384fe13d0500435241ca4a056f5fc7"; + sha256 = "0c8y53aim35v88w5h4zn49187j6v8j7frxlhcw8crfxi1v6i7wdh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc"; @@ -33550,12 +33530,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20161010.710"; + version = "20161102.707"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "7965a00a33155588c55c597db84d89e5eb266acf"; - sha256 = "161sncq7x3flnbqd0ag4fg8yb299qkj5ri5hj451p1nz5s7hibfi"; + rev = "4c70405ffcb54157f43662ed5a561a96e08777d6"; + sha256 = "095l1vv0q5xzvxwksnjl4llj9w79ih341xayx84l45m06s1a8j5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -34021,22 +34001,22 @@ license = lib.licenses.free; }; }) {}; - import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: + import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "import-popwin"; - version = "20150716.233"; + version = "20161105.849"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-import-popwin"; - rev = "34c3b34ffcadafea71600acb8f4e5ba385e6da19"; - sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w"; + rev = "6a21efc7fd44f8c2484d22eadf298e4bfd4bc003"; + sha256 = "1h4c3cib87hvgp37c30lx7cpyxvgdsb9hp7z0nfrkbbif0acrj2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin"; sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy"; name = "import-popwin"; }; - packageRequires = [ cl-lib popwin ]; + packageRequires = [ emacs popwin ]; meta = { homepage = "https://melpa.org/#/import-popwin"; license = lib.licenses.free; @@ -34049,8 +34029,8 @@ src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; - rev = "69e1cd78f7379ff3f2c3d2a9f31610ace645bad7"; - sha256 = "0cmjfil9jkjjx1n6lx9d5g99bq8dlx7sqnmkvimw581m96ca040g"; + rev = "2f764164d0ceb5dceddd8642447b74939d98d583"; + sha256 = "0g4ddx741liazyc16qh65phs8ic00gmxv768yhyhrns7f6hfrq5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; @@ -34233,10 +34213,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20160702.1343"; + version = "20161031.727"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0rpkfzsas76qp7a77hf60gkdlisbgcf1apwkkzj2lp1dbkncbx30"; + sha256 = "11kili1v46sji4ymdz1a3fx159hzdk4r39irhlsmxy3zrnzwlaxj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -34545,12 +34525,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20160825.953"; + version = "20161101.256"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "fa2c32c7b55b6f7ea5900e89c9a749469501a9b6"; - sha256 = "1slf22a044iirn4p5rw1hvgg1grmhml4rjk4g74xbsg68xiyg6ma"; + rev = "f0707fd914d547e88594b3208a216ddff9664a97"; + sha256 = "0xk62r0fziyybr5ivvl6yyknfv98b60nw66swz65ld9w3ld8xlpp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -34836,12 +34816,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20160925.1030"; + version = "20161106.830"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "4b63b809c9643b90d396cbcc1ed0a53659888f4d"; - sha256 = "1mi838x36wi2jw4i64hcdlfi2ji76sqr5v832h0z8x2in40zrckf"; + rev = "bfe703a4c0e91a960c606bf2420b1f118e53a0a6"; + sha256 = "1dy0as8n5syf4cbpdpw7fpd205jzkj0k7av1c73nxvd4zd28pxj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -34898,10 +34878,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161030.1449"; + version = "20161106.1457"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "0jnch3c9zhil6k4dm4qgqf896vrmbfg7dlhqivlq6iij4a9mzjpg"; + sha256 = "0bg6cy0yksklb929xxrpb6qyzkfbix7d5sgl48hfr4am0y3qgqi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35128,8 +35108,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; - sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35145,12 +35125,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20161031.258"; + version = "20161101.2345"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "46285116549fec9933fd035067773f5084937526"; - sha256 = "0vx6i1as0mxlzgzk183dg71wj6y693r1fn5j6q3xbhcpglz1f19q"; + rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462"; + sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35212,8 +35192,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; - sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35416,12 +35396,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20161028.901"; + version = "20161102.1441"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "b944e8e88a209a15d3a7fc163de3345d9dd8fbf6"; - sha256 = "023j5majib0xb2xi8nk4grflfrwya8g1sxvrdp4qa3md5pwp9nfs"; + rev = "87697c66f883f07ff3cf646ff182a7edb49b957a"; + sha256 = "0cb17p1g7zm1cnxzfb520v7v430x01df0s6g8xi05y197kd99lbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -35752,16 +35732,16 @@ jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jdee"; - version = "20161022.612"; + version = "20161106.1043"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "788a75abd2df6bfce1073cdd2c39ccb58586360b"; - sha256 = "0iycwrcj4r9nncikl9hrqjg6snwwl7q2nv2x4fixzkkhs8f9gyah"; + rev = "28fd7e8045387c4abeecb73623afad366417de07"; + sha256 = "12qj3r7apylh0qccqsr6lqlfbrp6xz3hpqrk2gqd3b01j0hp4cwd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/92d19f9b3c3163dbac4c0407e90fdfce5bf9008c/recipes/jdee"; - sha256 = "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; + sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4"; name = "jdee"; }; packageRequires = [ emacs ]; @@ -36253,12 +36233,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20161025.649"; + version = "20161102.1108"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "bd73f03fc5f0d1ca1dce29e28bb43f78af483a38"; - sha256 = "1q2c61bhbr6b4a1wgqsbwxywymsxy7h3wc9fkcy3ryip3xd88b7b"; + rev = "5633ee969c4644bde96c7f4134b02de463f910e1"; + sha256 = "0jwirj3aaigr8d5hnb5gpi447y2yl6ashxaqcagbasy6gvdf1knc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -37300,8 +37280,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "08ae6e1d290f40cd7649629436372ee6a52a7735"; - sha256 = "1bzbrwpnzwbym8y17m3298nnl7c3fcb1ib8689618jla0f74w6qk"; + rev = "e66f76fedbe7b8c042bd57eec282b6e1a88cb492"; + sha256 = "04w9gsip1h8qhppmw4g42apwnqpnfx8rcxgjvlskln97fgpf083d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37611,12 +37591,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20160801.753"; + version = "20161103.932"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "564e1454f1b1fe436494f0cd9fbb78a889fd2969"; - sha256 = "0fm8zlc27m22lfa2ay81h2s5aar0vyhfhwbha3nl1wwdi9720w0f"; + rev = "28ec20825e266723a5a42a630d865ae8fdfab3d4"; + sha256 = "0kc0l07c3zq48mpjkqj7sbpz3j3h5bx4z83r7954pj6s4za8cqmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -38930,8 +38910,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "7e057dcd4e19ef38ea59c2dc00fb13bda64c5ecf"; - sha256 = "0i8n2yiv3bw8jg5w2lzdhj9ycklkpwmvyxl4swcsslc8mp56368g"; + rev = "3e6b5bc83fc2b89b0d3624c3ba5d36af162a225c"; + sha256 = "0h1flxwsd83hrgpjz4z4plarvcvmwagvqxfpz3k05hi75c5cpcds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -38951,8 +38931,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "emacs-load-relative"; - rev = "b11fb74be7e5f465a2fe505e4d44cd13ec9ae136"; - sha256 = "0v0v036hq0qxj0yybr1fpsfkl01750nvl9q3c0sfiis9ylpqgzmq"; + rev = "8280df5ce6db836559a5c2442b97a2f02b6f7a05"; + sha256 = "0jzq3vpdq5cw5nh2l2pvj0y3lnvjff2wyy6ip2z9n6xcjjdnzki9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; @@ -39300,12 +39280,12 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20160821.1216"; + version = "20161101.1340"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "33097fec0d32145389c6ec8c407a1b706c8e77e5"; - sha256 = "1dbvnm201i1vdaygsd846c9q7ykn3yh76b46ni0jgmfcc084cxq5"; + rev = "d7596990cdd197d3db682c4b2ca5410a4b522574"; + sha256 = "1sid1k2vv3bawsirz11apslhx7f5dfva4gwcv7q7p3b0zxlyw1f1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -39549,12 +39529,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161030.317"; + version = "20161105.1602"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "63e2c3af0d39530802dccc5d23df293753947a6c"; - sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr"; + rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; + sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -39577,12 +39557,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20160624.2254"; + version = "20161106.1441"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "17c3aa4f3b2ded6c67b9ae593bcd0c929631c940"; - sha256 = "0ra9g2dmpvii0pdwv5hmx4kr0m695ry5msnsyc6lvzrcc9hvmw5b"; + rev = "aff3aa6f46f561e1cfe4f240396559097a409fb1"; + sha256 = "1mvg5qk93b7ihy7jbk6ywwp2a00qz7wwz3rd2basxj01z6glfxk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -39728,8 +39708,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "63e2c3af0d39530802dccc5d23df293753947a6c"; - sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr"; + rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; + sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -39770,8 +39750,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; - rev = "9d13effdbc213a0c8dcce78e1825011631fa0652"; - sha256 = "163a1rddl54jgxm5dygnbp1pz1as4hhjszan1rcabvzcfnfdpakj"; + rev = "1b064485d512ab547d606dcea9ad4298f355095c"; + sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; @@ -39791,8 +39771,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-svn"; - rev = "9b2f8c14e83ee5851a63bd23b5f19422b00c0ff5"; - sha256 = "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph"; + rev = "63a47732cc112d24db26052ffad93895319b60cf"; + sha256 = "1g2isa8n2j8kk0c5iwx8qai8k14sazwkc3dwhcpchm3zs0bfpdm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; @@ -39812,8 +39792,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-topgit"; - rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0"; - sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2"; + rev = "11489ea798bc88d0ea5244bbf725285eedfefbef"; + sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit"; @@ -39829,12 +39809,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20161024.1527"; + version = "20161105.1817"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "43bff16701daac38fb08c87bc60874bb4b1220f4"; - sha256 = "14r88xh3rwbr4kns487928pbh48mdwyg4qhr5wzj6yqb3kj0816j"; + rev = "55ef2b694109e8f4caeb7cebd49345bbce7e5749"; + sha256 = "05k68hx83dvnvr1mkw8pmyn77dh7wa7j5q8awcjswxqw2pkxcmxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40144,12 +40124,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20160626.1924"; + version = "20161103.115"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "1ec88c8da5f92982566d58d5c4ea743317977506"; - sha256 = "1l3h6jbcv39pslknp6y56pvx6kf0brbgrzlhmsc22n4238294x2z"; + rev = "9c32e47b80dce357278f520593eb670abb66879d"; + sha256 = "1p5i26bcsa9vp5hapy2pxkb55yhqyhpmsi9qyqhkh9bxaqa70baf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -41599,10 +41579,10 @@ }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; - version = "20160719.1606"; + version = "20161102.1111"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-cmds.el"; - sha256 = "195dqyjgxv51lj1779w98l7p8qhr8aa87w0k4dqawzfap2mms85h"; + sha256 = "1d55k9x2x29s0n2pkvp9lv8lbbha46f349dayniirspi55r89z02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; @@ -42362,8 +42342,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "c941d44c994e29f0c5f6c4532950eaceec0a6376"; - sha256 = "1wrdcxdlcvrhvarz71a09168bp1rd154ihs5v55dgh1sm7pv34la"; + rev = "63056cb9b29c5d3b5ef9d22ace7633c87e1e4299"; + sha256 = "1f4ijffjpf9p1p5gvbv8yd9hiyqrdiyg4wmqrnr76yls7zbxdf1a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -42425,8 +42405,8 @@ src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "d87954bf3791fb871c6e16621077fb0b97cc10a5"; - sha256 = "01rx4ll6qdlf3qf0f3srmid24zsifqbvm43nqy7k6glnidv8fcnn"; + rev = "efc1eaa4361add1803ae5245c4f3dfdea106ba48"; + sha256 = "0ws529sh9xa583m8gk78gwqnz2704sz0dw9c0l9nfz0hk3h75ivk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -42733,12 +42713,12 @@ multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; - version = "20161013.156"; + version = "20161103.1715"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7"; - sha256 = "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh"; + rev = "f510b7bc3c4726f262620bd6739f7de80d13ff35"; + sha256 = "01dbk0vxznmqhx8vd2iaa967ng5apnwkv0mlyd235wk2z1j8wci4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; @@ -43294,8 +43274,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; - sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; + rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; + sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe"; @@ -43315,8 +43295,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; - sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; + rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; + sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective"; @@ -43336,8 +43316,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; - sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; + rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; + sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile"; @@ -43752,8 +43732,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "8818c5af5598e16ea59189e1e3245f0a3d7c78f0"; - sha256 = "1ky63jyxdz1m6fcz3phi87mwc0ha6bn2fpg4lcdzp0w8cp8rc8ad"; + rev = "2e74d2bcab9ea91078f0ffa040ad8d9372e0a305"; + sha256 = "1n6gma3g08wvs083frbb0a7nygy5f9cfidqkbqf1xxm806ancvdz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -44046,8 +44026,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "6a2b876d3ab210c0c4e61c6f60d34304e024b54d"; - sha256 = "1ypi182ffr65vixg5va2bcgga29r9jxa8w0pv2cpilbys8w53hpd"; + rev = "b7bac03427e4f13ec7681aa25d3a1111fab7a4c3"; + sha256 = "1sga2iqm3qf4qyvxm89maakkxg4dskwy0m5vfa54b95jr8616p5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -44088,8 +44068,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "18b7363a699c0b5a4bf59d2b320dfc2b84dc4e67"; - sha256 = "11g99aw84w1as4can3184ns2znwg7knp8jnp7y3halm0bw1p1s63"; + rev = "eec5409a69054cf21214c3f5846ec0310fcb8228"; + sha256 = "1478xf9mp6v539r6mgpm7lfqa21xa5vd1kwybm24bdnzlq7h5pws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44354,11 +44334,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20161031.410"; + version = "20161104.851"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "429c30c2bc6587023f234a8a801f9ad5ce7076c0"; - sha256 = "1p8qv1y08yychsrmf3f3qjyiiisgjvd4h1slhn3zyk0bhif1xqvf"; + rev = "343534d82dc8882b3f0e2a847ee9d10ba5392809"; + sha256 = "1gq6vj6ac5f2kxrmzh8szn5577znfaxmp9fw3zcfjdrdmw0775n4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -44627,8 +44607,8 @@ src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; - rev = "5ad24b20a59754f0673adfd33a323bde9e3a1ae4"; - sha256 = "1fdxwlih732ci2xpvk90ri35n4g3rjh91hs001j3y1c5ilpcp5cg"; + rev = "98f2283d60686d331346371bc7f7f3d49bdfaf34"; + sha256 = "0yv6wv1vdc5zd1sh3f8vcz7wdizziasjzr11shx2bhm8nhnqcdbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; @@ -44731,8 +44711,8 @@ version = "20160310.1353"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "bc294e47f51c"; - sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q"; + rev = "4d70a7ec2429"; + sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; @@ -46184,8 +46164,8 @@ src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "dfa1aa2f1b802819b8d6baaae4ee1a43f2fe925a"; - sha256 = "1whvqh76nqjmihgph2n0lasmvgb2zvd1pn98wyb3rw0h4hqyhlx3"; + rev = "fcc653735faf1ab018273d7821981090f752c838"; + sha256 = "0x8mfka6m5452r5sj7m6ypvd91cqqgyxb00rx3v8y6wbpf2nsrc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -46642,12 +46622,12 @@ org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; - version = "20130423.1545"; + version = "20161105.719"; src = fetchFromGitHub { owner = "tarsius"; repo = "org-elisp-help"; - rev = "df319441e528a0cad42d29e71fc3547a61dde1c5"; - sha256 = "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0"; + rev = "23506883074b65943987d09f1c0ecd6dc1e4a443"; + sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; @@ -46917,8 +46897,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "82c98e3caf565417a8fa85d1d388d7b1895920a3"; - sha256 = "0q79dk2p40dg0w369aplmghmfvq9fjkpss7s1d27d06xkf131k8h"; + rev = "8dc2d7767811f7d754328da0398e49718bd797de"; + sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -46937,8 +46917,8 @@ version = "20160808.220"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "82c98e3caf565417a8fa85d1d388d7b1895920a3"; - sha256 = "0q79dk2p40dg0w369aplmghmfvq9fjkpss7s1d27d06xkf131k8h"; + rev = "8dc2d7767811f7d754328da0398e49718bd797de"; + sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47088,12 +47068,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20161011.106"; + version = "20161105.1652"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "5ed6b514351132c07d65054cdfc9b3da747a26d2"; - sha256 = "0707y3kw9snmj4ba2v5dqwgr9fyd50xnpdxabak1jy89ckcgahxv"; + rev = "8de30861216eaa2a922a2eccb6e7b1392f70a58d"; + sha256 = "1n5m3smgn3rxq9l110m3hqxip1xnyk4mjf70822ald4fv3l33q32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview"; @@ -47169,22 +47149,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: melpaBuild { pname = "org-projectile"; - version = "20160822.2123"; + version = "20161103.2316"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "21956fa2276761c1ea8f70f4e731bed10a8e560d"; - sha256 = "1viviyklv1cipa2n37n85kfmm3s2jlwgyh983afmj3b8jkz8xfw2"; + rev = "a68ef488404f175d8b8867ad958233f927e451f1"; + sha256 = "0xvy108m4gqkzh00zgch8c163kri10rzgshbmz9kx9vgsqki2m1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs pcache projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -47283,12 +47263,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20161031.813"; + version = "20161107.323"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "c295ff00ccc9e29a04c981cd2631d7428b5e5e63"; - sha256 = "1jbpnlli0g2kbsqrl3miwfjhfjf9zz9dlhbqd9fi891khyy5c6hm"; + rev = "40b1c4322903b30b9c44906093f3ad73f7fba142"; + sha256 = "02hm36hkcsyjp28idrsfz52imjaig9qlwsamfkww0fqf9j5vp0hs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -47804,12 +47784,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20160801.715"; + version = "20161105.857"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "3747e49964fc4e96c41aa10a5553d7ad609e8f43"; - sha256 = "1x3pdk5wgk4cw9qq2l2d0baidnrjxj1qjdp6ajx7hlmwmxl7c203"; + rev = "adcfef22dc9bfa6503513d0a937bf4b32ad7ab94"; + sha256 = "0f3lqw2b9xr0278s7502sa2hkyhml45j8jpssaicyliz2k1kiyzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -47825,12 +47805,12 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "20161008.1359"; + version = "20161104.1800"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd"; - sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn"; + rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd"; + sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; @@ -48375,8 +48355,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "8e7eb1ea80d2f11f7fc7e70e7418f79905dd00c3"; - sha256 = "1dbk37x5aaql03y97daqvw7nd70bym0cn93rad9m81djnhg46li3"; + rev = "6f9cf1691cd8e597f3c6ca20ef299d5c62c9920a"; + sha256 = "15i877mr3mwzh44dzi1y4rx86kkx783fg3lai78vsby2c7jd0w42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -48560,12 +48540,12 @@ ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20160702.145"; + version = "20161101.1920"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "a66a06fdc0c705f3b55d4d533c5c07097fa2f28a"; - sha256 = "150vhknzjhddwy8fw4p963ship96rbgaapkh4aq1193q8hanspzl"; + rev = "973bb43495213e883383cf263ce173e36e09fb66"; + sha256 = "0g6jil43c8761ynhy77g0fvddw9wg9f6lzs5fr24hwj30q9vlnyz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; @@ -48749,12 +48729,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "20160915.207"; + version = "20161103.1316"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "d9847c7e7c1df384088726217e65a6c0067a67c7"; - sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai"; + rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28"; + sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -48875,12 +48855,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20161027.1828"; + version = "20161106.718"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "e7c411ecc54445a62300576f83e36ce552d592eb"; - sha256 = "00mvszyfyw08d16qy3nm125z71jd35j12vhrznvc2jcz17pgnnw0"; + rev = "46f12c815bc791b2889292d4b32eccad9e313d1d"; + sha256 = "0dvljayxc9dkrw5w0xj92859wvh0kmvq1jl8mgf7916nafxgl0pf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -49166,12 +49146,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20161027.1129"; + version = "20161104.1521"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "2038ac386a20caec6f5a6477fec253f186c17715"; - sha256 = "00yr76pqcizxpi0p3a9r5j9fgfxf40srqgfpvdhbky63xmnq6ckx"; + rev = "88ad7ea08afae0bf062755bb1e91c5543aac6028"; + sha256 = "0vjxlbm143i9a8pi5v2q82fms8lwf1i24nddxj4a1js2r6mpz15m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -49229,12 +49209,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "20161020.1842"; + version = "20161102.1351"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "df7340518e229c42d2ea5decce8ca750a9bfa762"; - sha256 = "0w23mqd0s3fdcmdwnwj0070gabqbipwwbd4h3f663zp200xrnyqs"; + rev = "b693226ad827409fc1d6243a5a949d1c87c53104"; + sha256 = "050ygdhlxd7785h262vg8pdv2w0sgq36jh0wsjv9q64qmrndrklf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -49374,12 +49354,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20161025.845"; + version = "20161101.932"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "b593725f5e6ac5c65866055df75b39d0b5fdc1fb"; - sha256 = "0d7ipf558141gf0qk82rvzfffmfa4vzn1yha0hza2fx8c0icv38l"; + rev = "fb9e9f94a8010d2167a03ea6b58a320b0925af10"; + sha256 = "0zwv0r8jzb27gnv0j4n9xxylzk42sg6w6ljvdkx9nm2qgrfq3nsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -50208,6 +50188,27 @@ license = lib.licenses.free; }; }) {}; + persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: + melpaBuild { + pname = "persp-fr"; + version = "20161030.159"; + src = fetchFromGitHub { + owner = "rocher"; + repo = "persp-fr"; + rev = "00db4a17977b4e9c5c3212ce94fbc106f24d9d81"; + sha256 = "0m70wawbxm0kg641qj6sdsij5d2icmmad2p977c8qpcc8qh91gs7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; + sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2"; + name = "persp-fr"; + }; + packageRequires = [ emacs persp-mode ]; + meta = { + homepage = "https://melpa.org/#/persp-fr"; + license = lib.licenses.free; + }; + }) {}; persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; @@ -50694,12 +50695,12 @@ php-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, s }: melpaBuild { pname = "php-scratch"; - version = "20160730.115"; + version = "20161103.1517"; src = fetchFromGitHub { owner = "mallt"; repo = "php-scratch"; - rev = "755ea9dbc21b55329255967def2426a0fcbca597"; - sha256 = "1vnlv2amhh05lj6sxaq4l4hxv1rjjm7sg9j5b04g2dl22jdjv4ww"; + rev = "3aa66d1d53b84b779374edff7a7e6b5f2cd7575d"; + sha256 = "0iyb4y0wrd1yqm56p37riw6nwvrlcgxj1x0nhw8304p8hv76mzdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68336364f6956325a2e03194d7db30747ab7f80c/recipes/php-scratch"; @@ -51093,12 +51094,12 @@ plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; - version = "20160620.109"; + version = "20161102.1954"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; - rev = "d87ff625e280c017d0fb6cd3c141ca6dd0bf9c29"; - sha256 = "0ijqgms585jp3b5l95dk30g8yjfffljk8i3rgf71wrdvcsinyicb"; + rev = "6f1aaa35f57fc451e4c06164e74f61e17ce1cacf"; + sha256 = "0cfs7qxz16aiz43pk4dcg3nvhs5r64fgy3476wpy0fac0fm275rl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme"; @@ -51342,8 +51343,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "0d6986cf21b19174b6591399adc1dfb670828053"; - sha256 = "1xdjipwwhgvi38bw514hfd59r80dcg4jhm69ii4v06kkybfgz3wy"; + rev = "f837369264c119d0e96c9ba6e5960deba59eee73"; + sha256 = "12mxyg47hsgzzvqv19qlq9yhhryam62k7adll1i9n39xi6as13py"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -51881,12 +51882,12 @@ powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powershell"; - version = "20160210.1858"; + version = "20161103.2354"; src = fetchFromGitHub { owner = "jschaf"; repo = "powershell.el"; - rev = "0e51db56fddcafcfe0611142ea939969673c2b58"; - sha256 = "1ym373mjyk3vfbw2c918zgaf9m35j8bkrpcj9d8m9drf4h7a8d3b"; + rev = "3c09e1b87064bedc065e45346fd4c3e051eeb0f0"; + sha256 = "19cq6n8dhvr2vw8nx3f4dkybqs9dqa6ss3z2ycql8rdmc5wg6jpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell"; @@ -52212,8 +52213,8 @@ src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "a2d1af72b97c7cad0b601b80ef36d242b34483d1"; - sha256 = "1dj2dx7vvvwg2839gy4qfr8kmlvzjs7n8xwj21vmxr6fqaa7cy3p"; + rev = "e53e1ba0d8c5081b4671f4292b164e919d0fdb2b"; + sha256 = "18xbql40myis77lyjiqq3kdsp0961iwf4rcg3c9i5w49chw3ql85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy"; @@ -52394,12 +52395,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20161008.47"; + version = "20161105.834"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "44f75e3ceceeebac7111954e6f33cda50d4793d5"; - sha256 = "1av32m99fczdmilxci8r8ni73f3x4kmvm99jjjjx4dnpg4siv35d"; + rev = "b573b0656f9fc4c1afa1275c3e3d9ca9badda7f6"; + sha256 = "1frirasi53apys8jhff6ywlbl8h77nd5z2z9ir3jjb9ysrsk7kmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -52734,8 +52735,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "8fcd24b8dbba46748a9d880a2372736a8b1a6852"; - sha256 = "1kjd21k1xikzq5zm9ybza8qgf64xa9yg44pmhinidyx1vwdhz364"; + rev = "0d7199edc802299bdba39400c04f119c7db82667"; + sha256 = "11jvsdkbxlpdvli557d3rydn8hiyvrpxa0cc4k02yi2pf2hmqkdb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -52940,12 +52941,12 @@ punpun-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "punpun-theme"; - version = "20161029.1305"; + version = "20161103.147"; src = fetchFromGitHub { owner = "wasamasa"; repo = "punpun-theme"; - rev = "064e5d10ece4298bb5605259e4558421d0097caf"; - sha256 = "19dbzrn7ghrxnvir65x4zmqv1yr7rcr35z9ckgy564nwnp90v2hn"; + rev = "cce8b10b2df6f9187a9eaa0c3f21ff0dda175968"; + sha256 = "1iz1qc9bphl2y2z7abc33fvyaccj733drkl7nzbr1jlpbknkmk2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77a9edbb36dc9474adb23d356e6c596789aab2a2/recipes/punpun-theme"; @@ -53447,8 +53448,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "3a83a093d14d59d5026c0beae6bf025fe6b4ded7"; - sha256 = "1y9dpp52xyc7aqqs3mpbi1qn661sgi2f899ppi495wqvlr06fpjm"; + rev = "21ecaa744484218be5c89c7108771465425542bc"; + sha256 = "1l41hyc17vlpfdnjp2bvkirfk12paabs1qwvc03x29ibylw86a23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -53590,12 +53591,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20161009.2250"; + version = "20161105.1431"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "a4295abe5e9bc115ffbdcb332266abbc51456ba8"; - sha256 = "1jwg3180ixkhbqv5zf4g9557mcxxsh2ls6kx2vs5m2w95pd9mhdj"; + rev = "fdd052ab2d70e0acf2dcb25a5a94cf52f4c4123d"; + sha256 = "1pdva6a7jdi8aw1q2k32n0kagkldjh8fkapjdmn65rs362nqj7iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -53947,12 +53948,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20161017.1829"; + version = "20161105.1637"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "05ce76e8e331d37755b25ac7ac23bfb75880c880"; - sha256 = "1vvaq76jahayx3nps9mz96xz47rnq8dfxnxmj8w5j1mv69lkhxlb"; + rev = "4d5c6332d24ba302913606fde3feda6abaef2ea9"; + sha256 = "1qnkb9z23diyvkkhl2q00yvb8sybpvphlfchdyzsrhylixnkq83n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -53968,12 +53969,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20161029.1105"; + version = "20161101.1859"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "7b0b8185a12491897c9c6dc83fa5f20c90a67f22"; - sha256 = "1bwp6z2j3ppvv83cqrnan489xcw75ck48y09km3xpngr5d68ph38"; + rev = "ab625571837c96446e3704febea48b453787c5ce"; + sha256 = "0wnas67q1njg6czx86zywgq6a142rkh8qv4vbdjvqnyxd4y8jrsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -54052,12 +54053,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20161027.1033"; + version = "20161104.550"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "d531e5523f35ee937f25931ea7c0dbf712274840"; - sha256 = "107qg9k87caz9kdjsm0q90g3dnnlkm9m6fincvyz0rb45ns2iq5k"; + rev = "b33640716d0d9930b09e671d2c62c5839fbce210"; + sha256 = "17n1fd9hjqalxffhjfzr08psarcc7ahsi0ns6clx9mwaq3fycg5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -54959,8 +54960,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "93684fa8ad3dc16b3e298386e857fa822ce7a36e"; - sha256 = "1biwpmv51i5vnrv8m6j21rcqscdzvwryf0wrnx1s13ql5cq880ca"; + rev = "bd962668615abcc48b4797168e948dde62b3f197"; + sha256 = "1xz82h933dxl2bj90l24h50qji4h1ivmnf657yp89dbyc42fz7zf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -54996,12 +54997,12 @@ redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; - version = "20160516.1416"; + version = "20161103.1157"; src = fetchFromGitHub { owner = "ferfebles"; repo = "redtick"; - rev = "d62dec07400e47ac3e9ef0c045ede916f1025a82"; - sha256 = "1c9ngm95b8rqg11m5w69031d8lgyvh9xpnr4h5r6yyg7836hdk2v"; + rev = "ac8b213cf3dbd43a86910a152426b14576fbece0"; + sha256 = "1c1hllznnrypbh0cp162kbdcm0vrcsws5nx5l32c6h89n9dm397g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick"; @@ -55038,12 +55039,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20161028.1638"; + version = "20161104.804"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "9582e47507237dad3513bc6957b35abc432743cc"; - sha256 = "1bcm26mghknp749b3n0v4w7ag3c2q2g30d3j1zypslxcwgllzxs7"; + rev = "a83ddbf79abb65f5cfc98d9b19815727e2395b91"; + sha256 = "1kciixx40pdd9vlzd54hxy43adk9bhcga23m2lim5q2fdj9qbyir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -55928,6 +55929,27 @@ license = lib.licenses.free; }; }) {}; + rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: + melpaBuild { + pname = "rjsx-mode"; + version = "20161105.833"; + src = fetchFromGitHub { + owner = "felipeochoa"; + repo = "rjsx-mode"; + rev = "66086b6557fcafacf9bfdd80140e7dde4daac266"; + sha256 = "1y9inxk3kr8cygi8rnj4dns7azq1ka1yvvj7wsm6hnmm1i3wk3lx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; + sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b"; + name = "rjsx-mode"; + }; + packageRequires = [ emacs js2-mode ]; + meta = { + homepage = "https://melpa.org/#/rjsx-mode"; + license = lib.licenses.free; + }; + }) {}; robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; @@ -56145,8 +56167,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "7cf1d49d9090449c660d024eecb782d3d4fd6aa0"; - sha256 = "1zdmpspghmhrizz6zrilysh0x6704dpg2q0r33h27hhd1lak8091"; + rev = "129cc5dece4a22fb0d786d1309bcba523252e744"; + sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56207,7 +56229,7 @@ version = "20160911.333"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56534"; + rev = "56665"; sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { @@ -56287,7 +56309,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56534"; + rev = "56665"; sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { @@ -56514,12 +56536,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20161025.1042"; + version = "20161031.2109"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "01ac5d8197658c21412acde16df7c39325f03e4d"; - sha256 = "1pylp3xjj9asnnilx1rbghpqgmimvk74sz8fv1r341rlgy1arxrg"; + rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; + sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -56875,8 +56897,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "9e4da33eeebc1a1dee09772d5c2fc9ad13519deb"; - sha256 = "0z025cnb4rfw3gcm2897245hy8png76ax035nmcz5hp4lhsk11l6"; + rev = "54dd1b77ac33ade3efe7aa8c78f9915d850f12c3"; + sha256 = "12m86z76a157sfg3y4grizxii0747w3wxv1szlfnghqdkgc1qx69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -58573,8 +58595,8 @@ src = fetchFromGitHub { owner = "jtkDvlp"; repo = "simple-bookmarks"; - rev = "e89e8163a0705e28e9346320a1ee13c1aae249af"; - sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv"; + rev = "6c58337f2b7dbe9e58b5e097b1567f046a01d071"; + sha256 = "05071n96d91q3jz9dwp1qkqwq56k0d7cd1pnjj4jvjx4kb852waj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks"; @@ -58632,12 +58654,12 @@ simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "simple-mpc"; - version = "20160930.805"; + version = "20161103.1219"; src = fetchFromGitHub { owner = "jorenvo"; repo = "simple-mpc"; - rev = "b48bbcfe9a59941cfcc7e4a31200aada18ab9e05"; - sha256 = "0gp39ay1viixk6x5hnaa09c73vbz8xx453rnkw79pqchhsnyh6va"; + rev = "61b39d02313fa51a1dd7326fe24871666c64a077"; + sha256 = "1g8s37misx0kl32ngffqgqdzphz22v25k39q571jz4q1dibhmsyz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc"; @@ -58924,12 +58946,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20161026.857"; + version = "20161104.633"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "c2ac34937ea1ec6e8552405f1b35f2523a0a0a3d"; - sha256 = "0s9c067g8b17njjxg31abx4zklfy6azy2c7dgq636pdql06fbv17"; + rev = "c87637c799b19e878d65f1a6906c93b74ad1e3cc"; + sha256 = "0qqp19dwz4vbz83pkhhc5xlwqhq482v2dpmqgq1i6lh42m1xkk5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -59008,12 +59030,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20161012.1531"; + version = "20161102.711"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "f54b0c445065ba42f8abb8519a44ba2dadd9a68c"; - sha256 = "1s015n4z7mxbw1dv317v7w3mdl0z6p0xwcd20a5prz6yk78yw0gk"; + rev = "14f2502cae166ea5dfbab82a04f9fbae429a211b"; + sha256 = "17f40bam7v1p5ypw2vd6gbzgbmz9jswy7sqgs8xac46ijn4n62w3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -59676,12 +59698,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20161029.837"; + version = "20161105.1503"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "78a0880499915b52549aacc5de473c6ecccec88a"; - sha256 = "1hfgklrdjlvx3sfnamfs0wv349yy6166x8j240xjsf24gl3yh4jh"; + rev = "5c680283c9af6d2726bbc107508cbe85a978b39f"; + sha256 = "0fwmjqgcj5q5g035zf4sf36r1ghgb8zb3xqx3a4xvb6bzmzrqa5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -60032,12 +60054,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20161026.1857"; + version = "20161101.1909"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "d8012ab4661630283c4ac6521a094cbe09ea4707"; - sha256 = "0q7l82zyk0ibk4hby8m014qfjrpyjp15n92p2j3n7hp9fm8fij8z"; + rev = "9a474fd2c8c17c330d02ba2ee32b543c80d55e2e"; + sha256 = "0dig58in7hlr2mq1j0lrpszj9y1amgwgnq99znd2zjkw80cpvv7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -61268,12 +61290,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20160917.447"; + version = "20161031.2219"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "78d064134e807742fa2ceb7b1c4672ffb284a20d"; - sha256 = "0vm3pcs2ijd3s8w8rj7wdkqi077xd5qq157987hygy92lw9svfqh"; + rev = "e94c9e70ba64d231ff538db54acd4b5ecade3ed7"; + sha256 = "1igw97v0779gnk9ymk4inqmz92kkxdim5hkdhm52qk03kn7766zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -62032,12 +62054,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20161021.2159"; + version = "20161104.1314"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "3bca9f0d011dde62936daca4feaf51070bf86e07"; - sha256 = "16hi592ibxshrmai7sj73d2fgdwsr9131y9gz67kb6b1rw7pbpjv"; + rev = "fd78622bf70cf70c344513587805538c259ea45d"; + sha256 = "1bjybkvydazanwvyp5hmlrpbcyhw8bmw808ym1gavb64qzsswp2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -62408,8 +62430,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; - sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -62530,12 +62552,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20160125.1601"; + version = "20161104.1755"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "4b8f0c335a6fb055284773dfd480106e8c82fd81"; - sha256 = "0d0c2i8hh0wrz8vnhxpxzwj7vlrjx6lrb3cx56pn4ny9qyqfzmw3"; + rev = "87dfd1e2ce093d53c0919dac7899bbf06bd96224"; + sha256 = "1ln75xg05waxahbaxlvb6vj7yi3svnni2247dzc9khi99dnwlbhf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -62757,12 +62779,12 @@ syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: melpaBuild { pname = "syslog-mode"; - version = "20160525.1914"; + version = "20161106.1611"; src = fetchFromGitHub { owner = "vapniks"; repo = "syslog-mode"; - rev = "f93b2f4dd59608eaa10ec1d8f32484e6476e7169"; - sha256 = "1k3lh920p62ji5n5bvgxcfr6vc5ljssn9j0n4zydhh6ybk9j5f9n"; + rev = "d30f58d713fad72e8e8bfa92d6b2ed5300dbf022"; + sha256 = "011n5285c2gwc3i0cxnhk5g867d1jvga6ck92y787xjxm2k688kr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode"; @@ -63302,12 +63324,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20160302.1515"; + version = "20161105.840"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "5c0af25f193b72dbb8dd2f9c9cbadf7f541e0c77"; - sha256 = "0c5h3i2viw9iryx2hfmmi0k30y96kqn7vhkbv76fzkhzby5r25fy"; + rev = "44f296e6a16afdde97927c170c6dd0cdb3a3598b"; + sha256 = "16zjijz9syzbcxq1d4bx11kagxwhzygrlgdqvb443cch5s70n2n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -63386,12 +63408,12 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20161013.127"; + version = "20161106.1419"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f023c857459d6b7436907f626aa59929336f7b61"; - sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi"; + rev = "5272c03ddde3557838796c9b64139ef7c676091e"; + sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; @@ -63467,22 +63489,22 @@ license = lib.licenses.free; }; }) {}; - term-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: + term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: melpaBuild { pname = "term-projectile"; - version = "20161003.1428"; + version = "20161106.1419"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f023c857459d6b7436907f626aa59929336f7b61"; - sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi"; + rev = "5272c03ddde3557838796c9b64139ef7c676091e"; + sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag"; name = "term-projectile"; }; - packageRequires = [ projectile term-manager ]; + packageRequires = [ emacs projectile term-manager ]; meta = { homepage = "https://melpa.org/#/term-projectile"; license = lib.licenses.free; @@ -63537,8 +63559,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "1b059a9fb324edf0804a9414cfabc6e26c813398"; - sha256 = "1w6698jxjimsiphg00lckxh7a7507piq785bxqinw7ymgglnfp54"; + rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e"; + sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -63558,8 +63580,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "1b059a9fb324edf0804a9414cfabc6e26c813398"; - sha256 = "1w6698jxjimsiphg00lckxh7a7507piq785bxqinw7ymgglnfp54"; + rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e"; + sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -63761,6 +63783,27 @@ license = lib.licenses.free; }; }) {}; + textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "textx-mode"; + version = "20161106.1243"; + src = fetchFromGitHub { + owner = "novakboskov"; + repo = "textx-mode"; + rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61"; + sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; + sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn"; + name = "textx-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/textx-mode"; + license = lib.licenses.free; + }; + }) {}; tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tfs"; version = "20120508.1120"; @@ -63881,10 +63924,10 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20161004.640"; + version = "20161104.1310"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "0p0sb5w646vlc623nk7qajfmywn281kabwaa8ha3la39a6sdd1xh"; + sha256 = "0n738nry3iska0121xzwvnlmvzpvmzds7xg3fxh4vk3z3czpb5rq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; @@ -64024,12 +64067,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20161004.2019"; + version = "20161103.1005"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "a8fc3e8223a40243616347e875cfa1151be9a794"; - sha256 = "0nvdz0v11baxsnhhi6hmv9ikrxgi0a4351r787plrdb2qz7zpmrl"; + rev = "74c8be8c72cb7fdbdcbfda430d4d283bc32e16dc"; + sha256 = "1p6nc2rjggvf3jfsffk9danm4ah9lxhj2z61p267pb2mjs0ywkvf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -64060,6 +64103,27 @@ license = lib.licenses.free; }; }) {}; + tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }: + melpaBuild { + pname = "tile"; + version = "20161104.1737"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "tile"; + rev = "2e0bb114d8cf9276ee73f616cae0a3baa64fbf5c"; + sha256 = "06kc90cy5nq5w87f253a70n6r234lq5kw06m5yb19vw7ph94bx9c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/424cfd28378ef328721bb0dc3651808e64c01306/recipes/tile"; + sha256 = "1795048ilpg6y9pn0jj0js5446hwxhwm6qmk50hds0hpcb396vbv"; + name = "tile"; + }; + packageRequires = [ dash emacs s stream ]; + meta = { + homepage = "https://melpa.org/#/tile"; + license = lib.licenses.free; + }; + }) {}; time-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "time-ext"; @@ -64168,12 +64232,12 @@ tinkerer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "tinkerer"; - version = "20150219.2249"; + version = "20161102.531"; src = fetchFromGitHub { owner = "yyr"; repo = "tinkerer.el"; - rev = "1125780d1fba0330435fcbe943716032ed543a57"; - sha256 = "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2"; + rev = "713769e5f5eb90a87d515b7ba2dca71f2f297218"; + sha256 = "1dpf6s1mv8mvcr84hzawhjgz3fjpbr8qrlcvdsw3r2c6b9pdi4hw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a28e1dfe987287bac7c45f83ae6e754bc13e345/recipes/tinkerer"; @@ -64735,8 +64799,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "85d8c18cacbf9c006deb331867cde65fad90b47f"; - sha256 = "0skbqd38lb0xh55xfd13c80s6xn70sqg67cpvdx6qck644apg4af"; + rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef"; + sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -64836,12 +64900,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20161027.848"; + version = "20161103.1632"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "6ea2305e267e5efb42bfa2187279ea3b7d1a555e"; - sha256 = "0p81gdrbwvba7xnpapgwrmssizkfj4rwxxipr76c4lzdmz1am03w"; + rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; + sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -66699,8 +66763,8 @@ src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "a3a7fa4a84c6117e618ed771c7327f413e1a021b"; - sha256 = "114jyzx6asxr0r3xqi11wz10aij3h2rpyk9ga5xwzw47f7sayw64"; + rev = "c964571c38fd3a6bfadc88fd9def3ed03132a052"; + sha256 = "01sdkhljh7mdwv4mvm37gimjvl3i0jpn4xzmd9sdjll0dbc8rxki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -67091,12 +67155,12 @@ vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; - version = "20161026.1359"; + version = "20161106.125"; src = fetchFromGitHub { owner = "blak3mill3r"; repo = "vmd-mode"; - rev = "a332f96c38a512c645c110c04f4a8315429bd2e2"; - sha256 = "15284r6hx96mwjigw13ikzqjm9irj4vklwsikawym37dyz75h4nv"; + rev = "e3b27f4f179002984643895292bb207c3e221a5c"; + sha256 = "0gpamwnsszhna9crhbg2zcvr9hrq7lackhgclq63lsvcm0z2ynfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a305ed69dbad1a5f456acd1aad2fb9409d6d1fd6/recipes/vmd-mode"; @@ -67109,22 +67173,22 @@ license = lib.licenses.free; }; }) {}; - voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "voca-builder"; - version = "20150625.1133"; + version = "20161101.945"; src = fetchFromGitHub { owner = "yitang"; repo = "voca-builder"; - rev = "cd74c13e005e33ab125d43233b1267a8819b0abb"; - sha256 = "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw"; + rev = "51573beec8cd8308477b0faf453aad93e17f57c5"; + sha256 = "1gd7zqmyn389dfyx1yll1bw5f8kjib87k33s9hxsbx0db8vas9q6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42a930e024ce525b2890ccd5a1eb4844859faafd/recipes/voca-builder"; sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y"; name = "voca-builder"; }; - packageRequires = []; + packageRequires = [ popup ]; meta = { homepage = "https://melpa.org/#/voca-builder"; license = lib.licenses.free; @@ -67359,12 +67423,12 @@ warm-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "warm-night-theme"; - version = "20150607.741"; + version = "20161101.728"; src = fetchFromGitHub { owner = "mswift42"; repo = "warm-night-theme"; - rev = "67cc2a1591c0627e6310cdfe8ca7c8d4565b9c16"; - sha256 = "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif"; + rev = "020f084d23409b5035150508ba6e57c2509edd64"; + sha256 = "1jmjyx06p0cvqi1vlg5px2g965q9pgi3j61msxjf5skzw53vlc88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/312e3298d51b8ed72028df34dbd7620cdd03d8dd/recipes/warm-night-theme"; @@ -67531,8 +67595,8 @@ src = fetchFromGitHub { owner = "yasuyk"; repo = "web-beautify"; - rev = "1ca9841e9ae951d60d591befa5efaaf839916b75"; - sha256 = "0j8v8p4w586wz80q9scdby6b80sbxz4lqg9zb5pbr2w8bsps8n4m"; + rev = "9c6a09969c04cb07f5f56ac6f6c3abba5f06c871"; + sha256 = "0vzd0bmm53a0bhdbyvrqgswy453pnsfcnr71piwwhw4dp2zx32hd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify"; @@ -67569,12 +67633,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161023.1219"; + version = "20161106.132"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "fda08e84567f62ea02b8a4893c745c237eb6b5b9"; - sha256 = "18jdsh4l7ygdvhfh0jyd5alsshvbx4pfx47impi3i2fy4rbkxljm"; + rev = "bae44d506af5d4f548f1b992229e369890f2a8a4"; + sha256 = "1ygsvcsf3pddcwyaw0m19z5j8is982ypxmz96qs2h0krfq9l6vl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -67608,18 +67672,19 @@ license = lib.licenses.free; }; }) {}; - weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }: + weblogger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "weblogger"; version = "20110926.918"; - src = fetchbzr { - url = "lp:weblogger-el"; - rev = "38"; - sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv"; + src = fetchFromGitHub { + owner = "hexmode"; + repo = "weblogger-el"; + rev = "b3dd4aead9d3a87e6d85e7fef4f4f3bd40d87b53"; + sha256 = "03dkabszk6ya3vaps1ap16psk5bbar8zd5ipn1lmyzsbd3hwm8mj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4e08837a9af8185951df9b44b9b94a799f0de923/recipes/weblogger"; - sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ccb10a5d1f4db3b20f96dee3c14ee64f4674e2/recipes/weblogger"; + sha256 = "0k0l715lnqb0a4hlkfjkyhr8i1jaml8z2xzhal7ryhjgvf8xinvs"; name = "weblogger"; }; packageRequires = [ xml-rpc ]; @@ -67883,12 +67948,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161031.1056"; + version = "20161106.950"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "4b01b44c6718168be9553043124c3efd766abbc1"; - sha256 = "0kjrwaarrwrnxqbq8w23fs2j9nfv394lzpkzzjpakaaqfbzc1ck7"; + rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278"; + sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -68073,8 +68138,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "046a815ce570f65cfd79ed9f7dd73087b985aef5"; - sha256 = "1bmx2brynga0hv4cxc7n9skxi9gmhz3rjbfgxrsf1kc8yfpk56yq"; + rev = "5e9b37cfbec400b51a8d9d1bc6603595e1a0aefd"; + sha256 = "1w4drcqix3wwk15m1kkfss2mmip1q8j4hglyz4spaffkkqmmz438"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -68462,8 +68527,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847"; - sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q"; + rev = "b2d9d6b38cbb3993d4c100b098fc7efc9274b9b4"; + sha256 = "1l42a5d7hdpa1nyvhqzas9smbgkrscylj58av7gsky6kndps89dk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -68581,6 +68646,27 @@ license = lib.licenses.free; }; }) {}; + wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "wordgen"; + version = "20161104.944"; + src = fetchFromGitHub { + owner = "Fanael"; + repo = "wordgen.el"; + rev = "c46d8da6dae8c82d3a5d8b903a12dd5f2ae94939"; + sha256 = "0gcbj64dkzwa2xfp6y9lwb5m678g7lf9jrkr9whdrm9mgpifmdmi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; + sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m"; + name = "wordgen"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/wordgen"; + license = lib.licenses.free; + }; + }) {}; wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordnut"; @@ -68626,12 +68712,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20160929.43"; + version = "20161107.535"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "b4b3888a1a2c39e659e60f3a106d0ff8b6f1e2a0"; - sha256 = "014f4a9xrn07c587p7npgdl9wcahqlba2hv2kcz891nz0zpxnwkb"; + rev = "997b7e02ab4684166162eb1bdf4b711e18017952"; + sha256 = "0nhh10rhn17a4iscl2y3c1v7axvc154s7j1cfpidjk9xc52vwz9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -68962,12 +69048,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20161025.338"; + version = "20161105.1325"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "061d493b6e47aa96f9a3bea107b3586b21caab8b"; - sha256 = "0vhp81gr9lhwbq237fixmwjq1kipl5d2apy48hicgdzi1a8wcahv"; + rev = "79e004ee10d7f1d67200140f18e8a720be177273"; + sha256 = "17f5n23sp31manf58mvvyrixygza6plc0sl6n5k7lqfnlcas27d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -69004,12 +69090,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20161026.2246"; + version = "20161102.1328"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "161266e31b27fd060be56550f413e58e0436c04b"; - sha256 = "0b4g9xvi9v6qy3ijia800ph6j7cq06k72sc56kb7dkcgnjk9nxcm"; + rev = "40b0818411a77d496418f30a55f5ad4616350f35"; + sha256 = "1p0kc5viia17l4mls9ql2486cpnj2l2rp6nxlxij8ilw901q18d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -69403,12 +69489,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20161029.2045"; + version = "20161104.1949"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "89251eb9ddde4246e7c2b0a177706c6294ef4bea"; - sha256 = "1sn95gzw6ivniwci9czmb8mssz4cqbbzr9clsdh2pnxxmx1kx3xd"; + rev = "77e058710b20cb222647151e70416ef597929518"; + sha256 = "179nkk5hi6ylckjgxi536r78fvzv39kdnlbcdi0sscfn44q1ng6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -69634,12 +69720,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20160902.1142"; + version = "20161105.814"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "b03fba2be23ef928cc6e8752c87bf5f0e3dd422a"; - sha256 = "1nnqv0xq1w181cvd4yin7qij1lghyqg2x8qsll3k4f6jwnmwc561"; + rev = "f378589912af8731428198ef57546c616d941df0"; + sha256 = "0ag1psjrn4b1idz096jwdsygax7ydirhlky7zpj6awqzx4gh43yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -69925,12 +70011,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20161030.1222"; + version = "20161106.705"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "140079b822452b141ce022bbf082deae17edd6d3"; - sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25"; + rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; + sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -70160,22 +70246,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: melpaBuild { pname = "zerodark-theme"; - version = "20161025.916"; + version = "20161106.1246"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "62fde99acdd1b1e149300903a7e4f03257019602"; - sha256 = "0zi43l26fwqpd97bz4spwqr2k3df279m26wb74wygl5rkj1v01lk"; + rev = "62773d94e975cafeca26b93679aaa04adfc36882"; + sha256 = "0ayxrz3n1ca4kgby09crrwdxii4py5v5icnclys6wmnigvmb4jsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline s ]; + packageRequires = [ all-the-icons flycheck magit powerline ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; From 633387c0e8ae274767b8beb98648dde84b412477 Mon Sep 17 00:00:00 2001 From: Ji-Haeng Huh Date: Mon, 24 Oct 2016 14:55:50 +0200 Subject: [PATCH 085/295] tensorflow support for Darwin tensorflow 0.10.0 : Because of an upstream bug in tensorflow, only tensorflow > 0.10.0 is functional in Darwin system. Required python packages (mock 2.0.0 and funcsigs 1.0.2) are added Removing mock2_0_0 and funcsigs since now upstream supports them --- pkgs/top-level/python-packages.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78f9187e7a3..cd35364998b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1067,7 +1067,7 @@ in { license = licenses.free; }; } else null; - + funcsigs = buildPythonPackage rec { name = "funcsigs-1.0.2"; @@ -14337,7 +14337,7 @@ in { broken = true; }; }; - + mock = buildPythonPackage (rec { name = "mock-2.0.0"; @@ -30386,15 +30386,19 @@ in { tensorflowNoGpuSupport = buildPythonPackage rec { name = "tensorflow"; - version = "0.9.0"; + version = "0.10.0"; format = "wheel"; src = pkgs.fetchurl { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; - sha256 = "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh"; + url = if stdenv.isDarwin then + "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else + "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; + sha256 = if stdenv.isDarwin then + "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else + "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh"; }; - propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig ]; + propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig mock]; preFixup = '' RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}" @@ -30407,6 +30411,7 @@ in { description = "TensorFlow helps the tensors flow (no gpu support)"; homepage = http://tensorflow.org; license = licenses.asl20; + platforms = with platforms; linux ++ darwin; }; }; From 0d5caf138a6dd38fe1cb085f01e1c216ce026890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Mon, 7 Nov 2016 20:46:34 -0500 Subject: [PATCH 086/295] tpacpi-bat: init at 3.0 (#20213) --- lib/maintainers.nix | 1 + pkgs/os-specific/linux/tpacpi-bat/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/tpacpi-bat/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e463e852933..28ff28fba71 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -318,6 +318,7 @@ offline = "Jaka Hudoklin "; olcai = "Erik Timan "; olejorgenb = "Ole Jørgen Brønner "; + orbekk = "KJ Ørbekk "; orbitz = "Malcolm Matalka "; osener = "Ozan Sener "; otwieracz = "Slawomir Gonet "; diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix new file mode 100644 index 00000000000..bf60331d8ad --- /dev/null +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, perl, kmod }: + +# Requires the acpi_call kernel module in order to run. +stdenv.mkDerivation rec { + name = "tpacpi-bat-${version}"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "teleshoes"; + repo = "tpacpi-bat"; + rev = "v${version}"; + sha256 = "0l72qvjk5j7sg9x4by7an0xwx65x10dx82fky8lnwlwfv54vgg8l"; + }; + + buildInputs = [ perl ]; + + installPhase = '' + mkdir -p $out/bin + cp tpacpi-bat $out/bin + ''; + + postPatch = '' + substituteInPlace tpacpi-bat --replace modprobe ${kmod}/bin/modprobe + ''; + + meta = { + maintainers = [stdenv.lib.maintainers.orbekk]; + platforms = stdenv.lib.platforms.linux; + description = "Tool to set battery charging thesholds on Lenovo Thinkpad"; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3d2053f9cb..8c21249c247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11413,6 +11413,8 @@ in tiptop = callPackage ../os-specific/linux/tiptop { }; + tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { }; + trinity = callPackage ../os-specific/linux/trinity { }; tunctl = callPackage ../os-specific/linux/tunctl { }; From a0e8cbb4993748fbce4e108504a6295d79aa5dc3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 8 Nov 2016 14:05:23 +0800 Subject: [PATCH 087/295] git-up: 1.4.1 -> 1.4.2 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37243a3e7ef..238b8fc076a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7023,16 +7023,16 @@ in { }; git-up = buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; name = "git-up-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/g/git-up/${name}.zip"; - sha256 = "1nsdzjnla0926fzfsqnwyzg3f7g253n8lk4wgw8nj2rv0awbdmas"; + sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q"; }; buildInputs = with self; [ pkgs.git nose ]; - propagatedBuildInputs = with self; [ colorama docopt GitPython six termcolor ]; + propagatedBuildInputs = with self; [ click colorama docopt GitPython six termcolor ]; # git fails to run as it cannot detect the email address, so we set it # $HOME is by default not a valid dir, so we have to set that too From 7438e3d97d030ab2f1711ab2ab6aa92d3f8a3f23 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 8 Nov 2016 04:36:20 +0100 Subject: [PATCH 088/295] trv: fix evaluation that has been broken since e61663a23310a7f7cdb5e87a4ca332948da39177 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d94178c2de0..b47d7c72246 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5230,7 +5230,7 @@ in tinycc = callPackage ../development/compilers/tinycc { }; - inherit (ocaml-ng.ocamlPackages_4_01_0) trv; + inherit (ocaml-ng.ocamlPackages_4_02) trv; bupc = callPackage ../development/compilers/bupc { }; From e3644f240155a0bd9d8c5f434cd3160d9613e0ee Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 8 Nov 2016 04:38:26 +0100 Subject: [PATCH 089/295] ocamlPackages.fieldslib_p4: add ocamlbuild dependency --- pkgs/development/ocaml-modules/fieldslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index bbefcc0f3cc..6a8db9e6281 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1dkzk0wf26rhvji80dz1r56dp6x9zqrnp87wldd4pj56jli94vir"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ type_conv camlp4 ]; createFindlibDestdir = true; From a4f2d339feba9625aec71e136d8a30cd1f92f8ed Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Tue, 8 Nov 2016 10:02:06 +0000 Subject: [PATCH 090/295] haskell.compiler.ghcHEAD: Update to latest upstream --- pkgs/development/compilers/ghc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index aad8a9f6bcb..31c66f17584 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -6,14 +6,14 @@ let inherit (bootPkgs) ghc; in stdenv.mkDerivation rec { - version = "8.1.20160930"; + version = "8.1.20161108"; name = "ghc-${version}"; - rev = "9e862765ffe161da8a4fd9cd67b0a600874feaa9"; + rev = "2e8463b232054b788b73e6551947a9434aa76009"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "01fmp5yrh3is8vzv2vabkzlvm1ry1zcq99m078plx9wgy20giq59"; + sha256 = "1x1vnb2zr2qrak72bdqh65d00q351yhn8xvv5i4i359cf2xjmgfd"; }; patches = [ From 9cdfb334017c6611ccd58880f9739e2649109ffa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 12:42:53 +0100 Subject: [PATCH 091/295] Docs: improve Python expressions as it contained several mistakes and was just messy. --- doc/languages-frameworks/python.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 127614a71b7..df60cc1e573 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -655,9 +655,8 @@ when you try to install a second environment. Create a file, e.g. `build.nix`, with the following expression ```nix with import {}; -with python35Packages; -python.withPackages (ps: with ps; [ numpy ipython ]) +pkgs.python35.withPackages (ps: with ps; [ numpy ipython ]) ``` and install it in your profile with ``` @@ -669,14 +668,15 @@ Now you can use the Python interpreter, as well as the extra packages that you a If you prefer to, you could also add the environment as a package override to the Nixpkgs set. ``` - packageOverrides = pkgs: with pkgs; with python35Packages; { - myEnv = python.withPackages (ps: with ps; [ numpy ipython ]); + packageOverrides = pkgs: with pkgs; { + myEnv = python35.withPackages (ps: with ps; [ numpy ipython ]); }; ``` and install it in your profile with ``` -nix-env -iA nixos.blogEnv +nix-env -iA nixpkgs.myEnv ``` +We're installing using the attribute path and assume the channels is named `nixpkgs`. Note that I'm using the attribute path here. #### Environment defined in `/etc/nixos/configuration.nix` @@ -685,7 +685,7 @@ For the sake of completeness, here's another example how to install the environm ```nix environment.systemPackages = with pkgs; [ - (python35Packages.python.withPackages (ps: callPackage ../packages/common-python-packages.nix { pythonPackages = ps; })) + (python35.withPackages(ps: with ps; [ numpy ipython ])) ]; ``` From e13ffad38368d4d5b068aba130d81b2d284d0d28 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 13:29:57 +0000 Subject: [PATCH 092/295] pythonPackages: hsaudiotag: init at 1.1.1 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b44676c72e4..74159952895 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7424,6 +7424,25 @@ in { }; }; + hsaudiotag = buildPythonPackage (rec { + name = "hsaudiotag-1.1.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/h/hsaudiotag/${name}.tar.gz"; + sha256 = "15hgm128p8nysfi0jb127awga3vlj0iw82l50swjpvdh01m7rda8"; + }; + + # no tests + doCheck = false; + + meta = { + description = "A pure Python library that lets one to read metadata from media files"; + homepage = http://hg.hardcoded.net/hsaudiotag/; + license = licenses.bsd3; + }; + }); + httpauth = buildPythonPackage rec { version = "0.3"; name = "httpauth-${version}"; From e5044310a1725b72bdc4ada8aea14dd58bc379a6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 13:30:02 +0000 Subject: [PATCH 093/295] pythonPackages: hsaudiotag3k: init at 1.1.3 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74159952895..55853e6a026 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7443,6 +7443,25 @@ in { }; }); + hsaudiotag3k = buildPythonPackage (rec { + name = "hsaudiotag3k-1.1.3"; + disabled = !isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/h/hsaudiotag3k/${name}.tar.gz"; + sha256 = "0bv5k5594byr2bmhh77xv10fkdpckcmxg3w380yp30aqf83rcsx3"; + }; + + # no tests + doCheck = false; + + meta = { + description = "A pure Python library that lets one to read metadata from media files"; + homepage = http://hg.hardcoded.net/hsaudiotag/; + license = licenses.bsd3; + }; + }); + httpauth = buildPythonPackage rec { version = "0.3"; name = "httpauth-${version}"; From 08a5c363487e52584ded2ff9a5d54c81edc553b0 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 13:30:06 +0000 Subject: [PATCH 094/295] pythonPackages: send2trash: init at 1.3.0 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55853e6a026..53b06cdd2d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30336,6 +30336,24 @@ in { }; }; + send2trash = buildPythonPackage (rec { + name = "Send2Trash-1.3.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/S/Send2Trash/${name}.tar.gz"; + sha256 = "1zjq5ki02l0vl4f1xymsnqyxipx6q81a435p46db07l3mqg4dx1k"; + }; + + # no tests + doCheck = false; + + meta = { + description = "Send file to trash natively under Mac OS X, Windows and Linux"; + homepage = https://github.com/hsoft/send2trash; + license = licenses.bsd3; + }; + }); + sigtools = buildPythonPackage rec { name = "sigtools-${version}"; version = "1.1a3"; From 79fb5d45a4e65ec21d56326b028f56907e97c49e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 13:30:10 +0000 Subject: [PATCH 095/295] pythonPackages: plyvel: init at 0.9 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53b06cdd2d8..b442aded9f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16341,6 +16341,27 @@ in { }; }); + plyvel = buildPythonPackage (rec { + name = "plyvel-0.9"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/plyvel/${name}.tar.gz"; + sha256 = "1scq75qyks9vmjd19bx57f2y60mkdr44ajvb12p3cjg439l96zaq"; + }; + + buildInputs = with self; [ pkgs.leveldb ] + ++ optional isPy3k pytest; + + # no tests for python2 + doCheck = isPy3k; + + meta = { + description = "Fast and feature-rich Python interface to LevelDB"; + homepage = https://github.com/wbolster/plyvel; + license = licenses.bsd3; + }; + }); + osc = buildPythonPackage (rec { name = "osc-0.133+git"; disabled = isPy3k; From 823f28cd1c64f6d8257a6486c085a356445c2db8 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 8 Nov 2016 21:12:19 +0900 Subject: [PATCH 096/295] flashplayer: 11.2.202.643 -> 11.2.202.644 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 4d598bbb3a9..17168241ed9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -70,11 +70,11 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.643"; + version = "11.2.202.644"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "02imhdzhali42m8d1rw3bqscvi70707mssss7c43dm2kf67z6y8s"; + sha256 = "0hf0hwg4kvz99g9d2arg5dwm3nx0hjnpngz9ay1mihhgjksy585b"; }; nativeBuildInputs = [ unzip ]; From 632282300a9ecbdd8506554aa04c516c64994c84 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Tue, 8 Nov 2016 13:34:04 +0100 Subject: [PATCH 097/295] nginx service: Add missing port toString conversion (#20252) --- nixos/modules/services/web-servers/nginx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 166e5a6b2ce..698d37133d7 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -138,7 +138,7 @@ let server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; ${acmeLocation} location / { - return 301 https://$host${optionalString (port != 443) ":${port}"}$request_uri; + return 301 https://$host${optionalString (port != 443) ":${toString port}"}$request_uri; } } ''} From 101ca1f454d3a0c7f564215063c8f68f5bd08636 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 5 Nov 2016 13:33:43 +0100 Subject: [PATCH 098/295] quiterss: init at 0.18.4 --- .../newsreaders/quiterss/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/newsreaders/quiterss/default.nix diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix new file mode 100644 index 00000000000..53520909b09 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qt5, qmakeHook, makeQtWrapper, pkgconfig, sqlite }: + +stdenv.mkDerivation rec { + name = "quiterss-${version}"; + version = "0.18.4"; + + src = fetchFromGitHub { + owner = "QuiteRSS"; + repo = "quiterss"; + rev = "${version}"; + sha256 = "0gk4s41npg8is0jf4yyqpn8ksqrhwxq97z40iqcbd7dzsiv7bkvj"; + }; + + buildInputs = [ qt5.qtbase qt5.qttools qt5.qtwebkit qmakeHook makeQtWrapper pkgconfig sqlite.dev ]; + + postInstall = '' + wrapQtProgram "$out/bin/quiterss" + ''; + + meta = with stdenv.lib; { + description = "A Qt-based RSS/Atom news feed reader"; + longDescription = '' + QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader + written on Qt/C++ + ''; + homepage = "https://quiterss.org"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b47d7c72246..bdaca93c29c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14260,6 +14260,8 @@ in quirc = callPackage ../tools/graphics/quirc {}; + quiterss = qt5.callPackage ../applications/networking/newsreaders/quiterss {}; + quodlibet = callPackage ../applications/audio/quodlibet { }; quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet { From bbb5f73d711c2d762940a782920fedd34e8d96fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2016 14:58:10 +0100 Subject: [PATCH 099/295] man-pages: 4.07 -> 4.08 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index a488cb58e6f..0661e6e1257 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.07"; + version = "4.08"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "1vimj3va16plxmv46rw6nzw4m9l11hb7r1d217y1bjpd5q8nw8qz"; + sha256 = "1d32ki8nkwd2xiln619jihqn7s15ydrg7386n4hxq530sys7svic"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; From b0dd048cc5f52123190e936d41897851f7aa69c1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 8 Nov 2016 14:06:51 +0000 Subject: [PATCH 100/295] hound: make mercurial indexing work (cherry picked from commit 990716ce72f64be5da644e5eac73b5f145864e75) --- nixos/modules/services/search/hound.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index 708f57a5eb7..1226cba682e 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -116,7 +116,7 @@ in { " -conf ${pkgs.writeText "hound.json" cfg.config}"; }; - path = [ pkgs.git ]; + path = [ pkgs.git pkgs.mercurial pkgs.openssh ]; }; }; From 01910b18014f71a008089f4ebbfeb59af4daa7ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 3 Nov 2016 17:34:36 +0100 Subject: [PATCH 101/295] ocamlPackage.ppx_import: init at 1.1 --- .../ocaml-modules/ppx_import/default.nix | 32 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ppx_import/default.nix diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix new file mode 100644 index 00000000000..245fe3f76f6 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchFromGitHub, buildOcaml, ocaml, opam, + cppo, ppx_tools, ounit, ppx_deriving}: + +buildOcaml rec { + name = "ppx_import"; + + version = "1.1"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "whitequark"; + repo = "ppx_import"; + rev = "v${version}"; + sha256 = "1hfvbc81dg58q7kkpn808b3j0xazrqfrr4v71sd1yvmnk71wak6k"; + }; + + buildInputs = [ cppo ounit ppx_deriving opam ]; + + doCheck = true; + checkTarget = "test"; + + installPhase = '' + opam-installer --script --prefix=$out ppx_import.install | sh + ln -s $out/lib/ppx_import $out/lib/ocaml/${ocaml.version}/site-lib + ''; + + meta = with stdenv.lib; { + description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; + license = licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c8f36e14dfb..92114a9d923 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -416,6 +416,8 @@ let then callPackage ../development/ocaml-modules/ppx_deriving {} else null; + ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; + ppx_tools = if lib.versionAtLeast ocaml.version "4.02" then callPackage ../development/ocaml-modules/ppx_tools {} From 63ef0c7463d8d9d4e5c9eadc769f1ba5960b1552 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Nov 2016 17:01:31 +0100 Subject: [PATCH 102/295] xapianBindings: remove - no package uses it - uses composable derivation, and some changes are needed for python 3 support --- .../libraries/xapian/bindings/default.nix | 88 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 93 deletions(-) delete mode 100644 pkgs/development/libraries/xapian/bindings/default.nix diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix deleted file mode 100644 index 7187f9b575f..00000000000 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, composableDerivation, fetchurl, xapian, pkgconfig, zlib -, python ? null, sphinx ? null, php ? null, ruby ? null }: - -assert (python != null) -> (sphinx != null); - -let inherit (composableDerivation) wwf; in - -composableDerivation.composableDerivation {} rec { - - name = "xapian-bindings-${version}"; - version = (builtins.parseDrvName xapian.name).version; - - src = fetchurl { - url = "http://oligarchy.co.uk/xapian/${version}/${name}.tar.xz"; - sha256 = "0lv2zblayfax4v7z3sj067b0av0phf3gc2s2d1cvkw0bkl07mv1s"; - }; - - buildInputs = [ xapian pkgconfig zlib ]; - - # most interpreters aren't tested yet.. (see python for example how to do it) - flags = - wwf { - name = "python"; - enable = { - buildInputs = [ python sphinx ]; - - # Our `sphinx-build` binary is a shell wrapper around - # `sphinx-build` python code. Makefile tries to execute it - # using python2 and fails. Fixing that here. - patchPhase = '' - for a in python/Makefile* ; do - substituteInPlace $a \ - --replace '$(PYTHON2) $(SPHINX_BUILD)' '$(SPHINX_BUILD)' - done - ''; - - # export same env vars as in pythonNew - preConfigure = '' - export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - mkdir -p $out/nix-support - echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook - echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - // wwf { - name = "php"; - enable = { - buildInputs = [ php ]; - preConfigure = '' - export PHP_EXTENSION_DIR=$out/lib/php # TODO use a sane directory. Its not used anywhere by now - ''; - }; - } - // wwf { - name = "ruby"; - enable = { - buildInputs = [ ruby ]; - preConfigure = '' - export RUBY_LIB=$out/${ruby.libPath} - export RUBY_LIB_ARCH=$RUBY_LIB - mkdir -p $out/nix-support - echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook - echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - - # note: see configure --help to get see which env vars can be used - # // wwf { name = "tcl"; enable = { buildInputs = [ tcl ];};} - # // wwf { name = "csharp"; } - # // wwf { name = "java"; } - ; - - cfg = { - pythonSupport = true; - phpSupport = false; - rubySupport = true; - }; - - meta = { - description = "Bindings for the Xapian library"; - homepage = xapian.meta.homepage; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b47d7c72246..67a9655dfa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9517,11 +9517,6 @@ in xapian = callPackage ../development/libraries/xapian { }; - xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python - php = php56; - sphinx = pythonPackages.sphinx; - }; - xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; }; From a2b018f55ad5c4c481608d887031ea72358db24c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2016 17:20:19 +0100 Subject: [PATCH 103/295] pythonPackages.hypothesis: Disable tests A random failure was preventing simp_le from reaching the channel. http://hydra.nixos.org/build/43253102 --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a51ea9dca52..f24ad5ccbae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12343,6 +12343,9 @@ in { buildInputs = with self; [ flake8 pytest flaky ]; propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34 ]); + # Fails randomly in tests/cover/test_conjecture_engine.py::test_interleaving_engines. + doCheck = false; + # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = '' ${python.interpreter} -m pytest tests/cover From f422afd07dc7925655369a31a14f20803dc03be1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 8 Nov 2016 17:43:33 +0100 Subject: [PATCH 104/295] errbot service: fix `import config` in plugins --- nixos/modules/services/misc/errbot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index f573be69925..427cb7c546d 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -8,7 +8,7 @@ let name = "errbot-plugins"; paths = plugins; }; - mkConfigFile = instanceCfg: dataDir: pkgs.writeText "errbot-config.py" '' + mkConfigDir = instanceCfg: dataDir: pkgs.writeTextDir "config.py" '' import logging BACKEND = '${instanceCfg.backend}' BOT_DATA_DIR = '${dataDir}' @@ -93,7 +93,7 @@ in { serviceConfig = { User = "errbot"; Restart = "on-failure"; - ExecStart = "${pkgs.errbot}/bin/errbot -c ${mkConfigFile instanceCfg dataDir}"; + ExecStart = "${pkgs.errbot}/bin/errbot -c ${mkConfigDir instanceCfg dataDir}/config.py"; PermissionsStartOnly = true; }; })) cfg.instances; From 05f31e5c8a988b47d959d3d15a4d7b5d5d3ad288 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 8 Nov 2016 17:42:27 +0000 Subject: [PATCH 105/295] fix documentation typo in doc/languages-frameworks/haskell.md --- doc/languages-frameworks/haskell.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 904e3a5069e..6728f4abba0 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -633,7 +633,7 @@ Now the builds succeeds. Of course, in the concrete example of `ghc-events` this whole exercise is not an ideal solution, because `ghc-events` can analyze the output emitted by any version of GHC later than 6.12 regardless of the compiler version that was used -to build the `ghc-events' executable, so strictly speaking there's no reason to +to build the `ghc-events` executable, so strictly speaking there's no reason to prefer one built with GHC 7.8.x in the first place. However, for users who cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an older version might be useful. From 229bac0d09077a0f2eb54e5257737fd237917411 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 8 Nov 2016 18:38:42 +0100 Subject: [PATCH 106/295] steam: Add /etc/{localtime,zoneinfo}. Some games (in my case Stardew Valley) require at least something in /etc/localtime. The actual file linked there doesn't matter as long as it's some valid timezone. --- pkgs/games/steam/chrootenv.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index c53418b6523..125566b8428 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -9,11 +9,19 @@ let commonTargetPkgs = pkgs: with pkgs; - let primus2 = - if newStdcpp then primus else primus.override { + let + primus2 = if newStdcpp then primus else primus.override { stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ]; }; + tzdir = "${pkgs.tzdata}/share/zoneinfo"; + # I'm not sure if this is the best way to add things like this + # to an FHSUserEnv + etc-zoneinfo = pkgs.runCommand "zoneinfo" {} '' + mkdir -p $out/etc + ln -s ${tzdir} $out/etc/zoneinfo + ln -s ${tzdir}/UTC $out/etc/localtime + ''; in [ steamPackages.steam-fonts # Errors in output without those @@ -26,6 +34,8 @@ let perl # Open URLs xdg_utils + # Zoneinfo + etc-zoneinfo ] ++ lib.optional withJava jdk ++ lib.optional withPrimus primus2; @@ -76,6 +86,7 @@ in buildFHSUserEnv rec { profile = '' export STEAM_RUNTIME=/steamrt + export TZDIR=/etc/zoneinfo ''; runScript = "steam"; From ab61c1b97c3356d27207dd281e31628bfa0449cb Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 8 Nov 2016 18:59:30 +0100 Subject: [PATCH 107/295] distrho: unstable 2015-07-19 -> 2016-06-26 --- pkgs/applications/audio/distrho/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 12099825757..5d4e19700d8 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -2,12 +2,12 @@ , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { - name = "distrho-ports-git-2015-07-18"; + name = "distrho-ports-unstable-2016-06-26"; src = fetchgit { url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; - rev = "53458838505efef91ed069d0a7d970b6b3588eba"; - sha256 = "1wjzgy5yyi52fn4si2m8zrbbzqsh3p75avfx744jmxj5gpq5qa92"; + rev = "e3969853ec9ba897c50ac060f0167313e2a18b29"; + sha256 = "0id4p8dlnlv5271yvmyawfr754nzah7xhvjkj633lw5yr3mq707m"; }; patchPhase = '' From 4d0bba19f4e1037bcfefa9e5f0b39da00f73281e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= Date: Sun, 9 Oct 2016 12:14:20 +0200 Subject: [PATCH 108/295] openssh: always enable with-kerberos on darwin --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38a2a242847..b89d1f3a582 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3020,7 +3020,7 @@ in openssh = callPackage ../tools/networking/openssh { hpnSupport = false; - withKerberos = false; + withKerberos = stdenv.isDarwin; etcDir = "/etc/ssh"; pam = if stdenv.isLinux then pam else null; }; From 09f87eeb7f48ea15d800d73e2a4229a1d47f26a2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Oct 2016 19:52:07 +0200 Subject: [PATCH 109/295] gn: Init at 0.0.0.20161008 This is the standalone version of GN used currently solely for building Chromium. An upstream bug report is available at https://crbug.com/504074 to support a standalone build without needing various components from the Chromium source tree. Because there isn't a standalone vrsion available, I'm choosing 0.0.0.${date} as the version scheme here so that we don't conflict with versioned releases from upstream someday[TM]. Signed-off-by: aszlig --- .../tools/build-managers/gn/default.nix | 80 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/tools/build-managers/gn/default.nix diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix new file mode 100644 index 00000000000..a579b45cf62 --- /dev/null +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchgit, fetchurl, python, ninja, libevent, xdg-user-dirs }: + +let + date = "20161008"; + + sourceTree = { + "src/base" = { + rev = "e71a514e60b085cc92bf6ef951ec329f52c79f9f"; + sha256 = "0zycbssmd2za0zij8czcs1fr66fi12f1g5ysc8fzkf8khbs5h6a9"; + }; + "src/build" = { + rev = "17093d45bf738e9ae4b6294492860ee65218a657"; + sha256 = "0i9py78c3f46sc789qvdhmgjgyrghysbqjgr67iypwphw52jv2dz"; + }; + "src/tools/gn" = { + rev = "9ff32cf3f1f4ad0212ac674b6303e7aa68f44f3f"; + sha256 = "14jr45k5fgcqk9d18fd77sijlqavvnv0knndh74zyb0b60464hz1"; + }; + "testing/gtest" = { + rev = "585ec31ea716f08233a815e680fc0d4699843938"; + sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc"; + }; + }; + + mkDepend = path: attrs: fetchgit { + url = "https://chromium.googlesource.com/chromium/${path}"; + inherit (attrs) rev sha256; + }; + +in stdenv.mkDerivation rec { + name = "gn-${version}"; + version = "0.0.0.${date}"; + + unpackPhase = '' + ${with stdenv.lib; concatStrings (mapAttrsToList (path: sha256: '' + dest=source/${escapeShellArg (removePrefix "src/" path)} + mkdir -p "$(dirname "$dest")" + cp --no-preserve=all -rT ${escapeShellArg (mkDepend path sha256)} "$dest" + '') sourceTree)} + ( mkdir -p source/third_party + cd source/third_party + unpackFile ${xdg-user-dirs.src} + mv * xdg_user + ) + ''; + + sourceRoot = "source"; + + postPatch = '' + # GN's bootstrap script relies on shebangs (which are relying on FHS paths), + # except when on Windows. So instead of patchShebang-ing it, let's just + # force the same behaviour as on Windows. + sed -i -e '/^def *check_call/,/^[^ ]/ { + s/is_win/True/ + }' tools/gn/bootstrap/bootstrap.py + + # Patch out Chromium-bundled libevent and xdg_user_dirs + sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ + tools/gn/bootstrap/bootstrap.py + ''; + + NIX_LDFLAGS = "-levent"; + + nativeBuildInputs = [ python ninja ]; + buildInputs = [ libevent ]; + + buildPhase = '' + python tools/gn/bootstrap/bootstrap.py -v -s --no-clean + ''; + + installPhase = '' + install -vD out_bootstrap/gn "$out/bin/gn" + ''; + + meta = { + description = "A meta-build system that generates NinjaBuild files"; + homepage = "https://chromium.googlesource.com/chromium/src/tools/gn/"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89d1f3a582..d2ee0c9c7e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6079,6 +6079,8 @@ in global = callPackage ../development/tools/misc/global { }; + gn = callPackage ../development/tools/build-managers/gn { }; + gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; gnum4 = callPackage ../development/tools/misc/gnum4 { }; From d0e8f3c5034ef90933987ab0ba094c5364b7c8de Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Oct 2016 10:50:36 +0200 Subject: [PATCH 110/295] chromium: Add preliminary support for GN This only uses the most basic GN flags which should represent the GYP flags we had before. In order to get rid most of the GYP cruft, we now have common.nix and common-gn.nix which are mostly the same, just that the latter is only for GN builds. The GN implementation is far from complete and currently not even builds, so we need more work to get the beta and dev channels building. Signed-off-by: aszlig --- .../browsers/chromium/common-gn.nix | 202 ++++++++++++++++++ .../networking/browsers/chromium/default.nix | 7 +- 2 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/common-gn.nix diff --git a/pkgs/applications/networking/browsers/chromium/common-gn.nix b/pkgs/applications/networking/browsers/chromium/common-gn.nix new file mode 100644 index 00000000000..e795c2735b0 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/common-gn.nix @@ -0,0 +1,202 @@ +{ stdenv, gn, ninja, which + +# default dependencies +, bzip2, flac, speex, libopus +, libevent, expat, libjpeg, snappy +, libpng, libxml2, libxslt, libcap +, xdg_utils, yasm, minizip, libwebp +, libusb1, pciutils, nss, re2, zlib, libvpx + +, python, pythonPackages, perl, pkgconfig +, nspr, systemd, kerberos +, utillinux, alsaLib +, bison, gperf +, glib, gtk2, dbus_glib +, libXScrnSaver, libXcursor, libXtst, mesa +, protobuf, speechd, libXdamage, cups + +# optional dependencies +, libgcrypt ? null # gnomeSupport || cupsSupport +, libexif ? null # only needed for Chromium before version 51 + +# package customization +, enableSELinux ? false, libselinux ? null +, enableNaCl ? false +, enableHotwording ? false +, gnomeSupport ? false, gnome ? null +, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, proprietaryCodecs ? true +, cupsSupport ? true +, pulseSupport ? false, libpulseaudio ? null +, hiDPISupport ? false + +, upstream-info +}: + +buildFun: + +with stdenv.lib; + +let + # The additional attributes for creating derivations based on the chromium + # source tree. + extraAttrs = buildFun base; + + mkGnFlags = + let + # Serialize Nix types into GN types according to this document: + # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md + mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; + sanitize = value: + if value == true then "true" + else if value == false then "false" + else if isList value then "[${concatMapStringsSep ", " sanitize value}]" + else if isInt value then toString value + else if isString value then mkGnString value + else throw "Unsupported type for GN value `${value}'."; + toFlag = key: value: "${key}=${sanitize value}"; + in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + + gnSystemLibraries = [ + "flac" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" "libxslt" "re2" + "snappy" "yasm" "zlib" + ]; + + opusWithCustomModes = libopus.override { + withCustomModes = true; + }; + + defaultDependencies = [ + bzip2 flac speex opusWithCustomModes + libevent expat libjpeg snappy + libpng libxml2 libxslt libcap + xdg_utils yasm minizip libwebp + libusb1 re2 zlib libvpx + ]; + + # build paths and release info + packageName = extraAttrs.packageName or extraAttrs.name; + buildType = "Release"; + buildPath = "out/${buildType}"; + libExecPath = "$out/libexec/${packageName}"; + + base = rec { + name = "${packageName}-${version}"; + inherit (upstream-info) version; + inherit packageName buildType buildPath; + + src = upstream-info.main; + + nativeBuildInputs = [ gn which python perl pkgconfig ]; + + buildInputs = defaultDependencies ++ [ + nspr nss systemd + utillinux alsaLib + bison gperf kerberos + glib gtk2 dbus_glib + libXScrnSaver libXcursor libXtst mesa + pciutils protobuf speechd libXdamage + pythonPackages.ply pythonPackages.jinja2 + ] ++ optional gnomeKeyringSupport libgnome_keyring3 + ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] + ++ optional enableSELinux libselinux + ++ optionals cupsSupport [ libgcrypt cups ] + ++ optional pulseSupport libpulseaudio; + + patches = [ + ./patches/widevine.patch + ./patches/glibc-2.24.patch + (if versionOlder version "52.0.0.0" + then ./patches/nix_plugin_paths_50.patch + else ./patches/nix_plugin_paths_52.patch) + ]; + + postPatch = '' + # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX + substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ + --replace \ + 'return sandbox_binary;' \ + 'return base::FilePath(GetDevelSandboxPath());' + + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + gpu/config/gpu_info_collector_linux.cc + + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ + chrome/browser/ui/webui/engagement/site_engagement_ui.cc + + sed -i -e '/#include/ { + i #include + :l; n; bl + }' gpu/config/gpu_control_list.cc + + patchShebangs . + '' + optionalString (versionAtLeast version "52.0.0.0") '' + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ + third_party/pdfium/xfa/fxbarcode/utils.h + ''; + + gnFlags = mkGnFlags ({ + linux_use_bundled_binutils = false; + linux_use_bundled_gold = false; + linux_use_gold_flags = true; + is_debug = false; + + proprietary_codecs = false; + use_sysroot = false; + use_gnome_keyring = gnomeKeyringSupport; + use_gconf = gnomeSupport; + use_gio = gnomeSupport; + enable_nacl = enableNaCl; + enable_hotwording = enableHotwording; + selinux = enableSELinux; + use_cups = cupsSupport; + } // { + treat_warnings_as_errors = false; + is_clang = false; + enable_hidpi = hiDPISupport; + + # Google API keys, see: + # http://www.chromium.org/developers/how-tos/api-keys + # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, + # please get your own set of keys. + google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; + google_default_client_id = "404761575300.apps.googleusercontent.com"; + google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; + } // optionalAttrs proprietaryCodecs { + # enable support for the H.264 codec + proprietary_codecs = true; + enable_hangout_services_extension = true; + ffmpeg_branding = "Chrome"; + } // optionalAttrs pulseSupport { + use_pulseaudio = true; + link_pulseaudio = true; + } // (extraAttrs.gnFlags or {})); + + configurePhase = '' + # This is to ensure expansion of $out. + libExecPath="${libExecPath}" + python build/linux/unbundle/replace_gn_files.py \ + --system-libraries ${toString gnSystemLibraries} + gn gen --args=${escapeShellArg gnFlags} out/Release + ''; + + buildPhase = let + buildCommand = target: '' + "${ninja}/bin/ninja" -C "${buildPath}" \ + -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ + "${target}" + '' + optionalString (target == "mksnapshot" || target == "chrome") '' + paxmark m "${buildPath}/${target}" + ''; + targets = extraAttrs.buildTargets or []; + commands = map buildCommand targets; + in concatStringsSep "\n" commands; + }; + +# Remove some extraAttrs we supplied to the base attributes already. +in stdenv.mkDerivation (base // removeAttrs extraAttrs [ + "name" "gnFlags" "buildTargets" +]) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7402a8bae29..c03011c07c1 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -18,10 +18,15 @@ let callPackage = newScope chromium; + # XXX: This is an ugly hack for the transition to GN: + inherit (stdenv.lib) versionAtLeast; + gnRequired = versionAtLeast chromium.upstream-info.version "54.0.0.0"; + common = if gnRequired then ./common-gn.nix else ./common.nix; + chromium = { upstream-info = (callPackage ./update.nix {}).getChannel channel; - mkChromiumDerivation = callPackage ./common.nix { + mkChromiumDerivation = callPackage common { inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport hiDPISupport; From 7a3a16dd8040e7ba675b50ca47d023ee61f087d3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Oct 2016 10:56:22 +0200 Subject: [PATCH 111/295] chromium: Remove plugin paths patch for version 50 The oldest version we build is version 53, so we no longer need this patch. Signed-off-by: aszlig --- .../browsers/chromium/common-gn.nix | 4 +- .../networking/browsers/chromium/common.nix | 4 +- .../patches/nix_plugin_paths_50.patch | 75 ------------------- 3 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch diff --git a/pkgs/applications/networking/browsers/chromium/common-gn.nix b/pkgs/applications/networking/browsers/chromium/common-gn.nix index e795c2735b0..68798071ea1 100644 --- a/pkgs/applications/networking/browsers/chromium/common-gn.nix +++ b/pkgs/applications/networking/browsers/chromium/common-gn.nix @@ -106,9 +106,7 @@ let patches = [ ./patches/widevine.patch ./patches/glibc-2.24.patch - (if versionOlder version "52.0.0.0" - then ./patches/nix_plugin_paths_50.patch - else ./patches/nix_plugin_paths_52.patch) + ./patches/nix_plugin_paths_52.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8a561e75f79..8f6e324765f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -131,9 +131,7 @@ let patches = [ ./patches/widevine.patch ./patches/glibc-2.24.patch - (if versionOlder version "52.0.0.0" - then ./patches/nix_plugin_paths_50.patch - else ./patches/nix_plugin_paths_52.patch) + ./patches/nix_plugin_paths_52.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch deleted file mode 100644 index 062098a8522..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index 74bf041..5f34198 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -66,21 +66,14 @@ static base::LazyInstance - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - #if defined(OS_WIN) -@@ -253,11 +246,11 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -314,7 +307,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -349,7 +342,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); -@@ -366,7 +359,7 @@ bool PathProvider(int key, base::FilePath* result) { - // In the component case, this is the source adapter. Otherwise, it is the - // actual Pepper module that gets loaded. - case chrome::FILE_WIDEVINE_CDM_ADAPTER: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; From 872b4782e929c2eda9076bda9b0b53c4a91c9c8a Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 14 Oct 2016 14:12:49 +0200 Subject: [PATCH 112/295] chromium: 53 -> 54 --- .../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 dfac55a18b6..295651e7c24 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 = "0f6cqvhlg06lrf4bzaiwzm9yi3fi1dk5jrzvjcg7alw3mzrmh2wv"; - sha256bin64 = "02cv9vc1l2nlwa4a0lc7cj9c9czrwp1jd8d024bq16a5fvmhl01l"; - version = "54.0.2840.50"; + sha256 = "1bdjnyc88lpvd0gf5xdmngniijv57phmnih4h896dn2y89dvzv9j"; + sha256bin64 = "0kc16xzh1g0nsxq8gjnh6a2p0a69q2irplwkbgi9wx9ldxl4rg88"; + version = "55.0.2883.21"; }; dev = { - sha256 = "06kcymwi0wfir7w10g8viayk2h0b5a66dav76mlia4lm30p502kz"; - sha256bin64 = "0mgamiffnnkaw8c68b5kyna84x7hlhrzmqfc36kzf434fmm8v5d6"; - version = "55.0.2873.0"; + sha256 = "02zlz4b9rpd57hfzw5jpnzdx746cckdmkfqj8wmij8kxfjrl67m9"; + sha256bin64 = "00bg43k00shcabwv9wv1ipy9y0gwrr769rb18gpkj39xrmv3qzh7"; + version = "56.0.2897.0"; }; stable = { - sha256 = "1hyw0z7dsfaxyy8b4mvnfjy5yj0160hzz9m0wj3vn9zvkfvmhan5"; - sha256bin64 = "0n0px7yi94gdxq7p6pjqfdz04bnh3mcvbaccjaglj6h5p0jc8abq"; - version = "53.0.2785.143"; + sha256 = "0zfxwygqjhq37agqpn34nvjwa8ijm7xc9l6hwv89m5rs1gmx60nj"; + sha256bin64 = "1mlqxglbqdqnhsmy1p6jn1z9md0lsia6lrhw11q7d523masvbb1m"; + version = "54.0.2840.71"; }; } From b43142c958577163ee193401589053141ea2c649 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 29 Oct 2016 03:29:42 +0200 Subject: [PATCH 113/295] chromium: remove pepperflash fixes NixOS#19565 --- .../networking/browsers/chromium/default.nix | 2 +- .../networking/browsers/chromium/plugins.nix | 45 +++++-------------- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c03011c07c1..a16326fc98c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -35,7 +35,7 @@ let browser = callPackage ./browser.nix { inherit channel; }; plugins = callPackage ./plugins.nix { - inherit enablePepperFlash enableWideVine; + inherit enableWideVine; }; }; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index ac7f8111212..f611bfd0275 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,6 +1,5 @@ { stdenv , jshon -, enablePepperFlash ? false , enableWideVine ? false , upstream-info @@ -37,14 +36,12 @@ let echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" ''; - plugins = stdenv.mkDerivation { - name = "chromium-binary-plugins"; + widevine = stdenv.mkDerivation { + name = "chromium-binary-plugin-widevine"; src = upstream-info.binary; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - outputs = [ "flash" "widevine" ]; - out = "flash"; # outputs TODO: is this a hack? unpackCmd = let chan = if upstream-info.channel == "dev" then "chrome-unstable" @@ -53,7 +50,6 @@ let in '' mkdir -p plugins ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \ - ./opt/google/${chan}/PepperFlash \ ./opt/google/${chan}/libwidevinecdm.so \ ./opt/google/${chan}/libwidevinecdmadapter.so ''; @@ -67,13 +63,12 @@ let rpaths = [ stdenv.cc.cc ]; mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; in '' - for sofile in PepperFlash/libpepflashplayer.so \ - libwidevinecdm.so libwidevinecdmadapter.so; do + for sofile in libwidevinecdm.so libwidevinecdmadapter.so; do chmod +x "$sofile" patchelf --set-rpath "${mkrpath rpaths}" "$sofile" done - patchelf --set-rpath "$widevine/lib:${mkrpath rpaths}" \ + patchelf --set-rpath "$out/lib:${mkrpath rpaths}" \ libwidevinecdmadapter.so ''; @@ -81,38 +76,20 @@ let wvName = "Widevine Content Decryption Module"; wvDescription = "Playback of encrypted HTML audio/video content"; wvMimeTypes = "application/x-ppapi-widevine-cdm"; - wvModule = "@widevine@/lib/libwidevinecdmadapter.so"; + wvModule = "@out@/lib/libwidevinecdmadapter.so"; wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; in '' - flashVersion="$( - "${jshon}/bin/jshon" -F PepperFlash/manifest.json -e version -u - )" - - install -vD PepperFlash/libpepflashplayer.so \ - "$flash/lib/libpepflashplayer.so" - - ${mkPluginInfo { - output = "flash"; - allowedVars = [ "flash" "flashVersion" ]; - flags = [ - "--ppapi-flash-path=@flash@/lib/libpepflashplayer.so" - "--ppapi-flash-version=@flashVersion@" - ]; - }} - install -vD libwidevinecdm.so \ - "$widevine/lib/libwidevinecdm.so" + "$out/lib/libwidevinecdm.so" install -vD libwidevinecdmadapter.so \ - "$widevine/lib/libwidevinecdmadapter.so" + "$out/lib/libwidevinecdmadapter.so" ${mkPluginInfo { - output = "widevine"; flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ]; - envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@widevine@/lib"; + envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib"; }} ''; - - passthru.enabled = optional enablePepperFlash plugins.flash - ++ optional enableWideVine plugins.widevine; }; -in plugins +in { + enabled = optional enableWideVine widevine; +} From 5f18ccb001caf62e9c4908354a1fea44bb11300b Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 29 Oct 2016 04:01:04 +0200 Subject: [PATCH 114/295] chromium: Remove flag for hiDPISupport This should now be the upstream default and there also is no more flag for GN to set it, so we'll no longer need it on our side as well. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/common-gn.nix | 2 -- pkgs/applications/networking/browsers/chromium/common.nix | 2 -- pkgs/applications/networking/browsers/chromium/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common-gn.nix b/pkgs/applications/networking/browsers/chromium/common-gn.nix index 68798071ea1..b574edef205 100644 --- a/pkgs/applications/networking/browsers/chromium/common-gn.nix +++ b/pkgs/applications/networking/browsers/chromium/common-gn.nix @@ -28,7 +28,6 @@ , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null -, hiDPISupport ? false , upstream-info }: @@ -154,7 +153,6 @@ let } // { treat_warnings_as_errors = false; is_clang = false; - enable_hidpi = hiDPISupport; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8f6e324765f..3ff90d28b9f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -28,7 +28,6 @@ , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null -, hiDPISupport ? false , upstream-info }: @@ -179,7 +178,6 @@ let } // { werror = ""; clang = false; - enable_hidpi = hiDPISupport; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index a16326fc98c..fd42c1b927b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -12,7 +12,6 @@ , enableWideVine ? false , cupsSupport ? true , pulseSupport ? false -, hiDPISupport ? false }: let @@ -28,8 +27,7 @@ let mkChromiumDerivation = callPackage common { inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome - gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport - hiDPISupport; + gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport; }; browser = callPackage ./browser.nix { inherit channel; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2ee0c9c7e5..764c4822cb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12277,7 +12277,6 @@ in pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; - hiDPISupport = config.chromium.hiDPISupport or false; gnome = gnome2; }; From 8391241e0c90c8e5ee90d86d6cc1c9146e575768 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 29 Oct 2016 04:05:53 +0200 Subject: [PATCH 115/295] chromium: Build with GN unconditionally Previously I've added the extra file common-gn.nix in addition to common.nix, so we can possibly have a smooth transition from current stable to the new version 54. Unfortunately, version 53 is already EOL and we have to move to version 54 as soon as possible so we can only use GN and thus it doesn't make sense to provide expressions for GYP anymore. Signed-off-by: aszlig --- .../browsers/chromium/common-gn.nix | 198 ------------------ .../networking/browsers/chromium/common.nix | 112 ++++------ .../networking/browsers/chromium/default.nix | 7 +- 3 files changed, 42 insertions(+), 275 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/common-gn.nix diff --git a/pkgs/applications/networking/browsers/chromium/common-gn.nix b/pkgs/applications/networking/browsers/chromium/common-gn.nix deleted file mode 100644 index b574edef205..00000000000 --- a/pkgs/applications/networking/browsers/chromium/common-gn.nix +++ /dev/null @@ -1,198 +0,0 @@ -{ stdenv, gn, ninja, which - -# default dependencies -, bzip2, flac, speex, libopus -, libevent, expat, libjpeg, snappy -, libpng, libxml2, libxslt, libcap -, xdg_utils, yasm, minizip, libwebp -, libusb1, pciutils, nss, re2, zlib, libvpx - -, python, pythonPackages, perl, pkgconfig -, nspr, systemd, kerberos -, utillinux, alsaLib -, bison, gperf -, glib, gtk2, dbus_glib -, libXScrnSaver, libXcursor, libXtst, mesa -, protobuf, speechd, libXdamage, cups - -# optional dependencies -, libgcrypt ? null # gnomeSupport || cupsSupport -, libexif ? null # only needed for Chromium before version 51 - -# package customization -, enableSELinux ? false, libselinux ? null -, enableNaCl ? false -, enableHotwording ? false -, gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null -, proprietaryCodecs ? true -, cupsSupport ? true -, pulseSupport ? false, libpulseaudio ? null - -, upstream-info -}: - -buildFun: - -with stdenv.lib; - -let - # The additional attributes for creating derivations based on the chromium - # source tree. - extraAttrs = buildFun base; - - mkGnFlags = - let - # Serialize Nix types into GN types according to this document: - # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md - mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; - sanitize = value: - if value == true then "true" - else if value == false then "false" - else if isList value then "[${concatMapStringsSep ", " sanitize value}]" - else if isInt value then toString value - else if isString value then mkGnString value - else throw "Unsupported type for GN value `${value}'."; - toFlag = key: value: "${key}=${sanitize value}"; - in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); - - gnSystemLibraries = [ - "flac" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" "libxslt" "re2" - "snappy" "yasm" "zlib" - ]; - - opusWithCustomModes = libopus.override { - withCustomModes = true; - }; - - defaultDependencies = [ - bzip2 flac speex opusWithCustomModes - libevent expat libjpeg snappy - libpng libxml2 libxslt libcap - xdg_utils yasm minizip libwebp - libusb1 re2 zlib libvpx - ]; - - # build paths and release info - packageName = extraAttrs.packageName or extraAttrs.name; - buildType = "Release"; - buildPath = "out/${buildType}"; - libExecPath = "$out/libexec/${packageName}"; - - base = rec { - name = "${packageName}-${version}"; - inherit (upstream-info) version; - inherit packageName buildType buildPath; - - src = upstream-info.main; - - nativeBuildInputs = [ gn which python perl pkgconfig ]; - - buildInputs = defaultDependencies ++ [ - nspr nss systemd - utillinux alsaLib - bison gperf kerberos - glib gtk2 dbus_glib - libXScrnSaver libXcursor libXtst mesa - pciutils protobuf speechd libXdamage - pythonPackages.ply pythonPackages.jinja2 - ] ++ optional gnomeKeyringSupport libgnome_keyring3 - ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] - ++ optional enableSELinux libselinux - ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; - - patches = [ - ./patches/widevine.patch - ./patches/glibc-2.24.patch - ./patches/nix_plugin_paths_52.patch - ]; - - postPatch = '' - # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX - substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ - --replace \ - 'return sandbox_binary;' \ - 'return base::FilePath(GetDevelSandboxPath());' - - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ - device/udev_linux/udev?_loader.cc - - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - gpu/config/gpu_info_collector_linux.cc - - sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ - chrome/browser/ui/webui/engagement/site_engagement_ui.cc - - sed -i -e '/#include/ { - i #include - :l; n; bl - }' gpu/config/gpu_control_list.cc - - patchShebangs . - '' + optionalString (versionAtLeast version "52.0.0.0") '' - sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ - third_party/pdfium/xfa/fxbarcode/utils.h - ''; - - gnFlags = mkGnFlags ({ - linux_use_bundled_binutils = false; - linux_use_bundled_gold = false; - linux_use_gold_flags = true; - is_debug = false; - - proprietary_codecs = false; - use_sysroot = false; - use_gnome_keyring = gnomeKeyringSupport; - use_gconf = gnomeSupport; - use_gio = gnomeSupport; - enable_nacl = enableNaCl; - enable_hotwording = enableHotwording; - selinux = enableSELinux; - use_cups = cupsSupport; - } // { - treat_warnings_as_errors = false; - is_clang = false; - - # Google API keys, see: - # http://www.chromium.org/developers/how-tos/api-keys - # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, - # please get your own set of keys. - google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; - google_default_client_id = "404761575300.apps.googleusercontent.com"; - google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; - } // optionalAttrs proprietaryCodecs { - # enable support for the H.264 codec - proprietary_codecs = true; - enable_hangout_services_extension = true; - ffmpeg_branding = "Chrome"; - } // optionalAttrs pulseSupport { - use_pulseaudio = true; - link_pulseaudio = true; - } // (extraAttrs.gnFlags or {})); - - configurePhase = '' - # This is to ensure expansion of $out. - libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gn_files.py \ - --system-libraries ${toString gnSystemLibraries} - gn gen --args=${escapeShellArg gnFlags} out/Release - ''; - - buildPhase = let - buildCommand = target: '' - "${ninja}/bin/ninja" -C "${buildPath}" \ - -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - "${target}" - '' + optionalString (target == "mksnapshot" || target == "chrome") '' - paxmark m "${buildPath}/${target}" - ''; - targets = extraAttrs.buildTargets or []; - commands = map buildCommand targets; - in concatStringsSep "\n" commands; - }; - -# Remove some extraAttrs we supplied to the base attributes already. -in stdenv.mkDerivation (base // removeAttrs extraAttrs [ - "name" "gnFlags" "buildTargets" -]) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3ff90d28b9f..b574edef205 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,13 +1,13 @@ -{ stdenv, ninja, which +{ stdenv, gn, ninja, which # default dependencies , bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libxml2, libxslt, libcap , xdg_utils, yasm, minizip, libwebp -, libusb1, pciutils, nss +, libusb1, pciutils, nss, re2, zlib, libvpx -, python2Packages, perl, pkgconfig +, python, pythonPackages, perl, pkgconfig , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf @@ -37,47 +37,29 @@ buildFun: with stdenv.lib; let - inherit (python2Packages) python gyp ply jinja2; - # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; - mkGypFlags = + mkGnFlags = let + # Serialize Nix types into GN types according to this document: + # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md + mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; sanitize = value: - if value == true then "1" - else if value == false then "0" - else "${value}"; - toFlag = key: value: "-D${key}=${sanitize value}"; + if value == true then "true" + else if value == false then "false" + else if isList value then "[${concatMapStringsSep ", " sanitize value}]" + else if isInt value then toString value + else if isString value then mkGnString value + else throw "Unsupported type for GN value `${value}'."; + toFlag = key: value: "${key}=${sanitize value}"; in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); - gypFlagsUseSystemLibs = { - use_system_bzip2 = true; - use_system_flac = true; - use_system_libevent = true; - use_system_libexpat = true; - # XXX: System libjpeg fails to link for version 52.0.2743.10 - use_system_libjpeg = versionOlder upstream-info.version "52.0.2743.10"; - use_system_libpng = false; - use_system_libwebp = true; - use_system_libxml = true; - use_system_opus = true; - use_system_snappy = true; - use_system_speex = true; - use_system_stlport = true; - use_system_xdg_utils = true; - use_system_yasm = true; - use_system_zlib = false; - use_system_protobuf = false; # needs newer protobuf - - use_system_harfbuzz = false; - use_system_icu = false; # Doesn't support ICU 52 yet. - use_system_libusb = false; # http://crbug.com/266149 - use_system_skia = false; - use_system_sqlite = false; # http://crbug.com/22208 - use_system_v8 = false; - }; + gnSystemLibraries = [ + "flac" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" "libxslt" "re2" + "snappy" "yasm" "zlib" + ]; opusWithCustomModes = libopus.override { withCustomModes = true; @@ -88,7 +70,7 @@ let libevent expat libjpeg snappy libpng libxml2 libxslt libcap xdg_utils yasm minizip libwebp - libusb1 + libusb1 re2 zlib libvpx ]; # build paths and release info @@ -104,23 +86,16 @@ let src = upstream-info.main; - unpackCmd = '' - tar xf "$src" \ - --anchored \ - --no-wildcards-match-slash \ - --exclude='*/tools/gyp' - ''; + nativeBuildInputs = [ gn which python perl pkgconfig ]; buildInputs = defaultDependencies ++ [ - which - python perl pkgconfig nspr nss systemd utillinux alsaLib bison gperf kerberos glib gtk2 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - gyp ply jinja2 + pythonPackages.ply pythonPackages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux @@ -140,12 +115,6 @@ let 'return sandbox_binary;' \ 'return base::FilePath(GetDevelSandboxPath());' - sed -i -r \ - -e 's/-f(stack-protector)(-all)?/-fno-\1/' \ - -e 's|/bin/echo|echo|' \ - -e "/python_arch/s/: *'[^']*'/: '""'/" \ - build/common.gypi chrome/chrome_tests.gypi - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ device/udev_linux/udev?_loader.cc @@ -154,30 +123,36 @@ let sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ chrome/browser/ui/webui/engagement/site_engagement_ui.cc + + sed -i -e '/#include/ { + i #include + :l; n; bl + }' gpu/config/gpu_control_list.cc + + patchShebangs . '' + optionalString (versionAtLeast version "52.0.0.0") '' sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ third_party/pdfium/xfa/fxbarcode/utils.h ''; - gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { + gnFlags = mkGnFlags ({ linux_use_bundled_binutils = false; linux_use_bundled_gold = false; linux_use_gold_flags = true; + is_debug = false; proprietary_codecs = false; use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; use_gconf = gnomeSupport; use_gio = gnomeSupport; - use_pulseaudio = pulseSupport; - linux_link_pulseaudio = pulseSupport; - disable_nacl = !enableNaCl; + enable_nacl = enableNaCl; enable_hotwording = enableHotwording; selinux = enableSELinux; use_cups = cupsSupport; } // { - werror = ""; - clang = false; + treat_warnings_as_errors = false; + is_clang = false; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys @@ -191,22 +166,17 @@ let proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; - } // optionalAttrs (stdenv.system == "x86_64-linux") { - target_arch = "x64"; - python_arch = "x86-64"; - } // optionalAttrs (stdenv.system == "i686-linux") { - target_arch = "ia32"; - python_arch = "ia32"; - } // (extraAttrs.gypFlags or {})); + } // optionalAttrs pulseSupport { + use_pulseaudio = true; + link_pulseaudio = true; + } // (extraAttrs.gnFlags or {})); configurePhase = '' - echo "Precompiling .py files to prevent race conditions..." >&2 - python -m compileall -q -f . > /dev/null 2>&1 || : # ignore errors - # This is to ensure expansion of $out. libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gyp_files.py ${gypFlags} - python build/gyp_chromium -f ninja --depth . ${gypFlags} + python build/linux/unbundle/replace_gn_files.py \ + --system-libraries ${toString gnSystemLibraries} + gn gen --args=${escapeShellArg gnFlags} out/Release ''; buildPhase = let @@ -224,5 +194,5 @@ let # Remove some extraAttrs we supplied to the base attributes already. in stdenv.mkDerivation (base // removeAttrs extraAttrs [ - "name" "gypFlags" "buildTargets" + "name" "gnFlags" "buildTargets" ]) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fd42c1b927b..bf4e4cf8ae3 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -17,15 +17,10 @@ let callPackage = newScope chromium; - # XXX: This is an ugly hack for the transition to GN: - inherit (stdenv.lib) versionAtLeast; - gnRequired = versionAtLeast chromium.upstream-info.version "54.0.0.0"; - common = if gnRequired then ./common-gn.nix else ./common.nix; - chromium = { upstream-info = (callPackage ./update.nix {}).getChannel channel; - mkChromiumDerivation = callPackage common { + mkChromiumDerivation = callPackage ./common.nix { inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport; }; From 5f53fddf1ef784e2279bd4236c9f7566a038e89c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 29 Oct 2016 14:28:06 +0200 Subject: [PATCH 116/295] chromium: Remove some libs from system depenencies Seems that these libraries aren't the ones Chromium is expecting to be, so let's switch to use the bundled version of these libraries instead. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b574edef205..ce3b0f84cbb 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -57,8 +57,7 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "libjpeg" "libpng" "libvpx" "libwebp" "libxml" "libxslt" "re2" - "snappy" "yasm" "zlib" + "flac" "libwebp" "libxml" "libxslt" "snappy" "yasm" ]; opusWithCustomModes = libopus.override { @@ -70,7 +69,7 @@ let libevent expat libjpeg snappy libpng libxml2 libxslt libcap xdg_utils yasm minizip libwebp - libusb1 re2 zlib libvpx + libusb1 re2 zlib ]; # build paths and release info From b84e3379fed770557a983b4c1f7642b0fc7b11de Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 1 Nov 2016 11:39:34 +0100 Subject: [PATCH 117/295] chromium: Bring back pepper flash from Adobe So far we had the bundled Flash player plugin that came with Chrome, but since version 54 the Chrome package doesn't include PPAPI Flash anymore. Instead we're going to download the PPAPI Flash plugin directly from Adobe and try to use them for all release channels of Chromium. Of course it would be nice if we'd have an updater for it but for now it's important that we don't break things for people who are currently forced to use Flash. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 2 +- .../networking/browsers/chromium/plugins.nix | 57 ++++++++++++++++--- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index bf4e4cf8ae3..b59cda875b6 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -28,7 +28,7 @@ let browser = callPackage ./browser.nix { inherit channel; }; plugins = callPackage ./plugins.nix { - inherit enableWideVine; + inherit enablePepperFlash enableWideVine; }; }; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f611bfd0275..9b779ab9892 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,5 +1,7 @@ { stdenv , jshon +, fetchzip +, enablePepperFlash ? false , enableWideVine ? false , upstream-info @@ -8,6 +10,8 @@ with stdenv.lib; let + mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; + # Generate a shell fragment that emits flags appended to the # final makeWrapper call for wrapping the browser's main binary. # @@ -59,16 +63,13 @@ let ! find -iname '*.so' -exec ldd {} + | grep 'not found' ''; - patchPhase = let - rpaths = [ stdenv.cc.cc ]; - mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; - in '' + patchPhase = '' for sofile in libwidevinecdm.so libwidevinecdmadapter.so; do chmod +x "$sofile" - patchelf --set-rpath "${mkrpath rpaths}" "$sofile" + patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" "$sofile" done - patchelf --set-rpath "$out/lib:${mkrpath rpaths}" \ + patchelf --set-rpath "$out/lib:${mkrpath [ stdenv.cc.cc ]}" \ libwidevinecdmadapter.so ''; @@ -90,6 +91,48 @@ let }} ''; }; + + flash = stdenv.mkDerivation rec { + name = "flashplayer-ppapi-${version}"; + version = "23.0.0.205"; + + src = fetchzip { + url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + sha256 = "0gj5d8475qcplm3iqs3hkq0i6qkmbhci1zp3ljnhafc6xz0avyhj"; + stripRoot = false; + }; + + patchPhase = '' + chmod +x libpepflashplayer.so + patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" libpepflashplayer.so + ''; + + doCheck = true; + checkPhase = '' + ! find -iname '*.so' -exec ldd {} + | grep 'not found' + ''; + + installPhase = '' + flashVersion="$( + "${jshon}/bin/jshon" -F manifest.json -e version -u + )" + + install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" + + ${mkPluginInfo { + allowedVars = [ "out" "flashVersion" ]; + flags = [ + "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" + "--ppapi-flash-version=@flashVersion@" + ]; + }} + ''; + + dontStrip = true; + }; + in { - enabled = optional enableWideVine widevine; + enabled = optional enableWideVine widevine + ++ optional enablePepperFlash flash; } From 66ce15a3b163753c7d0c2e237bdaa4e515d77500 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 1 Nov 2016 07:59:30 +0100 Subject: [PATCH 118/295] chromium: Update all channels to latest versions Overview of updated versions: stable: 54.0.2840.71 -> 54.0.2840.90 beta: 55.0.2883.21 -> 55.0.2883.35 dev: 56.0.2897.0 -> 56.0.2906.0 This is to get our Chromium versions in par with the latest upstream ones before merging in the GN migration changes. Signed-off-by: aszlig --- .../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 295651e7c24..5fa9bb86c51 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 = "1bdjnyc88lpvd0gf5xdmngniijv57phmnih4h896dn2y89dvzv9j"; - sha256bin64 = "0kc16xzh1g0nsxq8gjnh6a2p0a69q2irplwkbgi9wx9ldxl4rg88"; - version = "55.0.2883.21"; + sha256 = "11a98nknz7lh5jmjslznccg11nr0wla4c9l40fvxqxjm2gs6qags"; + sha256bin64 = "0qdydj0i9ll72f5m9r48gc3dyc22q6qas5nq8h0mbnrxrwd9dnyj"; + version = "55.0.2883.35"; }; dev = { - sha256 = "02zlz4b9rpd57hfzw5jpnzdx746cckdmkfqj8wmij8kxfjrl67m9"; - sha256bin64 = "00bg43k00shcabwv9wv1ipy9y0gwrr769rb18gpkj39xrmv3qzh7"; - version = "56.0.2897.0"; + sha256 = "1pfgb5dnygyxiwfq6ini5s159c178zz7235npaag7k8gcc10ybnz"; + sha256bin64 = "14s185361inkqh8ykl94xhgv01z68gxqh7j6gyb4jbr0rhcsd9pl"; + version = "56.0.2906.0"; }; stable = { - sha256 = "0zfxwygqjhq37agqpn34nvjwa8ijm7xc9l6hwv89m5rs1gmx60nj"; - sha256bin64 = "1mlqxglbqdqnhsmy1p6jn1z9md0lsia6lrhw11q7d523masvbb1m"; - version = "54.0.2840.71"; + sha256 = "01h1qkdw5dpwz61dybpf4bhag198j082lzwpkdx2nj55k2j3lawl"; + sha256bin64 = "18mxgzi79qhi07wgyyx6bb0lqm9pzkw85ypg6vmqv8gh0abn7dn1"; + version = "54.0.2840.90"; }; } From 0ba3d429a758cec15545fc11c9d3fd1424c5c5f8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2016 20:35:03 +0100 Subject: [PATCH 119/295] cjdns: Disable tests Since 8180922d236c53b5e09cfe1b63f6c12977bb2803, the cjdns module imports from a derivation, which is very bad. It causes all of stdenv to be built at evaluation time. Since we have a hard 3600 second limit on Hydra evaluations, this was causing NixOS jobsets to time out. @joachifm --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 639ee45b38d..5687d5b0e6e 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -221,7 +221,7 @@ in rec { tests.boot-stage1 = callTest tests/boot-stage1.nix {}; tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable; - tests.cjdns = callTest tests/cjdns.nix {}; + #tests.cjdns = callTest tests/cjdns.nix {}; tests.containers-ipv4 = callTest tests/containers-ipv4.nix {}; tests.containers-ipv6 = callTest tests/containers-ipv6.nix {}; tests.containers-bridge = callTest tests/containers-bridge.nix {}; From cf2654b2e0dedd31c6ec14458953c85530db8cec Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 7 Nov 2016 08:34:06 +0900 Subject: [PATCH 120/295] either type: improve merge function --- lib/types.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 26523f59f25..9366d394da7 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -333,7 +333,15 @@ rec { name = "either"; description = "${t1.description} or ${t2.description}"; check = x: t1.check x || t2.check x; - merge = mergeOneOption; + merge = loc: defs: + let + defList = map (d: d.value) defs; + in + if all (x: t1.check x) defList + then t1.merge loc defs + else if all (x: t2.check x) defList + then t2.merge loc defs + else mergeOneOption loc defs; typeMerge = f': let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor; mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor; From 72d1e3ca08491a0c1df35812763e515f50a7e82d Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Tue, 8 Nov 2016 21:53:32 +0100 Subject: [PATCH 121/295] terraform: 0.7.8-> 0.7.9 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index c7f2bc83c4d..6d5c04e601e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.8"; + version = "0.7.9"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0b42qji85h49aabzlb21vkcfpykrf8g4k2a51jhz9y28ywpbx5n4"; + sha256 = "0fqd6k88zhhq0ncnpr3y3k55wrxpd75fizs54cjgjd873b90sm8h"; }; postInstall = '' From a7c986cf69927a24de1eba280ad699f066749b8f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 8 Nov 2016 15:00:09 -0600 Subject: [PATCH 122/295] kdeWrapper: reduce environment pollution --- pkgs/development/libraries/kde-frameworks/kde-env.nix | 9 --------- .../libraries/kde-frameworks/kde-wrapper.nix | 10 ++++++++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix index a48ba32be22..5ddf89a0129 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-env.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-env.nix @@ -26,15 +26,6 @@ stdenv.mkDerivation { done done - for p in $propagated; do - for s in applications dbus-1 desktop-directories icons mime polkit-1; do - if [ -d "$p/share/$s" ]; then - propagatedUserEnvPkgs+=" $p" - break - fi - done - done - runHook postInstall ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix index d340a5edbf7..153ca31fd62 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -37,7 +37,13 @@ stdenv.mkDerivation { fi done - mkdir -p "$out/nix-support" - ln -s "$env/nix-support/propagated-user-env-packages" "$out/nix-support/" + if [ -a "$drv/share" ]; then + ln -s "$drv/share" "$out" + fi + + if [ -a "$drv/nix-support/propagated-user-env-packages" ]; then + mkdir -p "$out/nix-support" + ln -s "$drv/nix-support/propagated-user-env-packages" "$out/nix-support/" + fi ''; } From ec31e2cc2780465732396eb17ac882f4b22ccbd7 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 9 Nov 2016 08:02:38 +1100 Subject: [PATCH 123/295] Fix bcftools installation prefix --- pkgs/applications/science/biology/bcftools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 71ceca12224..7ae62b15d34 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "HSTDIR=${htslib}" - "prefix=$out" + "prefix=$(out)" "CC=cc" ]; From 8c4aee4c79dfdc72232db9cfb3d533fdf67cfd3c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 8 Nov 2016 16:13:56 -0500 Subject: [PATCH 124/295] z3: 4.4.1 -> 4.5.0 --- .../applications/science/logic/z3/default.nix | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 0e43abdd681..fa5c9ba175e 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -4,33 +4,21 @@ let python = python2; in stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; rev = "z3-${version}"; - sha256 = "1ix100r1h00iph1bk5qx5963gpqaxmmx42r2vb5zglynchjif07c"; + sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp"; }; buildInputs = [ python ]; enableParallelBuilding = true; - configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build"; - - # z3's install phase is stupid because it tries to calculate the - # python package store location itself, meaning it'll attempt to - # write files into the nix store, and fail. - soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; - installPhase = '' - mkdir -p $out/bin $out/${python.sitePackages} $out/include - cp ../src/api/z3*.h $out/include - cp ../src/api/c++/z3*.h $out/include - cp z3 $out/bin - cp libz3${soext} $out/lib - cp libz3${soext} $out/${python.sitePackages} - cp z3*.pyc $out/${python.sitePackages} - cp ../src/api/python/*.py $out/${python.sitePackages} + configurePhase = '' + ${python.interpreter} scripts/mk_make.py --prefix=$out --python --pypkgdir=$out/${python.sitePackages} + cd build ''; meta = { From d2e60d1f93c037dd337f32e5d80f1b70915eca57 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 8 Nov 2016 20:18:15 +0100 Subject: [PATCH 125/295] chromium: Fix building with WineVine components Before version 54, the WideVine CDM plugin was built unconditionally and it seems since version 54 this now is dependent upon a GYP/GN flag on whether to include the CDM shared library or not. Also, we now use a patch from Gentoo which should hopefully get the CDM plugin to work properly, at least according to their bugtracker: https://bugs.gentoo.org/show_bug.cgi?id=547630 Signed-off-by: aszlig --- .../networking/browsers/chromium/browser.nix | 5 ++++ .../networking/browsers/chromium/common.nix | 5 ++-- .../networking/browsers/chromium/default.nix | 3 ++- .../browsers/chromium/patches/widevine.patch | 24 +++++++++++-------- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 9eb25c316f9..58e5ab98c16 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -18,6 +18,11 @@ mkChromiumDerivation (base: rec { cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" + if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then + cp -v "$buildPath/libwidevinecdmadapter.so" \ + "$libExecPath/libwidevinecdmadapter.so" + fi + mkdir -p "$sandbox/bin" cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ce3b0f84cbb..e70f180f489 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -23,6 +23,7 @@ , enableSELinux ? false, libselinux ? null , enableNaCl ? false , enableHotwording ? false +, enableWideVine ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome_keyring3 ? null , proprietaryCodecs ? true @@ -102,10 +103,9 @@ let ++ optional pulseSupport libpulseaudio; patches = [ - ./patches/widevine.patch ./patches/glibc-2.24.patch ./patches/nix_plugin_paths_52.patch - ]; + ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX @@ -147,6 +147,7 @@ let use_gio = gnomeSupport; enable_nacl = enableNaCl; enable_hotwording = enableHotwording; + enable_widevine = enableWideVine; selinux = enableSELinux; use_cups = cupsSupport; } // { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index b59cda875b6..1556603db2c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -22,7 +22,8 @@ let mkChromiumDerivation = callPackage ./common.nix { inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome - gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport; + gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport + enableWideVine; }; browser = callPackage ./browser.nix { inherit channel; }; diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch index 45048cada87..90a13928e3b 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch @@ -1,12 +1,16 @@ -diff -upr chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h ---- chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h 2015-04-15 01:18:59.000000000 +0300 -+++ chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h 2015-04-15 09:09:49.157260050 +0300 -@@ -14,4 +14,8 @@ - // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available - // as a string, e.g., "1.0.123.456"). +Minimal WideVine patch from Gentoo: + +https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r1.patch + +BTS: https://bugs.gentoo.org/show_bug.cgi?id=547630 + +--- a/third_party/widevine/cdm/stub/widevine_cdm_version.h ++++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h +@@ -10,6 +10,7 @@ + + #include "third_party/widevine/cdm/widevine_cdm_common.h" + ++#define WIDEVINE_CDM_VERSION_STRING "unknown" + #define WIDEVINE_CDM_AVAILABLE -+#include "third_party/widevine/cdm/widevine_cdm_common.h" -+#define WIDEVINE_CDM_AVAILABLE -+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@" -+ #endif // WIDEVINE_CDM_VERSION_H_ From 6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 8 Nov 2016 21:19:49 +0100 Subject: [PATCH 126/295] chromium: Add Gtk 3 for versions >= 56 Versions before 56 already had experimental support for Gtk 3 and since version 56, Gtk 3 _seemed_ to become the default. Although it's now requiring *both* Gtk 2 and Gtk3, so let's supply the dependency for now to get it to build. In the future however we might want to add use_gtk3 to the GN flags and get rid of Gtk 2 completely. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e70f180f489..07ad1bef25f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, dbus_glib +, glib, gtk2, gtk3, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage, cups @@ -100,7 +100,8 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; + ++ optional pulseSupport libpulseaudio + ++ optional (versionAtLeast version "56.0.0.0") gtk3; patches = [ ./patches/glibc-2.24.patch From 8de2eeec33f7a31fe992f3c94d928bf3a8f2621b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Nov 2016 02:18:46 +0100 Subject: [PATCH 127/295] icmake: 9.00.00 -> 9.02.02 --- pkgs/development/tools/build-managers/icmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 03968d15b12..9185f5b9eaa 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.00.00"; + version = "9.02.02"; src = fetchFromGitHub { - sha256 = "028rxx4ygy0z48m30m5pdach7kcp41swchhs8i15wag1mppllcy2"; + sha256 = "0f7w3b8r2h6ckgzc6wbfbw5yyxia0f3j3acmzi1yzylj6ak05mmd"; rev = version; repo = "icmake"; owner = "fbb-git"; From 677a32e838c77da00867899a8c5119f5ea33bf22 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Nov 2016 03:08:23 +0100 Subject: [PATCH 128/295] bobcat: 4.02.00 -> 4.03.00 --- pkgs/development/libraries/bobcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index fbc7df68d44..dcd35613d54 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "bobcat-${version}"; - version = "4.02.00"; + version = "4.03.00"; src = fetchFromGitHub { - sha256 = "1hl5b2g4cmxcafkcpr4vs0c705cy254g0h410zi5wxnygjam8adn"; + sha256 = "0jkwq3f6g3vbim2jg5wfzhin89r4crnypqggp8cqimjmpkyfqnv0"; rev = version; repo = "bobcat"; owner = "fbb-git"; From e1220105e3c59ad61874118c6389fd3be2144973 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 17:30:57 +0100 Subject: [PATCH 129/295] netsniff-ng: 0.6.1 -> 0.6.2 --- pkgs/tools/networking/netsniff-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 742e6a93b65..5ca3079a084 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.1"; + version = "0.6.2"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "0nl0xq7dwhryrd8i5iav8fj4x9jrna0afhfim5nrx2kwp5yylnvi"; + sha256 = "1lz4hwgwdq3znlqjmvl7cw3g3ilbayn608h0hwqdf7v2jq6n67kg"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl From 11dacb7e2c4383ff0bffa7d7a10157aaac0a0378 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Nov 2016 19:14:45 +0100 Subject: [PATCH 130/295] mcelog: 142 -> 144 --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 590d2b4a854..dee201c1778 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "142"; + version = "144"; src = fetchFromGitHub { - sha256 = "1cqx7w75d570vxqi2gk9bkqqclakkhp4kjanv5j3nhqwg3p38zyv"; + sha256 = "05b1x9z6x9yz3xmb93qvwwssjbvp28bawy8as9bfm29pyhzdxx6k"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From 583af41f3c484d57daf3fcbd9dcf979eae0f3f73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Nov 2016 19:16:58 +0100 Subject: [PATCH 131/295] remotebox: 2.1 -> 2.2 --- pkgs/applications/virtualization/remotebox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 63389153a0a..a99e6f56956 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0pyi433pwbpyh58p08q8acav7mk90gchgjghvl9f8wqafx7bp404"; + sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; From ea301adfd1bf1cdd6fceca8e6c4a6e111a46ed02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 18:07:40 +0100 Subject: [PATCH 132/295] pagemon: 0.01.08 -> 0.01.10 --- pkgs/os-specific/linux/pagemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 4246e512321..414338702cc 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.08"; + version = "0.01.10"; src = fetchFromGitHub { - sha256 = "079x8ah33nh4faqcy0jy24x30l40j5m00d57aawaayaq18smqs3f"; + sha256 = "04dbcr7bzgp4kvhw1rsn084cz4qbfhf7ifyh3ikgdka9w98057h1"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; From 44774e1da2b6b412824d4c2e10a3f71cc9f590f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 18:41:57 +0100 Subject: [PATCH 133/295] pythonPackages.pgspecial: 1.5.0 -> 1.6.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f24ad5ccbae..f2bb2c753e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18324,10 +18324,10 @@ in { pgspecial = buildPythonPackage rec { name = "pgspecial-${version}"; - version = "1.5.0"; + version = "1.6.0"; src = pkgs.fetchurl { - sha256 = "14bqlwcnbyn3ikzg5wr7iqrlfwbcy5vaa5n1mmgg305yal34lk6d"; + sha256 = "09ilalpgcl86f79648qsjm87dqi97bc70y51nrf0b3i1py3mhs2m"; url = "mirror://pypi/p/pgspecial/${name}.tar.gz"; }; From 3e2ba413c0b5daba959d5bbfc6982d8d5d2e0be0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 18:42:16 +0100 Subject: [PATCH 134/295] pythonPackages.sqlparse: 0.1.19 -> 0.2.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2bb2c753e8..77c4c4fcbdf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24316,11 +24316,11 @@ in { sqlparse = buildPythonPackage rec { name = "sqlparse-${version}"; - version = "0.1.19"; + version = "0.2.2"; src = pkgs.fetchurl { url = "mirror://pypi/s/sqlparse/${name}.tar.gz"; - sha256 = "1s2fvaxgh9kqzrd6iwy5h7i61ckn05plx9np13zby93z3hdbx5nq"; + sha256 = "08dszglfhf1c4rwqinkbp4x55v0b90rgm1fxc1l4dy965imjjinl"; }; buildInputs = with self; [ pytest ]; From 220bdd33c7faa5d98762f65da86db7ea327858b6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Nov 2016 18:42:33 +0100 Subject: [PATCH 135/295] pythonPackages.pgcli: 1.1.0 -> 1.3.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77c4c4fcbdf..308695a042d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18286,10 +18286,10 @@ in { pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "1.1.0"; + version = "1.3.1"; src = pkgs.fetchFromGitHub { - sha256 = "155avdckg93w3rmx0mz17wi6vcaba3lcppv9qwa6xlxfds9yzvlq"; + sha256 = "18i5pwli36d5d0xh1d7dc80iq85w7vcalphg8hipjclhg2h72bp0"; rev = "v${version}"; repo = "pgcli"; owner = "dbcli"; From cef68b475e8176a4871de5b7ad4d214ebe5c4ba2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Nov 2016 08:42:38 +0100 Subject: [PATCH 136/295] haskell-diff-parse: jailbreak to fix test suite build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4f93b2f857c..e618059a7d4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1071,4 +1071,7 @@ self: super: { # Test suite occasionally runs for 1+ days on Hydra. distributed-process-tests = dontCheck super.distributed-process-tests; + # https://github.com/mulby/diff-parse/issues/9 + diff-parse = doJailbreak super.diff-parse; + } From 4e7eb75a79a48b0d7068f1949f8c7c42553181d7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 9 Nov 2016 09:41:10 +0100 Subject: [PATCH 137/295] nixos/tests/chromium: Fix popup detection Sometimes it happens that the "Type to search or enter a URL to navigate" popup doesn't show, but all we need to know at this time is whether Chromium has finished starting up. So checking for the "startup done" page is a better option here. Signed-off-by: aszlig --- nixos/tests/chromium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 9a6414f81c3..55b1fb5a722 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -118,7 +118,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { "ulimit -c unlimited; ". "chromium $args \"$url\" & disown" ); - $machine->waitForText(qr/Type to search or enter a URL to navigate/); + $machine->waitForText(qr/startup done/); $machine->waitUntilSucceeds("${xdo "check-startup" '' search --sync --onlyvisible --name "startup done" # close first start help popup From 167e0a7d460e1e8b52a1299e6cff245d8f2079b2 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 9 Nov 2016 09:07:55 -0200 Subject: [PATCH 138/295] lumina: install the translation files --- pkgs/desktops/lumina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 66229420cf6..dcacabc39c1 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" ''; - qmakeFlags = [ "LINUX_DISTRO=NixOS" ]; + qmakeFlags = [ "LINUX_DISTRO=NixOS" "CONFIG+=WITH_I18N" ]; enableParallelBuilding = true; From 6042d6e39d40beb93ccb86a6113ba0344288d6cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Nov 2016 12:52:56 +0100 Subject: [PATCH 139/295] Remove file named '\' This looks like it was accidental. Fixes #20253. --- "pkgs/development/libraries/mpir/\\" | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 "pkgs/development/libraries/mpir/\\" diff --git "a/pkgs/development/libraries/mpir/\\" "b/pkgs/development/libraries/mpir/\\" deleted file mode 100644 index b7872ece6ae..00000000000 --- "a/pkgs/development/libraries/mpir/\\" +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl}: -stdenv.mkDerivation rec { - name = "mpir-${version}"; - version = "1"; - inherit buildInputs; - src = fetchurl { - url = "http://mpir.org/mpir-${version}.tar.bz2"; - sha256 = "0000000000000000000000000000000000000000000000000000000000000000"; - }; - meta = { - inherit version; - description = ''A highly optimised library for bignum arithmetic forked from GMP''; - license = stdenv.lib.licenses. ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - downloadPage = "http://mpir.org/downloads.html"; - homepage = "http://mpir.org/"; - updateWalker = true; - }; -} From 4a7cf195a4d17fd1199098d71e9a735eae4fbd5b Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Wed, 26 Oct 2016 11:46:12 +0200 Subject: [PATCH 140/295] molly-guard: init at 0.6.3 --- lib/maintainers.nix | 1 + .../os-specific/linux/molly-guard/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 44 insertions(+) create mode 100644 pkgs/os-specific/linux/molly-guard/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 28ff28fba71..cf72b049596 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -116,6 +116,7 @@ deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>"; demin-dmitriy = "Dmitriy Demin "; DerGuteMoritz = "Moritz Heidkamp "; + DerTim1 = "Tim Digel "; desiderius = "Didier J. Devroye "; devhell = "devhell <\"^\"@regexmail.net>"; dezgeg = "Tuomas Tynkkynen "; diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix new file mode 100644 index 00000000000..ac083e545fe --- /dev/null +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, dpkg, busybox, systemd }: + +stdenv.mkDerivation rec { + name = "molly-guard-${version}"; + version = "0.6.3"; + + src = fetchurl { + url = "https://launchpad.net/ubuntu/+source/molly-guard/${version}/+build/8892607/+files/molly-guard_${version}_all.deb"; + sha256 = "1d1x60m6kh9wfh9lc22g5s0j40aivwgsczykk27ymwl1pvk58dxn"; + }; + + buildInputs = [ dpkg ]; + + sourceRoot = "."; + + unpackCmd = '' + dpkg-deb -x "$src" . + ''; + + installPhase = '' + sed -i "s|/lib/molly-guard|${systemd}/sbin|g" lib/molly-guard/molly-guard + sed -i "s|run-parts|${busybox}/bin/run-parts|g" lib/molly-guard/molly-guard + sed -i "s|/etc/molly-guard/|$out/etc/molly-guard/|g" lib/molly-guard/molly-guard + cp -r ./ $out/ + ''; + + postFixup = '' + for modus in init halt poweroff reboot runlevel shutdown telinit; do + ln -sf $out/lib/molly-guard/molly-guard $out/bin/$modus; + done; + ''; + + meta = with stdenv.lib; { + description = "Attempts to prevent you from accidentally shutting down or rebooting machines"; + homepage = https://anonscm.debian.org/git/collab-maint/molly-guard.git/; + license = licenses.artistic2; + platforms = platforms.linux; + maintainers = with maintainers; [ DerTim1 ]; + priority = -10; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92bd700f966..4e46a0818a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2738,6 +2738,8 @@ in modsecurity_standalone = callPackage ../tools/security/modsecurity { }; + molly-guard = callPackage ../os-specific/linux/molly-guard { }; + monit = callPackage ../tools/system/monit { }; moreutils = callPackage ../tools/misc/moreutils { From 27e2cd286ebf69d30a22b878fdac446039390d5f Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Wed, 9 Nov 2016 15:27:50 +0100 Subject: [PATCH 141/295] pythonPackages.docker_pycreds: init at 0.2.1 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 308695a042d..76bae5918c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6102,6 +6102,28 @@ in { }; }; + docker_pycreds = buildPythonPackage rec { + name = "docker-pycreds-${version}"; + version = "0.2.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/docker-pycreds/${name}.tar.gz"; + sha256 = "0j3k5wk3bww5y0f2rvgzsin0q98k0i9j308vpsmxidw0y8n3m0wk"; + }; + + doCheck = false; # require docker-credential-helpers binaries + + propagatedBuildInputs = with self; [ + six + ]; + + meta = { + description = "Python bindings for the docker credentials store API."; + homepage = https://github.com/shin-/dockerpy-creds; + license = licenses.asl20; + }; + }; + docker_registry_core = buildPythonPackage rec { name = "docker-registry-core-2.0.3"; disabled = isPy3k; From 8d36794046f9796f7c71c97c3057dd1acc4ea89b Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Wed, 9 Nov 2016 15:32:54 +0100 Subject: [PATCH 142/295] pythonPackages.docker: 1.9.0 -> 1.10.6 --- pkgs/top-level/python-packages.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76bae5918c9..f64e56982a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6066,14 +6066,22 @@ in { docker = buildPythonPackage rec { name = "docker-py-${version}"; - version = "1.9.0"; + version = "1.10.6"; + disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/d/docker-py/${name}.tar.gz"; - sha256 = "0zkdgz6akzfdda29y4bwa444r0sr2py5pwvvh6bnsy25lwabkikd"; + sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; }; - propagatedBuildInputs = with self; [ six requests2 websocket_client ipaddress backports_ssl_match_hostname ]; + propagatedBuildInputs = with self; [ + six + requests2 + websocket_client + ipaddress + backports_ssl_match_hostname + docker_pycreds + ]; # Version conflict doCheck = false; From 9b06e35d33383e4ead778a46547e4c11caf7eb4e Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 8 Nov 2016 20:25:39 -0400 Subject: [PATCH 143/295] fossil scm version patch The attached patch advances the version of the fossil expression in Nixpkgs to the latest release 1.36 From fdd5d610e35eed355f5f3fec9d3675aa60f36292 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 8 Nov 2016 20:23:22 -0400 Subject: [PATCH] fossil : advance to version 1.36 --- pkgs/applications/version-management/fossil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d940e9b5659..14a492f6cc2 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -2,15 +2,15 @@ , tcllib, withJson ? true}: stdenv.mkDerivation rec { - name = "fossil-1.35"; + name = "fossil-1.36"; src = fetchurl { urls = [ - https://www.fossil-scm.org/download/fossil-src-1.35.tar.gz + https://fossil-scm.org/index.html/uv/download/fossil-src-1.36.tar.gz ]; name = "${name}.tar.gz"; - sha256 = "07ds6rhq69bhydpm9a01mgdhxf88p9b6y5hdnhn8gjc7ba92zyf1"; + sha256 = "04px1mnq5dlc6gaihxj5nj6k7ac43wfryzifaairjh74qmgc6xi6"; }; buildInputs = [ zlib openssl readline sqlite which ed ] From 20d16f86cc4798b03c7ca9cd6e628964348143a1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:23:05 +0100 Subject: [PATCH 144/295] pythonPackages.pillow: 3.3.1 -> 3.4.2 Solves vulnerabilities mentioned in https://github.com/NixOS/nixpkgs/issues/20274 --- pkgs/top-level/python-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f64e56982a3..41681ea4433 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18647,11 +18647,12 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; pillow = buildPythonPackage rec { - name = "Pillow-3.3.1"; + name = "Pillow-${version}"; + version = "3.4.2"; src = pkgs.fetchurl { url = "mirror://pypi/P/Pillow/${name}.tar.gz"; - sha256 = "3491ca65d9fdba4db094ab3f8e17170425e7dd670e507921a665a1975d1b3df1"; + sha256 = "0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1"; }; # Check is disabled because of assertion errors, see @@ -18686,18 +18687,14 @@ in { meta = { homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; - longDescription = '' The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library supports many file formats, and provides powerful image processing and graphics capabilities. ''; - license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi ]; }; }; From ce55d91a17bcf83373f1d54070d56fa0acb0c4a0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 9 Nov 2016 16:31:52 +0100 Subject: [PATCH 145/295] perl-Math-BigInt: 1.999726 -> 1.999727 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2c4e70c7cd1..4ef49116bee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7778,10 +7778,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999726"; + name = "Math-BigInt-1.999727"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "dc3d9502c8633939000d04e7fbabcfc10fb8febb31c8e874a7bd60201c2228c4"; + sha256 = "4539b8e55f828a9f370b46cd6ef6618c95cb15302384a8f84c2a1fec66d4e33e"; }; meta = { description = "Arbitrary size integer/float math package"; From 04d30023cfc5ee9e6797c60b58fbfa4121cc03a2 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 9 Nov 2016 16:32:10 +0100 Subject: [PATCH 146/295] fira-code: 1.203 -> 1.204 --- pkgs/data/fonts/fira-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 4fae5378463..e14505f61bd 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fira-code-${version}"; - version = "1.203"; + version = "1.204"; src = fetchurl { url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sha256 = "0pjziaklmkpl67ybp45q9ndya5adf9x8svhdv9643dq9jsrxbkj1"; + sha256 = "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18"; }; sourceRoot = "otf"; From 9f251e1cb138f4a299b1da4257ba119311373ff4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 9 Nov 2016 18:05:11 +0100 Subject: [PATCH 147/295] eclipse-plugin-acejump: 1.0.0.201501181511 -> 1.0.0.201610261941 --- 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 bc3f7b064d4..42396b72e7c 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -83,16 +83,16 @@ rec { acejump = buildEclipsePlugin rec { name = "acejump-${version}"; - version = "1.0.0.201501181511"; + version = "1.0.0.201610261941"; srcFeature = fetchurl { url = "https://tobiasmelcher.github.io/acejumpeclipse/features/acejump.feature_${version}.jar"; - sha256 = "127xqrnns4h96g21c9zg0iblxprx3fg6fg0w5f413rf84415z884"; + sha256 = "1szswjxp9g70ibfbv3p8dlq1bngq7nc22kp657z9i9kp8309md2d"; }; srcPlugin = fetchurl { url = "https://tobiasmelcher.github.io/acejumpeclipse/plugins/acejump_${version}.jar"; - sha256 = "0mz79ca32yryidd1wijirvnmfg4j5q4g84vdspdi56z0r4xrja13"; + sha256 = "1cn64xj2bm69vnn9db2xxh6kq148v83w5nx3183mrqb59ym3v9kf"; }; meta = with stdenv.lib; { From 4809263cb10a9d10df7974f7a4ccb8b042859e5f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 9 Nov 2016 18:54:34 +0100 Subject: [PATCH 148/295] pythonPackages.sqlmap: 1.0.9.post5 -> 1.0.11 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41681ea4433..9560205004b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23163,11 +23163,11 @@ in { }; sqlmap = buildPythonPackage { - name = "sqlmap-1.0.9.post5"; + name = "sqlmap-1.0.11"; src = pkgs.fetchurl { - url = "mirror://pypi/s/sqlmap/sqlmap-1.0.9.post5.tar.gz"; - sha256 = "0g8sjky8anrmcisc697b5qndp88qmay35kng9sz9x46wd3agm9pa"; + url = "mirror://pypi/s/sqlmap/sqlmap-1.0.11.tar.gz"; + sha256 = "1x4amyjqnd9j5g2kp9nvg8pr5sqzbhr8gd0m6d671bshvgj568vr"; }; meta = with pkgs.stdenv.lib; { From ecfb8df7a77beeb8ed8e7238d928909665d2b183 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 9 Nov 2016 20:02:09 +0100 Subject: [PATCH 149/295] libressl_2_3: 2.3.8 -> 2.3.9 --- pkgs/development/libraries/libressl/2.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix index 1c101365950..aa584115689 100644 --- a/pkgs/development/libraries/libressl/2.3.nix +++ b/pkgs/development/libraries/libressl/2.3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1hjglpaw1bparlzyjczn0rak32n8hl53317izq81683x5kns8smf"; + sha256 = "1z4nh45zdh1gllhgbvlgd2vk4srhbaswyn82l3dzcfmi9rk17zx6"; }; enableParallelBuilding = true; From 52f1a3789839281ab0f7fad9506f34d6dd379225 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 9 Nov 2016 20:02:45 +0100 Subject: [PATCH 150/295] libressl_2_4: 2.4.3 -> 2.4.4 --- pkgs/development/libraries/libressl/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix index 6db9df2a59e..a0d8511e2b8 100644 --- a/pkgs/development/libraries/libressl/2.4.nix +++ b/pkgs/development/libraries/libressl/2.4.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "03ln2ac9cv0pbz3109yjk7cr5yxqfk8ld6g61k9sgrs7wbrjcmxx"; + sha256 = "1ldzxqc0bds9mwnirrckhx42y3k0v5cx997nnbfa2gkk6ilszkvg"; }; enableParallelBuilding = true; From bac11893993088ade3bce7cbafe21c6dd82c27a5 Mon Sep 17 00:00:00 2001 From: Daniel Haraj Date: Wed, 9 Nov 2016 14:26:43 -0500 Subject: [PATCH 151/295] haskell.compiler.ghcHEAD: fix patchPhase #10752 --- ...pass-linker-flags-via-response-files.patch | 20 +++++++++++++++++++ pkgs/development/compilers/ghc/head.nix | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch diff --git a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch new file mode 100644 index 00000000000..ebbb9326a82 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch @@ -0,0 +1,20 @@ +--- ghc/compiler/main/SysTools.hs 2016-11-09 14:03:05.304528147 -0500 ++++ ghc2/compiler/main/SysTools.hs 2016-11-09 14:00:19.712934686 -0500 +@@ -421,7 +421,7 @@ + args1 = map Option (getOpts dflags opt_c) + args2 = args0 ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env ++ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env + where + -- discard some harmless warnings from gcc that we can't turn off + cc_filter = unlines . doFilter . lines +@@ -911,7 +911,7 @@ + args1 = map Option (getOpts dflags opt_l) + args2 = args0 ++ linkargs ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env ++ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env + where + ld_filter = case (platformOS (targetPlatform dflags)) of + OSSolaris2 -> sunos_ld_filter diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 31c66f17584..d57b6e575da 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -6,18 +6,18 @@ let inherit (bootPkgs) ghc; in stdenv.mkDerivation rec { - version = "8.1.20161108"; + version = "8.1.20161109"; name = "ghc-${version}"; rev = "2e8463b232054b788b73e6551947a9434aa76009"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1x1vnb2zr2qrak72bdqh65d00q351yhn8xvv5i4i359cf2xjmgfd"; + sha256 = "12nxai5qqnw42syhd0vzl2f9f8z28rc0fsa7g771dyzpqglak90l"; }; patches = [ - ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ]; postUnpack = '' From 2c754df9b3cdba3f5827e1b1dbda240820ab5ad4 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 9 Nov 2016 21:26:25 +0100 Subject: [PATCH 152/295] clipster: init at unstable 2016-09-12 --- pkgs/tools/misc/clipster/default.nix | 50 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/misc/clipster/default.nix diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix new file mode 100644 index 00000000000..27df38c566b --- /dev/null +++ b/pkgs/tools/misc/clipster/default.nix @@ -0,0 +1,50 @@ +{fetchFromGitHub , stdenv, makeWrapper, python, gtk3, libwnck3 }: + +stdenv.mkDerivation rec { + name = "clipster-unstable-${version}"; + version = "2016-09-12"; + + src = fetchFromGitHub { + owner = "mrichar1"; + repo = "clipster"; + rev = "6526a849a0af4c392f4e8e5b18aacdda9c1a8e80"; + sha256 = "0illdajp5z50h7lvglv0p72cpv4c592xmpamrg8kkjpg693bp873"; + }; + + pythonEnv = python.withPackages(ps: with ps; [ dbus-python pygtk pygobject3 ]); + + buildInputs = [ pythonEnv gtk3 libwnck3 makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin/ + cp clipster $out/bin/ + wrapProgram "$out/bin/clipster" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + ''; + + meta = with stdenv.lib; { + description = "lightweight python clipboard manager"; + longDescription = '' + Clipster was designed to try to add a good selection of useful features, while avoiding bad design decisions or becoming excessively large. + Its feature list includes: + - Event driven, rather than polling. More efficient, helps with power management. + - Control over when it write to disk, for similar reasons. + - Command-line options/config for everything. + - No global keybindings - that's the job of a Window Manager + - Sensible handling of unusual clipboard events. Some apps (Chrome, Emacs) trigger a clipboard 'update event' for every character you select, rather than just one event when you stop selecting. + - Preserves the last item in clipboard after an application closes. (Many apps clear the clipboard on exit). + - Minimal dependencies, no complicated build/install requirements. + - utf-8 support + - Proper handling of embedded newlines and control codes. + - Smart matching of urls, emails, regexes. (extract_*) + - Option to synchronise the SELECTION and CLIPBOARD clipboards. (sync_selections) + - Option to track one or both clipboards. (active_selections) + - Option to ignore clipboard updates form certain applications. (filter_classes) + - Ability to delete items in clipboard history. + ''; + license = licenses.agpl3; + homepage = https://github.com/mrichar1/clipster; + platforms = platforms.linux; + maintainers = [maintainers.magnetophon]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e46a0818a1..0635fd00aec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -749,6 +749,8 @@ in chntpw = callPackage ../tools/security/chntpw { }; + clipster = callPackage ../tools/misc/clipster { }; + coprthr = callPackage ../development/libraries/coprthr { flex = flex_2_5_35; }; From ce78681cb6efd90fb21ad330e246c85bc1c95b24 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Thu, 10 Nov 2016 05:27:41 +0800 Subject: [PATCH 153/295] k3d: update upstream url --- pkgs/applications/graphics/k3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index ba43a2e7f2a..d8052f93345 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A 3D editor with support for procedural editing"; - homepage = "http://k-3d.org/"; + homepage = http://www.k-3d.org/; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; From 1bf7440b548499c17681ef8235e0b718c132d23c Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Thu, 10 Nov 2016 00:11:42 +0100 Subject: [PATCH 154/295] nodejs: cleanup files no longer needed (#20212) --- .../development/web/nodejs/default-arch.patch | 24 ------------------- pkgs/development/web/nodejs/v5.nix | 12 ---------- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/development/web/nodejs/default-arch.patch delete mode 100644 pkgs/development/web/nodejs/v5.nix diff --git a/pkgs/development/web/nodejs/default-arch.patch b/pkgs/development/web/nodejs/default-arch.patch deleted file mode 100644 index e6d5b5428d7..00000000000 --- a/pkgs/development/web/nodejs/default-arch.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -index 30f27d5..eb178a5 100644 ---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py -@@ -1018,12 +1018,15 @@ class XcodeSettings(object): - # Since the value returned by this function is only used when ARCHS is not - # set, then on iOS we return "i386", as the default xcode project generator - # does not set ARCHS if it is not set in the .gyp file. -- if self.isIOS: -+ try: -+ if self.isIOS: -+ return 'i386' -+ version, build = self._XcodeVersion() -+ if version >= '0500': -+ return 'x86_64' - return 'i386' -- version, build = self._XcodeVersion() -- if version >= '0500': -+ except: - return 'x86_64' -- return 'i386' - - class MacPrefixHeader(object): - """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature. diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix deleted file mode 100644 index 7cd406abd2c..00000000000 --- a/pkgs/development/web/nodejs/v5.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool -, callPackage -}@args: - -import ./nodejs.nix (args // rec { - version = "5.12.0"; - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "4f926373f11f2a25156eee1804ec012eb912c42e5d34fc2909889da22efdadfe"; - }; -}) From 10445bc753f4b8705b77aaa72b4fbd38042bd2c9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 00:29:13 +0100 Subject: [PATCH 155/295] zeromq: 4.1.4 -> 4.2.0 --- pkgs/development/libraries/zeromq/4.x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index d99879d14a7..ab95f4ec3f3 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, libuuid, pkgconfig, libsodium }: stdenv.mkDerivation rec { - name = "zeromq-4.1.4"; + name = "zeromq-${version}"; + version = "4.2.0"; src = fetchurl { - url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0y73dxgf4kaysmkvrkxqq9qk5znklxyghh749jw4qbjwwbyl97z9"; + url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz"; + sha256 = "05y1s0938x5w838z79b4f9w6bspz9anldjx9dzvk32cpxvq3pf2k"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,6 +18,6 @@ stdenv.mkDerivation rec { description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington fpletz ]; }; } From 2c44af9721d5512dd469a8af0a8c2bbac14b3e2d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 00:29:28 +0100 Subject: [PATCH 156/295] phpPackages.zmq: 1.1.3 -> 1.1.4, php7 compatibility --- pkgs/top-level/php-packages.nix | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 74d4e1707a1..6313ff5372c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -112,32 +112,13 @@ let sha256 = "0qpfbkfy4wlnsfq4vc4q5wvaia83l89ky33s08gqrcfp3p1adn88"; }; - zmq = if isPhp7 then zmqPhp7 else zmq11; + zmq = buildPecl { + name = "zmq-1.1.3"; - zmq11 = assert !isPhp7; buildPecl { - name = "zmq-1.1.2"; - - sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69"; + sha256 = "1kj487vllqj9720vlhfsmv32hs2dy2agp6176mav6ldx31c3g4n4"; configureFlags = [ - "--with-zmq=${pkgs.zeromq2}" - ]; - - buildInputs = [ pkgs.pkgconfig ]; - }; - - # Not released yet - zmqPhp7 = assert isPhp7; buildPecl rec { - name = "zmq-php7"; - - src = fetchgit { - url = "https://github.com/mkoppanen/php-zmq"; - rev = "94d2b87d195f870775b153b42c29f30da049f4db"; - sha256 = "51a25b1029800d8abe03c5c08c50d6aee941c95c741dc22d2f853052511f4296"; - }; - - configureFlags = [ - "--with-zmq=${pkgs.zeromq2}" + "--with-zmq=${pkgs.zeromq}" ]; buildInputs = [ pkgs.pkgconfig ]; From bdf89d28186096e86079552f2e7fbcdbe496480b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 00:35:47 +0100 Subject: [PATCH 157/295] jzmq: 2.1.0 -> 3.1.0 --- .../libraries/java/jzmq/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index d7316ba3927..eb440657278 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -1,29 +1,30 @@ -{stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, zeromq2, jdk}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }: stdenv.mkDerivation rec { - name = "jzmq-2.1.0"; + name = "jzmq-${version}"; + version = "3.1.0"; - src = fetchgit { - url = git://github.com/zeromq/jzmq.git; - rev = "946fd39780423b2df6e5efd9fa2cd863fd79c9db"; - sha256 = "08pqh673fcqwm68hmnsmzrz4vzlwr0x9hdysic5k5mh7z411xzmp"; + src = fetchFromGitHub { + owner = "zeromq"; + repo = "jzmq"; + rev = "v${version}"; + sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63"; }; - buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pkgconfig zeromq3 jdk ]; - preConfigurePhases = ["./autogen.sh"]; preConfigure = '' - sed -i -e 's|(JAVAC)|(JAVAC) -encoding utf8|' src/Makefile.in ${if stdenv.system == "x86_64-darwin" then '' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure '' else ""} ''; - - maintainers = [ stdenv.lib.maintainers.vizanto ]; meta = { homepage = "http://www.zeromq.org"; description = "Java bindings for ZeroMQ"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.lgpl3; + maintainers = [ stdenv.lib.maintainers.vizanto ]; }; } From cc5d6041256cff79177f26900f92b392957b600d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 00:36:18 +0100 Subject: [PATCH 158/295] zeromq2: remove, not maintained anymore --- pkgs/development/libraries/zeromq/2.x.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/libraries/zeromq/2.x.nix diff --git a/pkgs/development/libraries/zeromq/2.x.nix b/pkgs/development/libraries/zeromq/2.x.nix deleted file mode 100644 index dd7404486d3..00000000000 --- a/pkgs/development/libraries/zeromq/2.x.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, libuuid}: - -stdenv.mkDerivation rec { - name = "zeromq-2.2.0"; - - src = fetchurl { - url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0ds6c244wik1lyfrfr2f4sha30fly4xybr02r9r4z156kvmlm423"; - }; - - buildInputs = [ libuuid ]; - - meta = { - branch = "2"; - homepage = "http://www.zeromq.org"; - description = "The Intelligent Transport Layer"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0635fd00aec..196546f959f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9604,7 +9604,6 @@ in static = true; })); - zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; zeromq = zeromq4; From b71589e4ca704a30612c9dbfc879b8160c3303e1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Nov 2016 18:53:52 -0500 Subject: [PATCH 159/295] kotlin: 1.0.4 -> 1.0.5 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index f0f8fa3b7ff..e1de97e17c4 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.5"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha512 = "39mcyw3rdgrhfkxl0xygh74idl2pvw3dy0n9d3z4aj6hq4pxkn1dclmpfbrfa333vjpzfhlqwl578vmly9vah7m6z6g4j12gkdijiyf"; + sha512 = "0bkgxr4an1fq890s3bw4izwc8ly29xk28gdibvnp2q9qd15rwrny5dgns697rnbw2gg0nn08q5p33asvbkac001cfabfphamjwndvc9"; }; propagatedBuildInputs = [ jre ] ; From 1034339acee5218846235f0a6676204993a40b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 10 Nov 2016 01:34:30 +0100 Subject: [PATCH 160/295] discord: 0.0.10 -> 0.0.11 (#20294) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2ca16eb4458..aaabb4ab111 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , systemd, libXScrnSaver }: -let version = "0.0.10"; in +let version = "0.0.11"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1wkbbnbqbwgixdbm69dlirhgjnn8llqyzil01nqwpknh1qwd06pr"; + sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18"; }; libPath = stdenv.lib.makeLibraryPath [ From f1ebae152d01eaa4920a48a998d2bf7dfb6c23fa Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 10 Nov 2016 01:42:18 +0100 Subject: [PATCH 161/295] mutt: fix smime_keys hard-coded openssl path (#20275) smime_keys uses hard-coded path to openssl, use path in /nix/store for openssl --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 2bc9b3babbd..2bea04ceedb 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { sha256 = "1pyns0xw52s4yma1a93pdcl4dirs55q2m1hd7w1r11nlhf7giip9"; }; + patchPhase = optionalString (openssl != null) '' + sed -i 's#/usr/bin/openssl#${openssl}/bin/openssl#' smime_keys.pl + ''; + buildInputs = [ ncurses which perl ] ++ optional headerCache gdbm From b19edd6d0b96c16954d18fc872b377d9bcda83cc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Nov 2016 19:44:42 -0500 Subject: [PATCH 162/295] ammonite-repl: 0.7.8 -> 0.7.9 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 7cb4afbc12e..c2cf9506c78 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ammonite-repl-${version}"; - version = "0.7.8"; + version = "0.7.9"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}"; - sha256 = "0s34p168h5c7ij61rbmaygb95r654yj4j0wh6qya53k4ywl32vkp"; + sha256 = "1jfb5rmab45j0bizfmjhygsjzijv3zcrygws3cr5awjd6js6jg27"; }; propagatedBuildInputs = [ jre ] ; From 0364fbe633bb9de57fc167eb8ba7f34b486a58c3 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 9 Nov 2016 19:54:09 +0100 Subject: [PATCH 163/295] openshift: 1.3.0 -> 1.3.1 --- pkgs/applications/networking/cluster/openshift/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 1985d6ad3f2..e4307c9aabc 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, go, which }: let - version = "1.3.0"; + version = "1.3.1"; versionMajor = "1"; versionMinor = "3"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "07s7xv8x8pch68j7lsw29im0axi07x32ag9wh9aqa0y570q9xgxy"; + sha256 = "1kxa1k38hvi1vg52p82mmkmp9k4bbbm2pryzapsxwga7d8x4bnbh"; }; buildInputs = [ go which ]; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = http://www.openshift.org; maintainers = with maintainers; [offline]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } From dc48622398664bd8f3782a7983b8b752ddeb8d9c Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 9 Nov 2016 19:56:37 +0100 Subject: [PATCH 164/295] kubernetes: 1.4.0 -> 1.4.5 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 860ecd1d078..5430902477f 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -17,13 +17,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.4.0"; + version = "1.4.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0q7xwdjsmfrz7pnmylkbkr2yxsl2gzzy17aapfznl2hb1ms81kys"; + sha256 = "13lzprvifppnz2r189di7ff2jhvd071b6hxyny12p2hw1b3knnvb"; }; buildInputs = [ makeWrapper which go rsync go-bindata ]; From 4831e116e2961f488fda60049612f68c57eb674d Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 9 Nov 2016 19:56:02 +0100 Subject: [PATCH 165/295] gitlab-runner: 1.7.0 -> 1.7.1 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 pkgs/development/tools/continuous-integration/gitlab-runner/default.nix diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix old mode 100755 new mode 100644 index c66c0fc93b7..0a0f732ccda --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.7.0"; + version = "1.7.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1qc0kmb6wxsy73vf0k2x95jlfb5dicgxw8c63mfn7ryxrh8a42z5"; + sha256 = "1gcd8rhyxg5sa9g27gih28hi9y6cpjgw1j21jmjm06wzyjdlrsi8"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0jbgpv4y0fmvl1plri4ifj1vmk6rr82pncrccpz2k640nlniyhqi"; + sha256 = "0i0kd5xm2ii7rzis9h4h99vpi1anjvhcjw732l0rxg4anyxzywjj"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "18wlab63fmmq9kgr0zmkgsr1kj6rjdqmyg87b7ryb9f40gmygcvj"; + sha256 = "14lx00w502scpb5crxscsm8kvdld1wrxn60a9c45fcccjwl2kkcl"; }; buildInputs = [ go-bindata ]; From edc5cdc3c840e73224ee0555558d30189cde8fc7 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Wed, 9 Nov 2016 02:29:43 +0800 Subject: [PATCH 166/295] opencc: init at 1.0.4 --- pkgs/tools/text/opencc/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/text/opencc/default.nix diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix new file mode 100644 index 00000000000..0e2cac36f76 --- /dev/null +++ b/pkgs/tools/text/opencc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, python }: + +stdenv.mkDerivation { + name = "opencc-1.0.4"; + src = fetchurl { + url = "https://github.com/BYVoid/OpenCC/archive/ver.1.0.4.tar.gz"; + sha256 = "0553b7461ebd379d118d45d7f40f8a6e272750115bdbc49267595a05ee3481ac"; + }; + + buildInputs = [ cmake python ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=OFF" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/BYVoid/OpenCC"; + license = licenses.asl20; + description = "A project for conversion between Traditional and Simplified Chinese"; + longDescription = '' + Open Chinese Convert (OpenCC) is an opensource project for conversion between + Traditional Chinese and Simplified Chinese, supporting character-level conversion, + phrase-level conversion, variant conversion and regional idioms among Mainland China, + Taiwan and Hong kong. + ''; + maintainers = [ maintainers.mingchuan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a91aed01dd..486c573b958 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2992,6 +2992,8 @@ in oh-my-zsh = callPackage ../shells/oh-my-zsh { }; + opencc = callPackage ../tools/text/opencc { }; + opencryptoki = callPackage ../tools/security/opencryptoki { }; opendbx = callPackage ../development/libraries/opendbx { }; From 2ebe748113473d774c750a23e59c02953ea732b4 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 9 Nov 2016 19:55:16 +0100 Subject: [PATCH 167/295] go: 1.7.1 -> 1.7.3 --- pkgs/development/compilers/go/1.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 3def735ec8d..72665cd0935 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356"; + sha256 = "0dcappkx4ichl249swwdyk7l078ajng0gl6a885va85z8m1jnvbs"; }; # perl is used for testing go vet From d0c1e42c1e8a5c925e80701302bd1c7508b746b8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Nov 2016 19:54:13 -0500 Subject: [PATCH 168/295] atom: 1.11.2 -> 1.12.0 --- pkgs/applications/editors/atom/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index a044f82baaf..ae571debe76 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv }: +{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv, libXScrnSaver, libxkbfile }: stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.11.2"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1mvlj1j0hyvm5di95nn0x99lm5arw2amm1s1va1m73zss3bzlhpm"; + sha256 = "0grl5lw05gjw9381pr8asgqp9f912li28v0bvl8j6i0ynfy67jmk"; name = "${name}.deb"; }; @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { rm -r $out/share/lintian rm -r $out/usr/ wrapProgram $out/bin/atom \ - --prefix "PATH" : "${gvfs}/bin" + --prefix "PATH" : "${gvfs}/bin" \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxkbfile ]}/libxkbfile.so.1 fixupPhase From 6a7e6cdd664b92aaf94331711585c9d4104d1264 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Nov 2016 19:57:32 -0500 Subject: [PATCH 169/295] oh-my-zsh: 2016-10-25 -> 2016-11-03 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 73a3367f9f7..b7a122b0683 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "oh-my-zsh-${version}"; - version = "2016-10-25"; + version = "2016-11-03"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "0ee89d965ecaa4f32cf2d1039e9d84a73eb206cf"; - sha256 = "1c90yl9kc1a7690bry1jbs48vsdlkxvbnvzgarx5wj99fygb8w2f"; + rev = "0b340bc3a5c58609a07987b296f773eaea17b274"; + sha256 = "1ifflqpbsk2gadbl0aqdmnm18bp21i9zcvjzlpldwma6crnfag68"; }; phases = "installPhase"; From 05d74cb857319dfbbf2561ebf6748586c958c2d4 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Sun, 6 Nov 2016 12:58:29 +0100 Subject: [PATCH 170/295] dunst: add svg-support patch See https://github.com/knopwob/dunst/pull/223 --- pkgs/applications/misc/dunst/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 0c51cb13262..221bd3c4bf5 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , pkgconfig, which, perl , cairo, dbus, freetype, gdk_pixbuf, glib, libX11, libXScrnSaver , libXext, libXinerama, libnotify, libxdg_basedir, pango, xproto +, librsvg }: stdenv.mkDerivation rec { @@ -15,11 +16,17 @@ stdenv.mkDerivation rec { sha256 = "102s0rkcdz22hnacsi3dhm7kj3lsw9gnikmh3a7wk862nkvvwjmk"; }; + patches = [(fetchpatch { + name = "add-svg-support.patch"; + url = "https://github.com/knopwob/dunst/commit/63b11141185d1d07a6d12212257a543e182d250a.patch"; + sha256 = "0giiaj5zjim7xqcav5ij5gn4x6nnchkllwcx0ln16j0p3vbi4y4x"; + })]; + nativeBuildInputs = [ perl pkgconfig which ]; buildInputs = [ cairo dbus freetype gdk_pixbuf glib libX11 libXScrnSaver libXext - libXinerama libnotify libxdg_basedir pango xproto + libXinerama libnotify libxdg_basedir pango xproto librsvg ]; outputs = [ "out" "man" ]; From 34e04bf401f89d34ebcf6675e6be63603c2ccc1e Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 3 Nov 2016 11:14:55 +0100 Subject: [PATCH 171/295] azure-vhd-utils: init at 20160614 --- pkgs/tools/misc/azure-vhd-utils/default.nix | 27 +++++++++++++++++++ pkgs/tools/misc/azure-vhd-utils/deps.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 58 insertions(+) create mode 100644 pkgs/tools/misc/azure-vhd-utils/default.nix create mode 100644 pkgs/tools/misc/azure-vhd-utils/deps.nix diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix new file mode 100644 index 00000000000..fcdd9a81d72 --- /dev/null +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -0,0 +1,27 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "azure-vhd-utils-${version}"; + version = "20160614-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; + + goPackagePath = "github.com/Microsoft/azure-vhd-utils"; + + src = fetchgit { + inherit rev; + url = "https://github.com/Microsoft/azure-vhd-utils"; + sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/Microsoft/azure-vhd-utils; + description = "Read, inspect and upload VHD files for Azure"; + longDescription = "Go package to read Virtual Hard Disk (VHD) file, a CLI interface to upload local VHD to Azure storage and to inspect a local VHD"; + license = licenses.mit; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/misc/azure-vhd-utils/deps.nix b/pkgs/tools/misc/azure-vhd-utils/deps.nix new file mode 100644 index 00000000000..d07af99d5e5 --- /dev/null +++ b/pkgs/tools/misc/azure-vhd-utils/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "0884ebb4c8e7c980527348a4d134a65286042afc"; + sha256 = "0ixsq409akq1ff12352kp5gkbh370rpbw0m0pbwjr42cqvnzs9k0"; + }; + } + { + goPackagePath = "github.com/Microsoft/azure-vhd-utils-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/azure-vhd-utils-for-go"; + rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; + sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "f614c177b70c0f0e92c368d623c8770bf337c5d6"; + sha256 = "1l70f07v0dsp2k2pm0lmr42fp4y72j1g0czf4fkxwhvgbly3al98"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486c573b958..e51f081437f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -461,6 +461,8 @@ in azure-cli = nodePackages.azure-cli; + azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; From a50784b34e771aa4a6c5f4eeb8c25295c15e4ed4 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 8 Nov 2016 01:17:47 -0400 Subject: [PATCH 172/295] openssl: add custom build of 1.0.2 for steam --- .../development/libraries/openssl/default.nix | 15 ++- .../openssl/openssl-fix-cpuid_setup.patch | 105 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index ea89bb859e5..efb9a9e1d4e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -9,7 +9,7 @@ let opensslCrossSystem = stdenv.cross.openssl.system or (throw "openssl needs its platform name cross building"); - common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec { + common = args@{ version, sha256, patches ? [], configureFlags ? [], makeDepend ? false }: stdenv.mkDerivation rec { name = "openssl-${version}"; src = fetchurl { @@ -45,7 +45,10 @@ let ] ++ stdenv.lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"; + ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" + ++ args.configureFlags or []; + + postConfigure = if makeDepend then "make depend" else null; makeFlags = [ "MANDIR=$(man)/share/man" ]; @@ -121,4 +124,12 @@ in { sha256 = "1xznrqvb1dbngv2k2nb6da6fdw00c01sy2i36yjdxr4vpxrf0pd4"; }; + openssl_1_0_2-steam = common { + version = "1.0.2j"; + sha256 = "0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7"; + configureFlags = [ "no-engine" ]; + makeDepend = true; + patches = [ ./openssl-fix-cpuid_setup.patch ]; + }; + } diff --git a/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch b/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch new file mode 100644 index 00000000000..4a2384ca3da --- /dev/null +++ b/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch @@ -0,0 +1,105 @@ +diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c +index 1925428..d2e42d2 100644 +--- a/crypto/cryptlib.c ++++ b/crypto/cryptlib.c +@@ -676,10 +676,15 @@ typedef unsigned __int64 IA32CAP; + # else + typedef unsigned long long IA32CAP; + # endif ++ ++/* Compat function for STEAM */ ++extern IA32CAP OPENSSL_ia32_cpuid_new(unsigned int*); ++IA32CAP OPENSSL_ia32_cpuid(void) { return OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); } ++ + void OPENSSL_cpuid_setup(void) + { + static int trigger = 0; +- IA32CAP OPENSSL_ia32_cpuid(unsigned int *); ++ IA32CAP OPENSSL_ia32_cpuid_new(unsigned int *); + IA32CAP vec; + char *env; + +@@ -697,9 +702,9 @@ void OPENSSL_cpuid_setup(void) + vec = strtoul(env + off, NULL, 0); + # endif + if (off) +- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~vec; ++ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P) & ~vec; + else if (env[0] == ':') +- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); ++ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); + + OPENSSL_ia32cap_P[2] = 0; + if ((env = strchr(env, ':'))) { +@@ -713,7 +718,7 @@ void OPENSSL_cpuid_setup(void) + OPENSSL_ia32cap_P[2] = vecx; + } + } else +- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); ++ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); + + /* + * |(1<<10) sets a reserved bit to signal that variable +diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h +index fba180a..b927c79 100644 +--- a/crypto/cryptlib.h ++++ b/crypto/cryptlib.h +@@ -99,6 +99,9 @@ extern "C" { + # define HEX_SIZE(type) (sizeof(type)*2) + + void OPENSSL_cpuid_setup(void); ++#pragma GCC visibility push(hidden) ++unsigned long long OPENSSL_ia32_cpuid(void); ++#pragma GCC visibility pop + extern unsigned int OPENSSL_ia32cap_P[]; + void OPENSSL_showfatal(const char *fmta, ...); + void *OPENSSL_stderr(void); +diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl +index d208d02..d4c0b24 100644 +--- a/crypto/x86_64cpuid.pl ++++ b/crypto/x86_64cpuid.pl +@@ -52,10 +52,10 @@ OPENSSL_rdtsc: + ret + .size OPENSSL_rdtsc,.-OPENSSL_rdtsc + +-.globl OPENSSL_ia32_cpuid +-.type OPENSSL_ia32_cpuid,\@function,1 ++.globl OPENSSL_ia32_cpuid_new ++.type OPENSSL_ia32_cpuid_new,\@function,1 + .align 16 +-OPENSSL_ia32_cpuid: ++OPENSSL_ia32_cpuid_new: + mov %rbx,%r8 # save %rbx + + xor %eax,%eax +@@ -181,7 +181,7 @@ OPENSSL_ia32_cpuid: + mov %r8,%rbx # restore %rbx + or %r9,%rax + ret +-.size OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid ++.size OPENSSL_ia32_cpuid_new,.-OPENSSL_ia32_cpuid_new + + .globl OPENSSL_cleanse + .type OPENSSL_cleanse,\@abi-omnipotent +diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl +index e95f627..0781010 100644 +--- a/crypto/x86cpuid.pl ++++ b/crypto/x86cpuid.pl +@@ -8,7 +8,7 @@ require "x86asm.pl"; + + for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } + +-&function_begin("OPENSSL_ia32_cpuid"); ++&function_begin("OPENSSL_ia32_cpuid_new"); + &xor ("edx","edx"); + &pushf (); + &pop ("eax"); +@@ -153,7 +153,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } + &mov ("eax","esi"); + &mov ("edx","ebp"); + &set_label("nocpuid"); +-&function_end("OPENSSL_ia32_cpuid"); ++&function_end("OPENSSL_ia32_cpuid_new"); + + &external_label("OPENSSL_ia32cap_P"); + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89d1f3a582..59c4a2e8c1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8692,6 +8692,7 @@ in wolfssl = callPackage ../development/libraries/wolfssl { }; openssl = openssl_1_0_2; + openssl-steam = openssl_1_0_2-steam; inherit (callPackages ../development/libraries/openssl { fetchurl = fetchurlBoot; @@ -8702,7 +8703,8 @@ in }) openssl_1_0_1 openssl_1_0_2 - openssl_1_1_0; + openssl_1_1_0 + openssl_1_0_2-steam; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { cryptodevHeaders = linuxPackages.cryptodev.override { From a120bad30cbd63019971e9d03edd82423131852c Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 8 Nov 2016 01:18:25 -0400 Subject: [PATCH 173/295] steam: use custom openssl --- pkgs/games/steam/runtime-wrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 2cdbfb096e2..38d73f59dee 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -58,7 +58,6 @@ let SDL SDL2_image glew110 - openssl libidn # Other things from runtime @@ -88,6 +87,7 @@ let alsaLib openalSoft libva + openssl-steam ] ++ lib.optional newStdcpp gcc.cc; ourRuntime = if runtimeOnly then [] From 2673604708a15d2ec3fa74ee5a965c645c562932 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 02:38:50 +0100 Subject: [PATCH 174/295] i3: 4.12 -> 4.13 Fixes #20296. --- .../window-managers/i3/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index ada6e8e742e..b6de07bff8a 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,25 +1,31 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms -, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl -, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon +, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev +, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon , xorgserver, xvfb_run, dmenu, i3status }: stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.12"; + version = "4.13"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1d3q3lgpjbkmcwzjhp0dfr0jq847silcfg087slcnj95ikh1r7p1"; + sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; }; + nativeBuildInputs = [ which pkgconfig makeWrapper ]; + buildInputs = [ - which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libxkbcommon + libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC xorgserver xvfb_run ]; + configureFlags = [ "--disable-builddir" ]; + + enableParallelBuilding = true; + postPatch = '' patchShebangs . ''; @@ -45,12 +51,8 @@ stdenv.mkDerivation rec { ! grep -q '^not ok' testcases/latest/complete-run.log ''; - configurePhase = "makeFlags=PREFIX=$out"; - postInstall = '' wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" - mkdir -p $out/man/man1 - cp man/*.1 $out/man/man1 for program in $out/bin/i3-sensible-*; do sed -i 's/which/command -v/' $program done @@ -59,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "http://i3wm.org"; - maintainers = with maintainers; [ garbas modulistic ]; + maintainers = with maintainers; [ garbas modulistic fpletz ]; license = licenses.bsd3; platforms = platforms.all; From ba27636b5837a1840ab97b914d1ef6b3f8d55a49 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Thu, 10 Nov 2016 12:19:47 +1000 Subject: [PATCH 175/295] nodejs: disable PaX mprotect hardening (#20301) Closes #19951 --- pkgs/development/web/nodejs/nodejs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index a45a95680b1..b71f39ca420 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -56,6 +56,7 @@ in ''; postInstall = '' + paxmark m $out/bin/node PATH=$out/bin:$PATH patchShebangs $out ''; From 6476f11f4080daa237145713d3d2dad0a7de1ae0 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Thu, 10 Nov 2016 12:44:22 +1000 Subject: [PATCH 176/295] grsecurity patch update to kernel 4.8.6 --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6bba248374b..98f89508fc1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.7.10"; - grrev = "201611011946"; - sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql"; + { kver = "4.8.6"; + grrev = "201611091800"; + sha256 = "09kz4mjsrjixwvr8hf4q1lwk1miqb3mq6i6adzrha7c5s6c940x0"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 3190a6c45208bbad97ffe056f01155a2a65ac403 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 03:22:31 +0100 Subject: [PATCH 177/295] libwmf: add patch to fix CVE-2016-9011 cc #20274 --- pkgs/development/libraries/libwmf/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index 229563d46af..5683e88b020 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, zlib, imagemagick, libpng, pkgconfig, glib, freetype -, libjpeg, libxml2 }: +{ stdenv, fetchurl, fetchpatch, zlib, imagemagick, libpng, pkgconfig, glib +, freetype, libjpeg, libxml2 }: stdenv.mkDerivation { name = "libwmf-0.2.8.4"; @@ -14,6 +14,11 @@ stdenv.mkDerivation { patches = [ ./CVE-2006-3376.patch ./CVE-2009-1364.patch ./CVE-2015-0848+4588+4695+4696.patch + (fetchpatch { + name = "libwmf-0.2.8.4-CVE-2016-9011-debian.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=842090;filename=libwmf-0.2.8.4-CVE-2016-9011-debian.patch;msg=10"; + sha256 = "15vnqrj1dlvn0g8ccrxj2r2cyb1rv0qf0kfangxfgsi5h8is0c2b"; + }) ]; meta = { From 14a3d2d2fff0717f12cb22a738149762bcc8a11c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 03:49:22 +0100 Subject: [PATCH 178/295] 389-ds-base: add patch to fix CVE-2016-5416 cc #20274 --- pkgs/servers/ldap/389/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 8d719bec4f5..6ba60ff1772 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl -, svrcore, icu, net_snmp, kerberos, pcre, perlPackages +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, pam, nspr, nss, openldap +, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let version = "1.3.5.4"; @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump - patches = [ ./perl-path.patch ]; + patches = [ ./perl-path.patch + # https://fedorahosted.org/389/ticket/48354 + (fetchpatch { + name = "389-ds-base-CVE-2016-5416.patch"; + url = "https://fedorahosted.org/389/changeset/3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd/?format=diff&new=3c2cd48b7d2cb0579f7de6d460bcd0c9bb1157bd"; + addPrefixes = true; + sha256 = "1kv3a3di1cihkaf8xdbb5mzvhm4c3frx8rc5mji8xgjyj9ni6xja"; + }) + ]; preConfigure = '' # Create perl paths for library imports in perl scripts From 0bdc0143fe87bc9357a5ad8e5379010aa67df1de Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 10 Nov 2016 03:44:41 +0000 Subject: [PATCH 179/295] nixpkgs: proverif 1.94 -> 1.95 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/proverif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index 4f5e9155078..8726f5affea 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "proverif-${version}"; - version = "1.94"; + version = "1.95"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz"; - sha256 = "0dv2hgk76y0ap7dwf80qd94dmxjw47c50iavxgq5702k1d6qap56"; + sha256 = "01viwi6sccdxk723ycy1shklz8g29j5i3wj2mcwb3j7advvqmws2"; }; buildInputs = [ ocaml ]; From e79264002a1b240eb27e7e356bc38993d64e6a92 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 10 Nov 2016 03:45:02 +0000 Subject: [PATCH 180/295] nixpkgs: bitkeeper 7.3ce -> 7.3.1ce Signed-off-by: Austin Seipp --- pkgs/applications/version-management/bitkeeper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index e5937977994..86e555a989c 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "bitkeeper-${version}"; - version = "7.3ce"; + version = "7.3.1ce"; src = fetchurl { - url = "https://www.bitkeeper.org/downloads/${version}/bk-${version}.tar.gz"; - sha256 = "0lk4vydpq5bi52m81h327gvzdzybf8kkak7yjwmpj6kg1jn9blaz"; + url = "https://www.bitkeeper.org/downloads/${version}/bk-${version}.src.tar.gz"; + sha256 = "0l6jwvcg4s1q00vb01hdv58jgv03l8x5mhjl73cwgfiff80zx147"; }; hardeningDisable = [ "fortify" ]; From b15409d6f6071c6a62570c5cefe81300cbc3eb0f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Nov 2016 06:16:42 +0100 Subject: [PATCH 181/295] gitlab: 8.12.8 -> 8.13.5 --- .../gitlab-shell/default.nix | 4 +- .../gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/Gemfile | 61 +++-- .../version-management/gitlab/Gemfile.lock | 97 ++++---- .../version-management/gitlab/default.nix | 4 +- .../version-management/gitlab/gemset.nix | 222 +++++------------- pkgs/top-level/all-packages.nix | 8 +- 7 files changed, 139 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 2293d11331d..3bcf8cd4e1b 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab }: stdenv.mkDerivation rec { - version = "3.6.1"; + version = "3.6.6"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0j4kwsfzb7l871fma1b1q9h33vyng2nnghn5zz192sv4yp0w2pvq"; + sha256 = "1dg9ldsyly2r3amkl0d96m084az360b7nz9rhhf61x06d4z09xif"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 6fe65bb50ab..54be33beff5 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "0.8.2"; + version = "0.8.5"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "03y7f9x88sa8gxqaglriwn2793dn3i8dx4qhaarnm0gyrfl3rjag"; + sha256 = "0q6kd59sb5wm63r8zdvbkn4j6fk2n743pjhkbmg4rzngvjivxqzr"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index f9d95e121f5..ef131cb719a 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -6,10 +6,8 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with gem 'responders', '~> 2.0' -# Specify a sprockets version due to increased performance -# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 -gem 'sprockets', '~> 3.6.0' -gem 'sprockets-es6' +gem 'sprockets', '~> 3.7.0' +gem 'sprockets-es6', '~> 0.9.2' # Default values for AR models gem 'default_value_for', '~> 3.0.0' @@ -19,7 +17,7 @@ gem 'mysql2', '~> 0.3.16', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres # Authentication libraries -gem 'devise', '~> 4.0' +gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.2.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' @@ -31,7 +29,7 @@ gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.4.1' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos -gem 'omniauth-saml', '~> 1.6.0' +gem 'omniauth-saml', '~> 1.7.0' gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' @@ -53,7 +51,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem 'gitlab_git', '~> 10.6.6' +gem 'gitlab_git', '~> 10.7.0' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -101,17 +99,18 @@ gem 'unf', '~> 0.1.4' gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing -gem 'html-pipeline', '~> 1.11.0' -gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' -gem 'gitlab-markup', '~> 1.5.0' -gem 'redcarpet', '~> 3.3.3' -gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~>3.6' -gem 'org-ruby', '~> 0.9.12' -gem 'creole', '~> 0.5.0' -gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.2' -gem 'rouge', '~> 2.0' +gem 'html-pipeline', '~> 1.11.0' +gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie' +gem 'gitlab-markup', '~> 1.5.0' +gem 'redcarpet', '~> 3.3.3' +gem 'RedCloth', '~> 4.3.2' +gem 'rdoc', '~>3.6' +gem 'org-ruby', '~> 0.9.12' +gem 'creole', '~> 0.5.0' +gem 'wikicloth', '0.8.1' +gem 'asciidoctor', '~> 1.5.2' +gem 'rouge', '~> 2.0' +gem 'truncato', '~> 0.7.8' # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM @@ -122,8 +121,8 @@ gem 'diffy', '~> 3.0.3' # Application server group :unicorn do - gem 'unicorn', '~> 4.9.0' - gem 'unicorn-worker-killer', '~> 0.4.2' + gem 'unicorn', '~> 5.1.0' + gem 'unicorn-worker-killer', '~> 0.4.4' end # State machine @@ -132,11 +131,10 @@ gem 'state_machines-activerecord', '~> 0.4.0' gem 'after_commit_queue', '~> 1.3.0' # Issue tags -gem 'acts-as-taggable-on', '~> 3.4' +gem 'acts-as-taggable-on', '~> 4.0' # Background jobs -gem 'sinatra', '~> 1.4.4', require: false -gem 'sidekiq', '~> 4.0' +gem 'sidekiq', '~> 4.2' gem 'sidekiq-cron', '~> 0.4.0' gem 'redis-namespace', '~> 1.5.2' @@ -213,7 +211,7 @@ gem 'oj', '~> 2.17.4' gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' -gem 'sass-rails', '~> 5.0.0' +gem 'sass-rails', '~> 5.0.6' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '~> 2.7.2' gem 'turbolinks', '~> 2.5.0' @@ -227,7 +225,7 @@ gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-rails', '~> 4.1.0' gem 'jquery-ui-rails', '~> 5.0.0' -gem 'request_store', '~> 1.3.0' +gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'net-ssh', '~> 3.0.1' @@ -298,12 +296,11 @@ group :development, :test do gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'rubocop', '~> 0.42.0', require: false + gem 'rubocop', '~> 0.43.0', require: false gem 'rubocop-rspec', '~> 1.5.0', require: false gem 'scss_lint', '~> 0.47.0', require: false gem 'haml_lint', '~> 0.18.2', require: false gem 'simplecov', '0.12.0', require: false - gem 'flog', '~> 4.3.2', require: false gem 'flay', '~> 2.6.1', require: false gem 'bundler-audit', '~> 0.5.0', require: false @@ -311,6 +308,8 @@ group :development, :test do gem 'license_finder', '~> 2.1.0', require: false gem 'knapsack', '~> 1.11.0' + + gem 'activerecord_sane_schema_dumper', '0.2' end group :test do @@ -323,10 +322,6 @@ group :test do gem 'timecop', '~> 0.8.0' end -group :production do - gem 'gitlab_meta', '7.0' -end - gem 'newrelic_rpm', '~> 3.16' gem 'octokit', '~> 4.3.0' @@ -335,7 +330,7 @@ gem 'mail_room', '~> 0.8.1' gem 'email_reply_parser', '~> 0.5.8' -gem 'ruby-prof', '~> 0.15.9' +gem 'ruby-prof', '~> 0.16.2' ## CI gem 'activerecord-session_store', '~> 1.0.0' @@ -348,7 +343,7 @@ gem 'oauth2', '~> 1.2.0' gem 'paranoia', '~> 2.0' # Health check -gem 'health_check', '~> 2.1.0' +gem 'health_check', '~> 2.2.0' # System information gem 'vmstat', '~> 2.2' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 0dd9b47ff3e..b9501e68aae 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -40,14 +40,16 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 1.5.2, < 3) railties (>= 4.0, < 5.1) + activerecord_sane_schema_dumper (0.2) + rails (>= 4, < 5) activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - acts-as-taggable-on (3.5.0) - activerecord (>= 3.2, < 5) + acts-as-taggable-on (4.0.0) + activerecord (>= 4.0) addressable (2.3.8) after_commit_queue (1.3.0) activerecord (>= 3.0) @@ -159,11 +161,15 @@ GEM database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) + deckar01-task_list (1.0.5) + activesupport (~> 4.0) + html-pipeline + rack (~> 1.0) default_value_for (3.0.2) activerecord (>= 3.2.0, < 5.1) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -211,9 +217,6 @@ GEM flay (2.6.1) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flog (4.3.2) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -282,12 +285,11 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab-markup (1.5.0) - gitlab_git (10.6.6) + gitlab_git (10.7.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) rugged (~> 0.24.0) - gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) omniauth (~> 1.0) @@ -337,7 +339,7 @@ GEM thor tilt hashie (3.4.4) - health_check (2.1.0) + health_check (2.2.1) rails (>= 4.0) hipchat (1.5.2) httparty @@ -473,9 +475,9 @@ GEM omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) - omniauth-saml (1.6.0) + omniauth-saml (1.7.0) omniauth (~> 1.3) - ruby-saml (~> 1.3) + ruby-saml (~> 1.4) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) omniauth-twitter (1.2.1) @@ -490,7 +492,7 @@ GEM orm_adapter (0.5.0) paranoia (2.1.4) activerecord (~> 4.0) - parser (2.3.1.2) + parser (2.3.1.4) ast (~> 2.2) pg (0.18.4) pkg-config (1.1.7) @@ -557,7 +559,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.15.0) + raindrops (0.17.0) rake (10.5.0) rb-fsevent (0.9.6) rb-inotify (0.9.5) @@ -591,7 +593,7 @@ GEM request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) - responders (2.1.1) + responders (2.3.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) @@ -623,7 +625,7 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) - rubocop (0.42.0) + rubocop (0.43.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -633,9 +635,9 @@ GEM rubocop (>= 0.40.0) ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-prof (0.15.9) + ruby-prof (0.16.2) ruby-progressbar (1.8.1) - ruby-saml (1.3.0) + ruby-saml (1.4.1) nokogiri (>= 1.5.10) ruby_parser (3.8.2) sexp_processor (~> 4.1) @@ -648,7 +650,7 @@ GEM sanitize (2.1.0) nokogiri (>= 1.4.4) sass (3.4.22) - sass-rails (5.0.5) + sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -676,11 +678,11 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.1.4) + sidekiq (4.2.1) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) + rack-protection (~> 1.5) redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) sidekiq-cron (0.4.0) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) @@ -690,10 +692,6 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) slack-notifier (1.2.1) slop (3.6.0) spinach (0.8.10) @@ -713,10 +711,10 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.3) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.0) + sprockets-es6 (0.9.2) babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) @@ -736,8 +734,6 @@ GEM ffi sysexits (1.2.0) systemu (2.6.5) - task_list (1.0.2) - html-pipeline teaspoon (1.1.5) railties (>= 3.2.5, < 6) teaspoon-jasmine (2.2.0) @@ -754,6 +750,9 @@ GEM tilt (2.0.5) timecop (0.8.1) timfel-krb5-auth (0.8.3) + truncato (0.7.8) + htmlentities (~> 4.3.1) + nokogiri (~> 1.6.1) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) @@ -767,9 +766,8 @@ GEM unf_ext unf_ext (0.0.7.2) unicode-display_width (1.1.1) - unicorn (4.9.0) + unicorn (5.1.0) kgio (~> 2.6) - rack raindrops (~> 0.7) unicorn-worker-killer (0.4.4) get_process_mem (~> 0) @@ -813,7 +811,8 @@ DEPENDENCIES ace-rails-ap (~> 4.1.0) activerecord-nulldb-adapter activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) + activerecord_sane_schema_dumper (= 0.2) + acts-as-taggable-on (~> 4.0) addressable (~> 2.3.8) after_commit_queue (~> 1.3.0) akismet (~> 2.0) @@ -844,8 +843,9 @@ DEPENDENCIES creole (~> 0.5.0) d3_rails (~> 3.5.0) database_cleaner (~> 1.5.0) + deckar01-task_list (= 1.0.5) default_value_for (~> 3.0.0) - devise (~> 4.0) + devise (~> 4.2) devise-two-factor (~> 3.0.0) diffy (~> 3.0.3) doorkeeper (~> 4.2.0) @@ -855,7 +855,6 @@ DEPENDENCIES factory_girl_rails (~> 4.6.0) ffaker (~> 2.0.0) flay (~> 2.6.1) - flog (~> 4.3.2) fog-aws (~> 0.9) fog-azure (~> 0.0) fog-core (~> 1.40) @@ -870,9 +869,8 @@ DEPENDENCIES gemojione (~> 3.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - github-markup (~> 1.5.0) - gitlab_git (~> 10.6.6) - gitlab_meta (= 7.0) + gitlab-markup (~> 1.5.0) + gitlab_git (~> 10.7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) @@ -881,7 +879,7 @@ DEPENDENCIES grape-entity (~> 0.4.2) haml_lint (~> 0.18.2) hamlit (~> 2.6.1) - health_check (~> 2.1.0) + health_check (~> 2.2.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) httparty (~> 0.13.3) @@ -920,7 +918,7 @@ DEPENDENCIES omniauth-gitlab (~> 1.0.0) omniauth-google-oauth2 (~> 0.4.1) omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.6.0) + omniauth-saml (~> 1.7.0) omniauth-shibboleth (~> 1.2.0) omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) @@ -943,19 +941,19 @@ DEPENDENCIES redis (~> 3.2) redis-namespace (~> 1.5.2) redis-rails (~> 4.0.0) - request_store (~> 1.3.0) + request_store (~> 1.3) rerun (~> 0.11.0) responders (~> 2.0) rouge (~> 2.0) rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) - rubocop (~> 0.42.0) + rubocop (~> 0.43.0) rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 0.15.9) + ruby-prof (~> 0.16.2) sanitize (~> 2.0) - sass-rails (~> 5.0.0) + sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) sdoc (~> 0.3.20) seed-fu (~> 2.3.5) @@ -964,10 +962,9 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) + sidekiq (~> 4.2) sidekiq-cron (~> 0.4.0) simplecov (= 0.12.0) - sinatra (~> 1.4.4) slack-notifier (~> 1.2.0) spinach-rails (~> 0.2.1) spinach-rerun-reporter (~> 0.0.2) @@ -975,23 +972,23 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.1.0) spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) - sprockets-es6 + sprockets (~> 3.7.0) + sprockets-es6 (~> 0.9.2) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) - task_list (~> 1.0.2) teaspoon (~> 1.1.0) teaspoon-jasmine (~> 2.2.0) test_after_commit (~> 0.4.2) thin (~> 1.7.0) timecop (~> 0.8.0) + truncato (~> 0.7.8) turbolinks (~> 2.5.0) u2f (~> 0.2.1) uglifier (~> 2.7.2) underscore-rails (~> 1.8.0) unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) + unicorn (~> 5.1.0) + unicorn-worker-killer (~> 0.4.4) version_sorter (~> 2.1.0) virtus (~> 1.0.1) vmstat (~> 2.2) @@ -1000,4 +997,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.12.5 + 1.13.5 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 92b5b552ec6..9e03135e89c 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.12.8"; + version = "8.13.5"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1l2r3mjyra53wpq724d974zv9ax5hb1qrdsz4071b2p34s70gbl3"; + sha256 = "1ir52fdg81jawkfk03xj6c2j4lmw8sy4mwc25p024l0zpsg2gpz3"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index a87d4f92c62..fc36db0d603 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -71,6 +71,14 @@ }; version = "1.0.0"; }; + activerecord_sane_schema_dumper = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "122c7v7lvs0gwckvx2rar07waxnx1vv0lryz322nybb69d8vbhl6"; + type = "gem"; + }; + version = "0.2"; + }; activesupport = { source = { remotes = ["https://rubygems.org"]; @@ -80,13 +88,12 @@ version = "4.2.7.1"; }; acts-as-taggable-on = { - dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz0z8dlp3fjzah9y9b6rr9mkidsav9l4hdm51fnq1gd05yv3pr7"; + sha256 = "1h2y2zh4vrjf6bzdgvyq5a53a4gpr8xvq4a5rvq7fy1w43z4753s"; type = "gem"; }; - version = "3.5.0"; + version = "4.0.0"; }; addressable = { source = { @@ -97,7 +104,6 @@ version = "2.3.8"; }; after_commit_queue = { - dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jrhvj4335dsrj0xndbf7a7m2inbwbx1knc0bwgvmkk1w47l43s0"; @@ -130,7 +136,6 @@ version = "6.0.3"; }; asana = { - dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1560p13g57pl4xqkmhwn1vpqhm7mw9fwmmswk38k3i2r7g0b5y9z"; @@ -171,7 +176,6 @@ version = "1.0.0"; }; autoprefixer-rails = { - dependencies = ["execjs" "json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0m1w42ncz0p48r5hbyglayxkzrnplw18r99dc1ia2cb3nizkwllx"; @@ -188,7 +192,6 @@ version = "1.2.0"; }; axiom-types = { - dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; @@ -261,7 +264,6 @@ version = "2.3.0"; }; better_errors = { - dependencies = ["coderay" "erubis"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0v0q8bdkqqlcsfqbk4wvc3qnz8an44mgz720v5f11a4nr413mjgf"; @@ -270,7 +272,6 @@ version = "1.0.1"; }; binding_of_caller = { - dependencies = ["debug_inspector"]; source = { remotes = ["https://rubygems.org"]; sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk"; @@ -279,7 +280,6 @@ version = "0.7.2"; }; bootstrap-sass = { - dependencies = ["autoprefixer-rails" "sass"]; source = { remotes = ["https://rubygems.org"]; sha256 = "12hhw42hk9clwfj6yz5v0c5p35wrn5yjnji7bnzsfs99vi2q00ld"; @@ -344,7 +344,6 @@ version = "2.6.2"; }; capybara-screenshot = { - dependencies = ["capybara" "launchy"]; source = { remotes = ["https://rubygems.org"]; sha256 = "17v1wihr3aqrxhrwswkdpdklj1xsfcaksblh1y8hixvm9bqfyz3y"; @@ -417,7 +416,6 @@ version = "1.1.0"; }; coercible = { - dependencies = ["descendants_tracker"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; @@ -434,7 +432,6 @@ version = "4.1.1"; }; coffee-script = { - dependencies = ["coffee-script-source" "execjs"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; @@ -475,7 +472,6 @@ version = "2.2.0"; }; crack = { - dependencies = ["safe_yaml"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; @@ -500,7 +496,6 @@ version = "1.4.1"; }; d3_rails = { - dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "12vxiiflnnkcxak2wmbajyf5wzmcv9wkl4drsp0am72azl8a6g9x"; @@ -540,6 +535,14 @@ }; version = "1.3.8"; }; + deckar01-task_list = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x2va9b7p2x82ind3cbk9dr4pk97c4g7vqccwzb20xdwdq0q4j91"; + type = "gem"; + }; + version = "1.0.5"; + }; default_value_for = { source = { remotes = ["https://rubygems.org"]; @@ -549,7 +552,6 @@ version = "3.0.2"; }; descendants_tracker = { - dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; @@ -560,10 +562,10 @@ devise = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1i5glkxmn0ymj50pz05nh6xcffc9giqajgfg6qrcbs2n552hbr5k"; + sha256 = "045qw3186gkcm38wjbjhb7w2zycbqj85wfb1cdwvkqk8hf1a7dp0"; type = "gem"; }; - version = "4.1.1"; + version = "4.2.0"; }; devise-two-factor = { source = { @@ -606,7 +608,6 @@ version = "4.2.0"; }; dropzonejs-rails = { - dependencies = ["rails"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; @@ -623,7 +624,6 @@ version = "0.5.8"; }; email_spec = { - dependencies = ["launchy" "mail"]; source = { remotes = ["https://rubygems.org"]; sha256 = "00p1cc69ncrgg7m45va43pszip8anx5735w1lsb7p5ygkyw8nnpv"; @@ -712,7 +712,6 @@ version = "4.6.0"; }; faraday = { - dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; @@ -721,7 +720,6 @@ version = "0.9.2"; }; faraday_middleware = { - dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h"; @@ -730,7 +728,6 @@ version = "0.10.0"; }; faraday_middleware-multi_json = { - dependencies = ["faraday_middleware" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q"; @@ -755,7 +752,6 @@ version = "1.9.10"; }; flay = { - dependencies = ["ruby_parser" "sexp_processor"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0zcp9nmnfqixdcqa2dzwwjy5np4n2n16bj25gw7bbzbjp9hqzhn6"; @@ -763,17 +759,7 @@ }; version = "2.6.1"; }; - flog = { - dependencies = ["ruby_parser" "sexp_processor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1asrcdj6gh5mxcimqak94jjyyi5cxnqn904lc8pmrljg1nv1bxpm"; - type = "gem"; - }; - version = "4.3.2"; - }; flowdock = { - dependencies = ["httparty" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg"; @@ -814,7 +800,6 @@ version = "0.3.2"; }; fog-json = { - dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; @@ -847,7 +832,6 @@ version = "0.1.1"; }; fog-xml = { - dependencies = ["fog-core" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa"; @@ -864,7 +848,6 @@ version = "4.6.1.0"; }; foreman = { - dependencies = ["thor"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; @@ -881,7 +864,6 @@ version = "0.2.5"; }; fuubar = { - dependencies = ["rspec" "ruby-progressbar"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv"; @@ -890,7 +872,6 @@ version = "2.0.0"; }; gemnasium-gitlab-service = { - dependencies = ["rugged"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1qv7fkahmqkah3770ycrxd0x2ais4z41hb43a0r8q8wcdklns3m3"; @@ -940,7 +921,6 @@ meta.priority = 10; # lower priority, exectuable conflicts with gitlab-markdown }; gitlab-flowdock-git-hook = { - dependencies = ["flowdock" "gitlab-grit" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8"; @@ -967,21 +947,12 @@ gitlab_git = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1vg2k3nlws6ghbs80zy3v8yclsx61x36f17r0k8vwv1xwvfhyhgz"; + sha256 = "0nnr6dlqq30syab2g7yvffgzinj5c8n9q7fvr3d88ix8hsawjrjm"; type = "gem"; }; - version = "10.6.6"; - }; - gitlab_meta = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14vahv7gblcypbvip845sg3lvawf3kij61mkxz5vyfcv23niqvp9"; - type = "gem"; - }; - version = "7.0"; + version = "10.7.0"; }; gitlab_omniauth-ldap = { - dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vbdyi57vvlrigyfhmqrnkw801x57fwa3gxvj1rj2bn9ig5186ri"; @@ -1038,7 +1009,6 @@ version = "0.15.0"; }; grape-entity = { - dependencies = ["activesupport" "multi_json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8"; @@ -1081,13 +1051,12 @@ health_check = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jhm5342ngm2qfa1s6g0k09rszvb0h9jkxgda7dkwhg2v4cgj976"; + sha256 = "0y8nzhs7ccpvbmqrxw5vdyf5x4fv8356cb8r29h8m3rxd8r388r7"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; hipchat = { - dependencies = ["httparty" "mimemagic"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; @@ -1096,7 +1065,6 @@ version = "1.5.2"; }; html-pipeline = { - dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l"; @@ -1113,7 +1081,6 @@ version = "4.3.4"; }; httparty = { - dependencies = ["json" "multi_xml"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2"; @@ -1146,7 +1113,6 @@ version = "0.11.1"; }; influxdb = { - dependencies = ["cause" "json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w"; @@ -1179,7 +1145,6 @@ version = "4.1.1"; }; jquery-turbolinks = { - dependencies = ["railties" "turbolinks"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1d23mnl3lgamk9ziw4yyv2ixck6d8s8xp4f9pmwimk0by0jq7xhc"; @@ -1188,7 +1153,6 @@ version = "2.1.0"; }; jquery-ui-rails = { - dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1gfygrv4bjpjd2c377lw7xzk1b77rxjyy3w6wl4bq1gkqvyrkx77"; @@ -1245,7 +1209,6 @@ version = "1.11.0"; }; launchy = { - dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; @@ -1286,7 +1249,6 @@ version = "8.0.0"; }; listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; source = { remotes = ["https://rubygems.org"]; sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g"; @@ -1295,7 +1257,6 @@ version = "3.0.5"; }; loofah = { - dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; @@ -1304,7 +1265,6 @@ version = "2.0.3"; }; macaddr = { - dependencies = ["systemu"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b"; @@ -1505,7 +1465,6 @@ version = "1.4.1"; }; omniauth-azure-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s"; @@ -1514,7 +1473,6 @@ version = "0.0.6"; }; omniauth-bitbucket = { - dependencies = ["multi_json" "omniauth" "omniauth-oauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845"; @@ -1523,7 +1481,6 @@ version = "0.0.2"; }; omniauth-cas3 = { - dependencies = ["addressable" "nokogiri" "omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "13swm2hi2z63nvb2bps6g41kki8kr9b5c7014rk8259bxlpflrk7"; @@ -1540,7 +1497,6 @@ version = "4.0.0"; }; omniauth-github = { - dependencies = ["omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1mbx3c8m1llhdxrqdciq8jh428bxj1nvf4yhziv2xqmqpjcqz617"; @@ -1549,7 +1505,6 @@ version = "1.1.2"; }; omniauth-gitlab = { - dependencies = ["omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "083yyc8612kq8ygd8y7s8lxg2d51jcsakbs4pa19aww67gcm72iz"; @@ -1566,7 +1521,6 @@ version = "0.4.1"; }; omniauth-kerberos = { - dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7"; @@ -1575,7 +1529,6 @@ version = "0.3.0"; }; omniauth-multipassword = { - dependencies = ["omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8"; @@ -1584,7 +1537,6 @@ version = "0.4.2"; }; omniauth-oauth = { - dependencies = ["oauth" "omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037"; @@ -1593,7 +1545,6 @@ version = "1.1.0"; }; omniauth-oauth2 = { - dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm"; @@ -1604,13 +1555,12 @@ omniauth-saml = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xs7v08s34s2bpyd3i8i8kj73zqb6wgn51ix3pmcwsifns0c8npr"; + sha256 = "1garppa83v53yr9bwfx51v4hqwfr5h4aq3d39gn2fmysnfav7c1x"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; omniauth-shibboleth = { - dependencies = ["omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0a8pwy23aybxhn545357zdjy0hnpfgldwqk5snmz9kxingpq12jl"; @@ -1619,7 +1569,6 @@ version = "1.2.1"; }; omniauth-twitter = { - dependencies = ["json" "omniauth-oauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833"; @@ -1628,7 +1577,6 @@ version = "1.2.1"; }; omniauth_crowd = { - dependencies = ["activesupport" "nokogiri" "omniauth"]; source = { remotes = ["https://rubygems.org"]; sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7"; @@ -1637,7 +1585,6 @@ version = "2.2.3"; }; org-ruby = { - dependencies = ["rubypants"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk"; @@ -1654,7 +1601,6 @@ version = "0.5.0"; }; paranoia = { - dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0z2smnnghjhcs4l5fkz9scs1kj0bvj2n8xmzcvw4rg9yprdnlxr0"; @@ -1665,10 +1611,10 @@ parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxcs83z28wxn6bphbq5q40c1y5ab8zl8ww17jwkbi032wf6iik6"; + sha256 = "0l92rqcfy16y7kmnkil88c5mv3vj8pvhj0llbhv0avmhkaixhld1"; type = "gem"; }; - version = "2.3.1.2"; + version = "2.3.1.4"; }; pg = { source = { @@ -1727,7 +1673,6 @@ version = "1.9.2"; }; pry = { - dependencies = ["coderay" "method_source" "slop"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg"; @@ -1736,7 +1681,6 @@ version = "0.10.3"; }; pry-rails = { - dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6"; @@ -1761,7 +1705,6 @@ version = "1.6.4"; }; rack-accept = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936"; @@ -1770,7 +1713,6 @@ version = "0.4.5"; }; rack-attack = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0ihic8ar2ddfv15p5gia8nqzsl3y7iayg5v4rmg72jlvikgsabls"; @@ -1787,7 +1729,6 @@ version = "0.4.0"; }; rack-mount = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2"; @@ -1804,7 +1745,6 @@ version = "1.2.3"; }; rack-protection = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; @@ -1813,7 +1753,6 @@ version = "1.5.3"; }; rack-test = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; @@ -1830,7 +1769,6 @@ version = "4.2.7.1"; }; rails-deprecated_sanitizer = { - dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; @@ -1839,7 +1777,6 @@ version = "1.0.3"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1v8jl6803mbqpxh4hn0szj081q1a3ap0nb8ni0qswi7z4la844v8"; @@ -1848,7 +1785,6 @@ version = "1.0.7"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; source = { remotes = ["https://rubygems.org"]; sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7"; @@ -1875,10 +1811,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1hv0xhr762axywr937czi92fs0x3zk7k22vg6f4i7rr8d05sp560"; + sha256 = "1syj5gdrgwzdqzc3p1bqg1wv6gn16s2iq8304mrglzhi7cyja73q"; type = "gem"; }; - version = "0.15.0"; + version = "0.17.0"; }; rake = { source = { @@ -1897,7 +1833,6 @@ version = "0.9.6"; }; rb-inotify = { - dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; @@ -1906,7 +1841,6 @@ version = "0.9.5"; }; rblineprof = { - dependencies = ["debugger-ruby_core_source"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6"; @@ -1915,7 +1849,6 @@ version = "0.3.6"; }; rdoc = { - dependencies = ["json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8"; @@ -1956,7 +1889,6 @@ version = "3.2.2"; }; redis-actionpack = { - dependencies = ["actionpack" "redis-rack" "redis-store"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jjl6dhhpdapdaywq5iqz7z36mwbw0cn0m30wcc5wcbv7xmiiygw"; @@ -1965,7 +1897,6 @@ version = "4.0.1"; }; redis-activesupport = { - dependencies = ["activesupport" "redis-store"]; source = { remotes = ["https://rubygems.org"]; sha256 = "10y3kybz21n2z11478sf0cp4xzclvxf0b428787brmgpc6i7p7zg"; @@ -1974,7 +1905,6 @@ version = "4.1.5"; }; redis-namespace = { - dependencies = ["redis"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0rp8gfkznfxqzxk9s976k71jnljkh0clkrhnp6vgx46s5yhj9g25"; @@ -1983,7 +1913,6 @@ version = "1.5.2"; }; redis-rack = { - dependencies = ["rack" "redis-store"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8"; @@ -1992,7 +1921,6 @@ version = "1.5.0"; }; redis-rails = { - dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7"; @@ -2001,7 +1929,6 @@ version = "4.0.0"; }; redis-store = { - dependencies = ["redis"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0gf462p0wx4hn7m1m8ghs701n6xx0ijzm5cff9xfagd2s6va145m"; @@ -2018,7 +1945,6 @@ version = "1.3.1"; }; rerun = { - dependencies = ["listen"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0av239bpmy55fdx4qaw9n71aapjy2myr51h5plzjxsyr0fdwn1xq"; @@ -2027,13 +1953,12 @@ version = "0.11.0"; }; responders = { - dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i00bxp8fa67rzl50wfiaw16w21j5d5gwjjkdiwr0sw9q6ixmpz1"; + sha256 = "16h343srb6msivc2mpm1dbihsmniwvyc9jk3g4ip08g9fpmxfc2i"; type = "gem"; }; - version = "2.1.1"; + version = "2.3.0"; }; rinku = { source = { @@ -2060,7 +1985,6 @@ version = "2.0.6"; }; rqrcode = { - dependencies = ["chunky_png"]; source = { remotes = ["https://rubygems.org"]; sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb"; @@ -2069,7 +1993,6 @@ version = "0.7.0"; }; rqrcode-rails3 = { - dependencies = ["rqrcode"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg"; @@ -2136,10 +2059,10 @@ rubocop = { source = { remotes = ["https://rubygems.org"]; - sha256 = "064rh2fhr05mjgsmi1viljn9arcm2ggfaxkpk92ns9kf3ym7dz8v"; + sha256 = "0r2p4v6w5w1zx4skj9i3g3pshg3rykhgswimydrswp6nb8nkaphj"; type = "gem"; }; - version = "0.42.0"; + version = "0.43.0"; }; rubocop-rspec = { source = { @@ -2150,7 +2073,6 @@ version = "1.5.0"; }; ruby-fogbugz = { - dependencies = ["crack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm"; @@ -2161,10 +2083,10 @@ ruby-prof = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvz8yclvxch3bmwh7wmnb5h8jsbmb8jmqcf94jjrakpcs2sc072"; + sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag"; type = "gem"; }; - version = "0.15.9"; + version = "0.16.2"; }; ruby-progressbar = { source = { @@ -2177,10 +2099,10 @@ ruby-saml = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhma3cdmi9acpsn6r3x5mjjgfqxkhzxgy2pd3bc6rddghpa3x5l"; + sha256 = "1abhf16vbyzck4pv06qd5c59780glaf682ssjzpjwd9h9d7nqvl5"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.1"; }; ruby_parser = { source = { @@ -2239,7 +2161,6 @@ version = "1.0.4"; }; sanitize = { - dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; @@ -2258,10 +2179,10 @@ sass-rails = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ag66qa1f4agghdmnmn199s4sp7x54msa3abs31vl89ncbdf933i"; + sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb"; type = "gem"; }; - version = "5.0.5"; + version = "5.0.6"; }; sawyer = { source = { @@ -2280,7 +2201,6 @@ version = "0.47.1"; }; sdoc = { - dependencies = ["json" "rdoc"]; source = { remotes = ["https://rubygems.org"]; sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2"; @@ -2297,7 +2217,6 @@ version = "2.3.6"; }; select2-rails = { - dependencies = ["thor"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj"; @@ -2330,7 +2249,6 @@ version = "4.7.0"; }; sham_rack = { - dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i"; @@ -2339,7 +2257,6 @@ version = "1.3.6"; }; shoulda-matchers = { - dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0"; @@ -2350,13 +2267,12 @@ sidekiq = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0yz9fv79d7sasz7lsrb9fnymxg58jpykgr58r73nv2v8nsx1nm"; + sha256 = "1l9ji9lmgvgc9p45js3hrbpv6fj0kvrvx5lkrjd751g8r3h98z0l"; type = "gem"; }; - version = "4.1.4"; + version = "4.2.1"; }; sidekiq-cron = { - dependencies = ["redis-namespace" "rufus-scheduler" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xnbvh8kjv6954vsiwfcpp7bn8sgpwvnyapnq7b94w8h7kj3ykqy"; @@ -2380,14 +2296,6 @@ }; version = "0.10.0"; }; - sinatra = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; - type = "gem"; - }; - version = "1.4.7"; - }; slack-notifier = { source = { remotes = ["https://rubygems.org"]; @@ -2405,7 +2313,6 @@ version = "3.6.0"; }; spinach = { - dependencies = ["colorize" "gherkin-ruby" "json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0phfjs4iw2iqxdaljzwk6qxmi2x86pl3hirmpgw2pgfx76wfx688"; @@ -2414,7 +2321,6 @@ version = "0.8.10"; }; spinach-rails = { - dependencies = ["capybara" "railties" "spinach"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70"; @@ -2439,7 +2345,6 @@ version = "1.7.2"; }; spring-commands-rspec = { - dependencies = ["spring"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2"; @@ -2456,7 +2361,6 @@ version = "1.1.0"; }; spring-commands-teaspoon = { - dependencies = ["spring"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz"; @@ -2467,18 +2371,18 @@ sprockets = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0flynmaaxa53pv15x7kcxr7z6h1hn7ifrxk13dfhhvh6h38jnzkv"; + sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1"; type = "gem"; }; - version = "3.6.3"; + version = "3.7.0"; }; sprockets-es6 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17hjwpzkdg5dsgzky7hmaly2jih8867ya35855p3lxqpd3gyfpny"; + sha256 = "0508h3vnjz08c64k11za6cqnbvvifka9pmdrycamzzjd4dmf10y3"; type = "gem"; }; - version = "0.9.0"; + version = "0.9.2"; }; sprockets-rails = { source = { @@ -2544,15 +2448,6 @@ }; version = "2.6.5"; }; - task_list = { - dependencies = ["html-pipeline"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1iv1fizb04463c4mp4gxd8v0414fhvmiwvwvjby5b9qq79d8zwab"; - type = "gem"; - }; - version = "1.0.2"; - }; teaspoon = { source = { remotes = ["https://rubygems.org"]; @@ -2562,7 +2457,6 @@ version = "1.1.5"; }; teaspoon-jasmine = { - dependencies = ["teaspoon"]; source = { remotes = ["https://rubygems.org"]; sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q"; @@ -2579,7 +2473,6 @@ version = "0.7.7"; }; test_after_commit = { - dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb"; @@ -2635,8 +2528,15 @@ }; version = "0.8.3"; }; + truncato = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09ngwz2mpfsi1ms94j7nmms4kbd5sgcqv5dshrbwaqf585ja7cm5"; + type = "gem"; + }; + version = "0.7.8"; + }; turbolinks = { - dependencies = ["coffee-rails"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn"; @@ -2645,7 +2545,6 @@ version = "2.5.3"; }; tzinfo = { - dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; @@ -2662,7 +2561,6 @@ version = "0.2.1"; }; uglifier = { - dependencies = ["execjs" "json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz"; @@ -2679,7 +2577,6 @@ version = "1.8.3"; }; unf = { - dependencies = ["unf_ext"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; @@ -2706,13 +2603,12 @@ unicorn = { source = { remotes = ["https://rubygems.org"]; - sha256 = "02xgk7gajnp8zqd2wvk1hbbwz7czlbpk29ahs9ph0jprsssnzzrv"; + sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; type = "gem"; }; - version = "4.9.0"; + version = "5.1.0"; }; unicorn-worker-killer = { - dependencies = ["get_process_mem" "unicorn"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva"; @@ -2729,7 +2625,6 @@ version = "1.10.0"; }; uuid = { - dependencies = ["macaddr"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v"; @@ -2746,7 +2641,6 @@ version = "2.1.0"; }; virtus = { - dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; source = { remotes = ["https://rubygems.org"]; sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk"; @@ -2779,7 +2673,6 @@ version = "2.3.0"; }; webmock = { - dependencies = ["addressable" "crack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1p7hqdxk5359xwp59pcx841fhbnqx01ra98rnwhdyz61nrc6piv3"; @@ -2788,7 +2681,6 @@ version = "1.21.0"; }; websocket-driver = { - dependencies = ["websocket-extensions"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9"; @@ -2805,7 +2697,6 @@ version = "0.1.2"; }; wikicloth = { - dependencies = ["builder" "expression_parser" "rinku"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s"; @@ -2822,7 +2713,6 @@ version = "1.1.5"; }; xpath = { - dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e51f081437f..302bac55320 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1816,15 +1816,11 @@ in gitinspector = callPackage ../applications/version-management/gitinspector { }; - gitlab = callPackage ../applications/version-management/gitlab { - ruby = ruby_2_2; - }; + gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - gitlab-shell = callPackage ../applications/version-management/gitlab-shell { - ruby = ruby_2_2; - }; + gitlab-shell = callPackage ../applications/version-management/gitlab-shell { }; gitlab-workhorse = callPackage ../applications/version-management/gitlab-workhorse { }; From 3d768171e0e7d93324b18d28ab30ed40be6be4c4 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 10 Nov 2016 08:52:01 +0100 Subject: [PATCH 182/295] pythonPackages.tensorflow: update sha256 --- 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 9560205004b..63b948d798d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30425,7 +30425,7 @@ in { "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; sha256 = if stdenv.isDarwin then "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else - "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh"; + "0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx"; }; propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig mock]; From 840f2987d181fb8e501ac7138b9d9e8fac605820 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 03:02:16 +0100 Subject: [PATCH 183/295] ocaml-uutf: 0.9.3 -> 0.9.4 This commit also refactors the expression --- .../ocaml-modules/uutf/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index fda630114ed..a08e0ccbf74 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,32 +1,36 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +buildOcaml rec { + name = pname; + version = "0.9.4"; -stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; - version = "0.9.3"; + minimumSupportedOcamlVersion = "4.00.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; + sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k"; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "./pkg/build true"; + buildPhase = '' + ocaml pkg/build.ml \ + native=true \ + native-dynlink=true \ + cmdliner=true + ''; installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ + opam-installer --prefix=$out --script ${pname}.install | sh + ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { From 1414170edbab7b19a31d99b65545390e25977b53 Mon Sep 17 00:00:00 2001 From: Jaanus Torp Date: Thu, 10 Nov 2016 10:20:08 +0000 Subject: [PATCH 184/295] Fixed unavailable Spotify version --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 0cc0740eddb..c9139a8c227 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.38.171.g5e1cd7b2-22"; + version = "1.0.42.151.g19de0aa6-74"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0mhrbcw92g11czwcclnbwz1pk1jgap4xlya7dqsrcyb50azmv450"; + sha256 = "905c0c87091855c9d5d354ebeca9fb3951ff60c08f0dfc1c1898bf66cc8acd15"; }; buildInputs = [ dpkg makeWrapper ]; From ec99fb434f97ca52d285d02ca63d833766fabcab Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Thu, 10 Nov 2016 17:41:20 +0300 Subject: [PATCH 185/295] dtrx: add archivers to dependencies --- pkgs/tools/compression/dtrx/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index d412a4e433e..4e3f7d3d0db 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -1,6 +1,17 @@ -{stdenv, fetchurl, pythonPackages}: +{stdenv, lib, fetchurl, pythonPackages +, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield +, bzip2, xz, lzip +# unzip is handled by p7zip +, unzipSupport ? false +, unrarSupport ? false }: -pythonPackages.buildPythonApplication rec { +let + archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield ] + ++ lib.optional (unzipSupport) unzip + ++ lib.optional (unrarSupport) unrar + ++ [ bzip2 xz lzip ]); + +in pythonPackages.buildPythonApplication rec { name = "dtrx-${version}"; version = "7.1"; @@ -9,6 +20,10 @@ pythonPackages.buildPythonApplication rec { sha1 = "05cfe705a04a8b84571b0a5647cd2648720791a4"; }; + postInstall = '' + wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}" + ''; + meta = with stdenv.lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; homepage = "http://brettcsmith.org/2007/dtrx/"; From db402312a32edd3b5ea39c4d2ef35a3a56d7e4e4 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 27 Oct 2016 23:35:55 +0200 Subject: [PATCH 186/295] emacs: fix segfaults in 25.1 --- pkgs/applications/editors/emacs/default.nix | 22 ++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 08223ef82ef..57ecebc7565 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -34,7 +34,27 @@ stdenv.mkDerivation rec { sha256 = "0cwgyiyymnx4xdg99dm2drfxcyhy2jmyf0rkr9fwj9mwwf77kwhr"; }; - patches = lib.optional stdenv.isDarwin ./at-fdcwd.patch; + patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch) ++ [ + ## Fixes a segfault in emacs 25.1 + ## http://lists.gnu.org/archive/html/emacs-devel/2016-10/msg00917.html + ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24358 + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=9afea93ed536fb9110ac62b413604cf4c4302199; + sha256 = "1iifyfqh7qfdfsrpqgz2l7z0l7alvma57jlklyq258qyjg0pc8n4"; }) + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=71ca4f6a43bad06192cbc4bb8c7a2d69c179b7b0; + sha256 = "0vadqvcigca0j891yis1mhjn18rg4l9qj621q6vzip46ka6qig0d"; }) + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=1047496722a58ef5b736dae64d32adeb58c5055c; + sha256 = "01lfa89qw7y0spcy57hm1ymijb57i6kvhb9z9impcxwza60lbi7b"; }) + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=96ac0c3ebce825e60595794f99e703ec8302e240; + sha256 = "0bmkrm356fbwc8wsiqh2w706mq5r9q4ic4m8vzdj099ihnf121nn"; }) + (fetchurl { + url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=43986d16fb6ad78a627250e14570ea70bdb1f23a; + sha256 = "0kp8dgs7fjgvidhm2y84jrxad78mxi0c47jhyszj5644qqxm47cr"; + }) + ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals srcRepo [ autoconf automake texinfo ]; From d1dba6e08338e571acd17e7aa78ad7804ea03bb4 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 3 Nov 2016 10:52:59 +0100 Subject: [PATCH 187/295] emacs: add selinux capability --- pkgs/applications/editors/emacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 57ecebc7565..4f62d0963c0 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls +, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? true, gtk2 ? null @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ++ lib.optionals srcRepo [ autoconf automake texinfo ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] + [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext libselinux ] ++ lib.optional stdenv.isLinux dbus ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft From ba5f7673c6cb72e607b4b3673faa75911ef15beb Mon Sep 17 00:00:00 2001 From: Stefan Goetz Date: Thu, 10 Nov 2016 16:30:13 +0100 Subject: [PATCH 188/295] youtube-dl: 2016-11-04 -> 2016-11-08.1 (#20292) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d1ba3ced99b..a2dd91e83bc 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.04"; + version = "2016.11.08.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "9622b29b81587278a00e39e4206e7c52555d240cbbb44242f237660169e8d531"; + sha256 = "95d45438254c949952127b269451da861682fb06a7ef62b5f5dc75bc40bfaeeb"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From d48846756f3eba1f0e8fd772e2ea06d51604a6ee Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 10 Nov 2016 05:19:51 +0100 Subject: [PATCH 189/295] chromium: fix nix syntax highlighting for emacs --- pkgs/applications/networking/browsers/chromium/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix index 23f06569fa9..3b9ea396647 100644 --- a/pkgs/applications/networking/browsers/chromium/update.nix +++ b/pkgs/applications/networking/browsers/chromium/update.nix @@ -64,7 +64,7 @@ in rec { csv2nix = name: src: import (runCommand "${name}.nix" { src = builtins.fetchurl src; } '' - esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } + esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs " IFS=, read -r -a headings <<< "$(head -n1 "$src")" echo "[" > "$out" tail -n +2 "$src" | while IFS=, read -r -a line; do From 5dee508acff13d3f54443565a0af8dde4d3217b1 Mon Sep 17 00:00:00 2001 From: James Cunningham Date: Thu, 10 Nov 2016 16:24:45 +0000 Subject: [PATCH 190/295] vim plugins: add dracula theme --- pkgs/misc/vim-plugins/default.nix | 10 ++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index f9ea101d3eb..2cd10593aeb 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -520,6 +520,16 @@ rec { }; + dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "dracula-2016-09-21"; + src = fetchgit { + url = "git://github.com/dracula/vim"; + rev = "926dfbab01128322f6326bdd10de2856b1fa3232"; + sha256 = "1kqd367qa2dnz3qf10lyw7hacahylc94axc6f6f5nw4cklm1g8yv"; + }; + dependencies = []; + }; + vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jade-2016-10-31"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 263970be386..b7e33a71ff8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -35,6 +35,7 @@ "github:ctrlpvim/ctrlp.vim" "github:derekelkins/agda-vim" "github:digitaltoad/vim-jade" +"github:dracula/vim" "github:eagletmt/neco-ghc" "github:eikenb/acp" "github:elmcast/elm-vim" From 674eb5ddf0771de511499504024c7e1d0717797d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Nov 2016 17:52:12 +0100 Subject: [PATCH 191/295] nlohmann_json: 2.0.3 -> 2.0.7 --- pkgs/development/libraries/nlohmann_json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index dcc0c781ee0..15ddbdaedef 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "2.0.3"; + version = "2.0.7"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "192mg2y93g9q0jdn3fdffydpxk19nsrcv92kfip6srkdkwja18ri"; + sha256 = "03jklvlcsms09p79qz9piqrdy2vhn4rkwidwfgq6cpxm6anqyqjh"; }; nativeBuildInputs = [ cmake ]; From b15dec170afa5f0e9e86caf938646d24a4407da5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2016 09:34:57 +0100 Subject: [PATCH 192/295] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ea775f0608816e429b5e3c44060b66c6003c27a4. --- .../haskell-modules/hackage-packages.nix | 1212 ++++++++++++++--- 1 file changed, 1036 insertions(+), 176 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 45839074b79..728684fd028 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9575,6 +9575,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_0_6_2_0" = callPackage + ({ mkDerivation, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "0.6.2.0"; + sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926"; + libraryHaskellDepends = [ + attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/MichelBoucey/IPv6Addr"; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -15669,6 +15689,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Spintax_0_2_0_0" = callPackage + ({ mkDerivation, attoparsec, base, extra, mwc-random, text }: + mkDerivation { + pname = "Spintax"; + version = "0.2.0.0"; + sha256 = "33b5e8e7d3e41ef5a8b008e2a1084c23b57e26af147f5158dca59256b875336a"; + libraryHaskellDepends = [ attoparsec base extra mwc-random text ]; + homepage = "https://github.com/MichelBoucey/spintax"; + description = "Random text generation based on spintax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect @@ -17943,10 +17976,8 @@ self: { }: mkDerivation { pname = "XSaiga"; - version = "1.1.0.0"; - sha256 = "580f29b238c9195613f836eea693a937ba1ad00ea4591bbb7cb1a6a2032f02fd"; - revision = "4"; - editedCabalFile = "0cd366fd1401a0c35d4b127ef70b7c26447b6ab2c6c5cb4b0c8b4b4b654e27b2"; + version = "1.3.0.1"; + sha256 = "a913eac19f76759271bc331084773e04f4d6d16dd70190e10bd9403e51cdaad2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18377,7 +18408,7 @@ self: { description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) abc;}; + }) {abc = null;}; "abcnotation" = callPackage ({ mkDerivation, base, parsec, prettify, process, semigroups }: @@ -26709,6 +26740,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "asciidiagram_1_3_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative + , rasterific-svg, svg-tree, text, vector + }: + mkDerivation { + pname = "asciidiagram"; + version = "1.3.3"; + sha256 = "694948f5f408aa7dfcab17ffefb74e413f1d3dacf2c523bfbf9ecaf972645f18"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers FontyFruity JuicyPixels lens linear mtl + rasterific-svg svg-tree text vector + ]; + executableHaskellDepends = [ + base bytestring directory filepath FontyFruity JuicyPixels + optparse-applicative rasterific-svg svg-tree text + ]; + description = "Pretty rendering of Ascii diagram into svg or png"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asic" = callPackage ({ mkDerivation, asil, base, bytestring, utf8-string }: mkDerivation { @@ -33533,6 +33588,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blosum_0_1_1_3" = callPackage + ({ mkDerivation, base, containers, fasta, lens + , optparse-applicative, pipes, pipes-text, split, text, text-show + }: + mkDerivation { + pname = "blosum"; + version = "0.1.1.3"; + sha256 = "bff68ec89bf8f7c70b18a8d13df8b9e464eea6168ec3df935f7d3391e6196de1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers fasta lens text text-show + ]; + executableHaskellDepends = [ + base containers fasta optparse-applicative pipes pipes-text split + text + ]; + homepage = "http://github.com/GregorySchwartz/blosum#readme"; + description = "BLOSUM generator"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bloxorz" = callPackage ({ mkDerivation, base, GLFW, OpenGL }: mkDerivation { @@ -37335,6 +37413,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "carte" = callPackage + ({ mkDerivation, base, filepath, mtl, network, optparse-applicative + , random, semigroups, time, transformers, tuple + }: + mkDerivation { + pname = "carte"; + version = "0.1.0.0"; + sha256 = "3a6a40c11fa4544082a752630e381b89e9a16b305f967fcf0ff6eb8f358b5136"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base filepath mtl network optparse-applicative random semigroups + time transformers tuple + ]; + homepage = "https://github.com/m1dnight/carte"; + description = "Carte: A commandline pastebin server"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "cartel" = callPackage ({ mkDerivation, base, directory, filepath, multiarg , optparse-applicative, pretty-show, process, QuickCheck, random @@ -38353,6 +38450,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cereal_0_5_4_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "cereal"; + version = "0.5.4.0"; + sha256 = "daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/GaloisInc/cereal"; + description = "A binary serialization library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cereal-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl , resourcet, transformers @@ -40619,6 +40737,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cli-builder" = callPackage + ({ mkDerivation, base, doctest, either, exceptions, filemanip + , hspec, optparse-applicative, QuickCheck, transformers + }: + mkDerivation { + pname = "cli-builder"; + version = "0.1.0"; + sha256 = "0a72dbaa461d913c4cb8e0315d00148e9106da9558281bf803b3fbad33ad24e5"; + libraryHaskellDepends = [ + base either exceptions optparse-applicative transformers + ]; + testHaskellDepends = [ base doctest filemanip hspec QuickCheck ]; + homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/cli-builder"; + description = "Simple project template from stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "click-clack" = callPackage ({ mkDerivation, base, containers, GLFW, Hipmunk, MonadRandom, mtl , OpenGL, random, StateVar, transformers @@ -41355,8 +41490,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.1"; - sha256 = "543968422a3bbccdeddb1fe7258ef28ed7fb87c839da817c4d7935a9a2f20653"; + version = "0.1.1"; + sha256 = "16b8b802bca21b71dd782560978b7ac88866c129df83b760e9059a7da04d70f7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/RyanGlScott/code-page"; @@ -43317,6 +43452,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-extra_1_1_14" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , bytestring-builder, conduit, directory, exceptions, filepath + , hspec, monad-control, network, primitive, process, QuickCheck + , resourcet, stm, streaming-commons, text, transformers + , transformers-base + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.1.14"; + sha256 = "6f3abc94f28fb577fc03383ba477fe4f2635cb14fed2f90c7520e1331dc343c6"; + libraryHaskellDepends = [ + async attoparsec base blaze-builder bytestring conduit directory + exceptions filepath monad-control network primitive process + resourcet stm streaming-commons text transformers transformers-base + ]; + testHaskellDepends = [ + async attoparsec base blaze-builder bytestring bytestring-builder + conduit exceptions hspec process QuickCheck resourcet stm + streaming-commons text transformers transformers-base + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Batteries included conduit: adapters for common libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -44590,23 +44752,23 @@ self: { }) {}; "convert-annotation" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, containers, HTTP - , lens, lens-aeson, optparse-generic, pipes, pipes-bytestring - , pipes-csv, safe, text, wreq + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , deepseq, HTTP, inline-r, lens, lens-aeson, optparse-generic + , pipes, pipes-bytestring, pipes-csv, safe, text, vector, wreq }: mkDerivation { pname = "convert-annotation"; - version = "0.2.0.1"; - sha256 = "93db09c63eed3c744673d89e20560c028f6e424396933d9a67fb49f78a764449"; + version = "0.5.0.0"; + sha256 = "946e3b0961a64fe7c3a8ffe28c8f87675a4f37000f3a4a7431f9b9c1af7dca67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers HTTP lens lens-aeson safe text - wreq + aeson base bytestring containers deepseq HTTP inline-r lens + lens-aeson safe text wreq ]; executableHaskellDepends = [ - base bytestring cassava lens optparse-generic pipes - pipes-bytestring pipes-csv text + base bytestring cassava inline-r lens optparse-generic pipes + pipes-bytestring pipes-csv text vector ]; homepage = "http://github.com/GregorySchwartz/convert-annotation#readme"; description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases"; @@ -46051,6 +46213,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion_1_1_4_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring + , cassava, code-page, containers, deepseq, directory, filepath + , Glob, hastache, HUnit, js-flot, js-jquery, mtl, mwc-random + , optparse-applicative, parsec, QuickCheck, statistics, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-compat, vector, vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.1.4.0"; + sha256 = "53a243fc759ed3100e71f96a5f6649658d076d91d52ce2853a6f8587aa3cfa76"; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base binary bytestring cassava code-page + containers deepseq directory filepath Glob hastache js-flot + js-jquery mtl mwc-random optparse-applicative parsec statistics + text time transformers transformers-compat vector vector-algorithms + ]; + testHaskellDepends = [ + aeson base bytestring HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + homepage = "http://www.serpentine.com/criterion"; + description = "Robust, reliable performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "criterion-plus" = callPackage ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -47308,14 +47498,19 @@ self: { inherit (pkgs) st; util = null;}; "cufft" = callPackage - ({ mkDerivation, base, c2hs, cuda }: + ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath + , template-haskell + }: mkDerivation { pname = "cufft"; - version = "0.1.2.2"; - sha256 = "7ce52f10a05bd5064466dde644e0663abbc9eb3cfe0026531cfc04c1c8302bec"; + version = "0.7.5.0"; + sha256 = "09bd838815a521b21b971c43e1eb0b79dfe54d848a3cf9d0137f3cdb414e1171"; + setupHaskellDepends = [ + base Cabal directory filepath template-haskell + ]; libraryHaskellDepends = [ base cuda ]; libraryToolDepends = [ c2hs ]; - homepage = "http://github.com/robeverest/cufft"; + homepage = "https://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50713,6 +50908,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "declarative_0_3_3" = callPackage + ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types + , mighty-metropolis, mwc-probability, pipes, primitive + , speedy-slice, transformers + }: + mkDerivation { + pname = "declarative"; + version = "0.3.3"; + sha256 = "77d14c47453135ed727b0e8323244a68bb10b74a6c4bdaf5e24eb8a619683dee"; + libraryHaskellDepends = [ + base hasty-hamiltonian lens mcmc-types mighty-metropolis + mwc-probability pipes primitive speedy-slice transformers + ]; + testHaskellDepends = [ base mwc-probability ]; + homepage = "http://github.com/jtobin/declarative"; + description = "DIY Markov Chains"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "decode-utf8" = callPackage ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode }: @@ -52304,7 +52519,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-lib_1_4" = callPackage + "diagrams-lib_1_4_0_1" = callPackage ({ mkDerivation, active, adjunctions, array, base, cereal, colour , containers, data-default-class, deepseq, diagrams-core , diagrams-solve, directory, distributive, dual-tree, exceptions @@ -52316,8 +52531,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4"; - sha256 = "5aed2074a86e6f6cc030ff062d8a3a743aaf8fa9d7d9cd14c6d7b0b1d32112ad"; + version = "1.4.0.1"; + sha256 = "5140b590c83047058d4253842ef1105b2ecf71d8dd72a280123c00b030a32dc6"; libraryHaskellDepends = [ active adjunctions array base cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -54453,6 +54668,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_2_0_9" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-builder, conduit, conduit-extra, containers, doctest + , hspec, iproute, mtl, network, random, resourcet, safe, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.9"; + sha256 = "b0d6c335dd9fdfa85e8389c67fc4a132d47ecb871c32332cb7858ceaa045fb8c"; + libraryHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers iproute mtl network random resourcet safe + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet safe word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -54670,6 +54909,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "docopt_0_7_0_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , HUnit, parsec, split, template-haskell, text, th-lift + }: + mkDerivation { + pname = "docopt"; + version = "0.7.0.5"; + sha256 = "15790808a4896bbf0748c1c0f3ab63c07aea4621d95b93a39886813f829d05ee"; + libraryHaskellDepends = [ + base containers parsec template-haskell th-lift + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring containers HUnit parsec split + template-haskell text th-lift + ]; + homepage = "https://github.com/docopt/docopt.hs"; + description = "A command-line interface parser that will make you smile"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctemplates" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, hspec, parsec, scientific, text, unordered-containers @@ -57478,8 +57738,8 @@ self: { }: mkDerivation { pname = "elm-export"; - version = "0.4.1.1"; - sha256 = "91e01639707349bf27a8aa9fffa8f30206fc1f50e269d6220403ec585a54e263"; + version = "0.5.0.2"; + sha256 = "13d1542351031f716508fdbe51876aa1cd10791b8b901cb8abdafb23981c14c4"; libraryHaskellDepends = [ base bytestring containers directory formatting mtl text time ]; @@ -69437,8 +69697,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.5.3"; - sha256 = "2999e909ccd45cee6ce517a74fa2ad8f3f06611ec9945c1c0b04f114ed6cbf26"; + version = "0.3.7.0"; + sha256 = "97918cba0952621a9bdb78718c824a6f43a0098f6e52335d35164a2f9c7d7afa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70062,8 +70322,8 @@ self: { }: mkDerivation { pname = "github-backup"; - version = "1.20160922"; - sha256 = "ea8036c3d9e40057bcf6c26fe925606bce8769277f0d2cfa394fd23a73df4242"; + version = "1.20161110"; + sha256 = "a6d0e48a3e6300f6633106ce28e8a7140856e924d78ef5330675410a10dcc245"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base hslogger MissingH ]; @@ -70214,8 +70474,8 @@ self: { }: mkDerivation { pname = "gitit"; - version = "0.12.1.1"; - sha256 = "c95f78a9d3060c6695c0d8f3f6e2cc01f64d0b535d8c6c3e591a9fd802d534a5"; + version = "0.12.2"; + sha256 = "160a928d992847823ab11982fa6465a4d80e59ce2a45e54e8a5e1838aba22b78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70932,20 +71192,19 @@ self: { }) {}; "gloss-examples" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim - , GLFW-b, gloss, gloss-algorithms, gloss-raster, gloss-rendering - , random, repa, repa-algorithms, repa-io, vector + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim, gloss + , gloss-algorithms, gloss-raster, random, repa, repa-algorithms + , repa-io, vector }: mkDerivation { pname = "gloss-examples"; - version = "1.10.2.3"; - sha256 = "0d25bd4a7ae5f69f68175476647d7d2dbfa987ebe33419166ff312b88c527df3"; + version = "1.10.2.4"; + sha256 = "ef1adf43066757d82adc16b4bde4f19a73653b837112ca41713ad16e230cac62"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bmp bytestring containers ghc-prim GLFW-b gloss - gloss-algorithms gloss-raster gloss-rendering random repa - repa-algorithms repa-io vector + base bmp bytestring containers ghc-prim gloss gloss-algorithms + gloss-raster random repa repa-algorithms repa-io vector ]; homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; @@ -70990,8 +71249,8 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.10.2.3"; - sha256 = "28485da7f90e37c778acba0232f3bba47a796dc62ed9cc02ebc43c7ddd7875b1"; + version = "1.10.2.4"; + sha256 = "f9875344822a1bbb4b937605e1b1483b25559c186db94033c97117f6148cdef5"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; @@ -71029,6 +71288,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-rendering_1_10_3_5" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: + mkDerivation { + pname = "gloss-rendering"; + version = "1.10.3.5"; + sha256 = "00c68518b2eb62f086257238034a18065faa7939369a5b2986c2f461e6a80d73"; + libraryHaskellDepends = [ + base bmp bytestring containers GLUT OpenGL + ]; + description = "Gloss picture data types and rendering functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-sodium" = callPackage ({ mkDerivation, base, gloss, sodium }: mkDerivation { @@ -75730,8 +76003,8 @@ self: { }: mkDerivation { pname = "gruff"; - version = "0.3.4"; - sha256 = "10ec0d3c842911815c204025a98642dc70e26d5dcb5c07c143277baad45d4947"; + version = "0.4"; + sha256 = "ae08f3b01988d5a7c3761ad43df355c5148b3511693eb86a83ab7879ccbcba0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ruff ]; @@ -75750,8 +76023,8 @@ self: { }: mkDerivation { pname = "gruff-examples"; - version = "0.3.1"; - sha256 = "e7fda6673da47266fcf7f37ecddc6b643e6bd5fbfefac4df2b6ec6fe115acf0b"; + version = "0.4"; + sha256 = "65c48c95c591f8fbda19e0dd19c74af1caaea979ecbdd5a4d8f793eba4d65482"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91038,6 +91311,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hquantlib_0_0_3_3" = callPackage + ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl + , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck + , statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, vector, vector-algorithms + }: + mkDerivation { + pname = "hquantlib"; + version = "0.0.3.3"; + sha256 = "208839f68a4af5f3b0e09214623c8e166f768a46b6cdc7369937ab73e8d78c28"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random + parallel statistics time vector vector-algorithms + ]; + executableHaskellDepends = [ + base containers mersenne-random parallel + ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "http://github.com/paulrzcz/hquantlib.git"; + description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hquery" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, HUnit , parsec, test-framework, test-framework-hunit, text, xmlhtml @@ -91088,12 +91390,16 @@ self: { }) {}; "hreader-lens" = callPackage - ({ mkDerivation, base, hreader, hset, lens, profunctors }: + ({ mkDerivation, base, comonad, hreader, hset, lens, lens-action + , profunctors + }: mkDerivation { pname = "hreader-lens"; - version = "0.1.1.0"; - sha256 = "3b4cef769b0589e042c65876ebd343eb3a00d5ed449b8c6678604ac8b755d647"; - libraryHaskellDepends = [ base hreader hset lens profunctors ]; + version = "0.1.2.0"; + sha256 = "4d44e22ce21015f02007168bf07ae27d589e2e265a019b02410ba4b176d87728"; + libraryHaskellDepends = [ + base comonad hreader hset lens lens-action profunctors + ]; homepage = "http://github.com/dredozubov/hreader-lens"; description = "Optics for hreader package"; license = stdenv.lib.licenses.mit; @@ -95469,7 +95775,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_3_4" = callPackage + "http-client_0_5_4" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -95478,8 +95784,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.3.4"; - sha256 = "34e9fee9939668a056dc0f8193cfd1906209a51a31853e7ee57f5a7548dd2689"; + version = "0.5.4"; + sha256 = "f226b9dd4b7a6b5ef3becddd02baeabe3429b88584a42609ca3733c84bfe7300"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -95823,8 +96129,8 @@ self: { }: mkDerivation { pname = "http-dispatch"; - version = "0.5.0.2"; - sha256 = "1aee418e5b2a6798036a3b93272bbd577998274f1f00fc87012db80353f83b2f"; + version = "0.6.0.0"; + sha256 = "67a1cea38faec49d5e9708090e567b032e186e61fa391e15eb4b524ad14786e7"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive http-client http-client-tls http-types @@ -103208,6 +103514,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jason" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, text + , unordered-containers, vector + }: + mkDerivation { + pname = "jason"; + version = "0.1.0.1"; + sha256 = "a36a5f9cf93da0c03ede25407ce724c0b8f8e13285074f8bea57e50ea4e49d04"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers text unordered-containers vector + ]; + executableHaskellDepends = [ aeson base bytestring text ]; + testHaskellDepends = [ aeson base bytestring text ]; + homepage = "https://github.com/Lupino/jason#readme"; + description = "A fast JASONETTE-iOS JSON combinator library for haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "java-bridge" = callPackage ({ mkDerivation, base, bimap, containers, cpphs, directory , filepath, hinduce-missingh, hint, mtl, multimap, named-records @@ -105779,8 +106105,8 @@ self: { }: mkDerivation { pname = "keysafe"; - version = "0.20161022"; - sha256 = "2b6cc28f249b18dcdb0263ccb649598ddc8196f449e14130a20b0358711151a1"; + version = "0.20161107"; + sha256 = "ded1fd52ede4c574a4dd85ff60296f0e1bfe9b248857ee83025247790a03dfe7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112517,19 +112843,25 @@ self: { "log" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bloodhound, bytestring, cond, deepseq, exceptions, hpqtypes - , http-client, lifted-base, monad-control, monad-time, mtl - , old-locale, split, stm, text, text-show, time, transformers + , http-client, http-types, lifted-base, monad-control, monad-time + , mtl, old-locale, process, random, semigroups, split, stm, tasty + , tasty-hunit, text, text-show, time, transformers , transformers-base, unordered-containers, vector }: mkDerivation { pname = "log"; - version = "0.5.3"; - sha256 = "2b948145b4c63f136fdac698e4c908d49029f0436ddceae3d7ae0a9544406143"; + version = "0.5.4"; + sha256 = "54dbe118a7bb4cc54b9a894859bb9b0e411f9b8f5f5205fe8bd2c0d079ef1962"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring cond deepseq exceptions hpqtypes http-client lifted-base - monad-control monad-time mtl old-locale split stm text text-show - time transformers transformers-base unordered-containers vector + monad-control monad-time mtl old-locale semigroups split stm text + text-show time transformers transformers-base unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bloodhound bytestring exceptions http-client http-types + process random tasty tasty-hunit text time transformers ]; homepage = "https://github.com/scrive/log"; description = "Structured logging solution with multiple backends"; @@ -112579,6 +112911,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-utils" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default + , exceptions, hpqtypes, http-types, invariant, kontra-config + , lifted-base, log, monad-control, random, text, time, transformers + , transformers-base, unjson, vector, wai, warp + }: + mkDerivation { + pname = "log-utils"; + version = "0.2.2"; + sha256 = "7fe12350c66debb33f6bf348c34ee2d046931035cf93dac2c13d76294eed3688"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs data-default exceptions hpqtypes + http-types invariant kontra-config lifted-base log monad-control + random text time transformers transformers-base unjson vector wai + warp + ]; + homepage = "https://github.com/scrive/log-utils"; + description = "Utils for working with logs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "log2json" = callPackage ({ mkDerivation, base, containers, json, parsec }: mkDerivation { @@ -113217,14 +113572,12 @@ self: { }) {}; "lowgl" = callPackage - ({ mkDerivation, base, data-default, gl, linear, vector }: + ({ mkDerivation, base, gl, linear, vector }: mkDerivation { pname = "lowgl"; - version = "0.3.1.1"; - sha256 = "85f5a954970634aa41bc77b6a2932ed935b1411be4ad7badab31dad45b2365b0"; - revision = "1"; - editedCabalFile = "d16861021ff55cbb15185537758b01c3bf1eddf910c2dfd57cb3e51d73f5e591"; - libraryHaskellDepends = [ base data-default gl linear vector ]; + version = "0.4.0.1"; + sha256 = "fceb0202bed4a3a3e0431ad32eac95fcc4aefef93b992a35797da0bfc8d39df7"; + libraryHaskellDepends = [ base gl linear vector ]; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; @@ -113562,6 +113915,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lucid_2_9_7" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "lucid"; + version = "2.9.7"; + sha256 = "a087af27ad196e3a41ccb6b954a12d384589a14b2ac55614e6a27817f65e0608"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-foundation" = callPackage ({ mkDerivation, base, hspec, lucid, QuickCheck , quickcheck-instances, text @@ -118044,8 +118419,8 @@ self: { ({ mkDerivation, base, bytestring, cereal, network, transformers }: mkDerivation { pname = "modbus-tcp"; - version = "0.2.1"; - sha256 = "b235be55c9efcb4796ba7bfd11e6592ecb0dbbbf814aff4ebe33314b0caf51b8"; + version = "0.2.1.1"; + sha256 = "60cf7f9956387abd5b24e760d281b7a3423432d271502745df59b398d499de86"; libraryHaskellDepends = [ base bytestring cereal network transformers ]; @@ -118097,6 +118472,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "modify-fasta_0_8_2_2" = callPackage + ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative + , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text + , text-show + }: + mkDerivation { + pname = "modify-fasta"; + version = "0.8.2.2"; + sha256 = "76d72306f18d23ef72ec8dada391483136689f3b0a2f074ec79506759908100f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers fasta regex-tdfa regex-tdfa-text split text + text-show + ]; + executableHaskellDepends = [ + base containers fasta mtl optparse-applicative pipes pipes-text + split text + ]; + homepage = "https://github.com/GregorySchwartz/modify-fasta"; + description = "Modify fasta (and CLIP) files in several optional ways"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modsplit" = callPackage ({ mkDerivation, base, directory, filepath, haskell98, mtl , utf8-string @@ -118697,6 +119097,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_20_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.20.1"; + sha256 = "8e7cd3af6a28c6be29ec184d221c60d745d14142794efbd175077ee3e8c0baad"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -120835,6 +121258,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multi-trie" = callPackage + ({ mkDerivation, base, composition, containers, HTF }: + mkDerivation { + pname = "multi-trie"; + version = "0.1"; + sha256 = "ffcaa510f0f7e379d62c63669f1a35607e49a9811a5d6e50fd2229d9ec967b44"; + libraryHaskellDepends = [ base composition containers ]; + testHaskellDepends = [ base containers HTF ]; + homepage = "https://github.com/vadimvinnik/multi-trie"; + description = "Trie of sets, as a model for compound names having multiple values"; + license = stdenv.lib.licenses.mit; + }) {}; + "multiaddr" = callPackage ({ mkDerivation, attoparsec, base, base58-bytestring, bytestring , cereal, errors, hashable, tasty, tasty-hunit, tasty-quickcheck @@ -121911,23 +122347,21 @@ self: { "mysql-haskell" = callPackage ({ mkDerivation, base, binary, binary-ieee754, binary-parsers , blaze-textual, bytestring, bytestring-lexing, cryptonite - , HsOpenSSL, io-streams, memory, monad-loops, network - , optparse-applicative, scientific, tasty, tasty-hunit, tcp-streams - , text, time, tls, vector, wire-streams, word24 + , io-streams, memory, monad-loops, network, scientific, tasty + , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams + , word24 }: mkDerivation { pname = "mysql-haskell"; - version = "0.6.0.0"; - sha256 = "c1d577ccf0f38a1e0c54409c6e2dfc55bc77c88a3a22537679c4a742d5674429"; + version = "0.7.0.0"; + sha256 = "c4ab3b07780ab7ba3df4ec5c9575d717456433ea7af5ab0af4aae346af22ceda"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring - bytestring-lexing cryptonite HsOpenSSL io-streams memory - monad-loops network scientific tcp-streams text time tls vector - wire-streams word24 + bytestring-lexing cryptonite io-streams memory monad-loops network + scientific tcp-streams text time tls vector wire-streams word24 ]; testHaskellDepends = [ - base bytestring io-streams optparse-applicative tasty tasty-hunit - text time vector + base bytestring io-streams tasty tasty-hunit text time vector ]; homepage = "https://github.com/winterland1989/mysql-haskell"; description = "pure haskell MySQL driver"; @@ -121935,6 +122369,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mysql-haskell-openssl" = callPackage + ({ mkDerivation, base, HsOpenSSL, io-streams, mysql-haskell + , network, tcp-streams, tcp-streams-openssl, wire-streams + }: + mkDerivation { + pname = "mysql-haskell-openssl"; + version = "0.7.0.0"; + sha256 = "c960cc61a13f63df2cc776af9b876ff8e68f181237ec772d27c21684ed7e791b"; + libraryHaskellDepends = [ + base HsOpenSSL io-streams mysql-haskell network tcp-streams + tcp-streams-openssl wire-streams + ]; + homepage = "https://github.com/winterland1989/mysql-haskell"; + description = "TLS support for mysql-haskell package using openssl"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mysql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light @@ -124433,8 +124884,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.4.0"; - sha256 = "83423a70e9d066a02ea3931b96de18cfcdc9866a47bd7a00c5b82a96f436d99c"; + version = "0.2.4.2"; + sha256 = "547a786039d88cbb0aa6ba355c8930245232121a06b63bbf005f725bc8f93ffa"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -124990,10 +125441,8 @@ self: { }: mkDerivation { pname = "normalization-insensitive"; - version = "2.0"; - sha256 = "8f8ab5ae70a07a2d65fd0a46dbd8ed5cc3f3af5e95aa074e5a12b312a4dd4e29"; - revision = "1"; - editedCabalFile = "0f02d93794b029d48c4cd5564f7f357efba43bd13e33a51044994d487e274fc2"; + version = "2.0.0.1"; + sha256 = "17f922efd2b1a6ebdefb619c12d1581585f3bc0c2deec811ba124f8ae38d109d"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -125705,9 +126154,11 @@ self: { }: mkDerivation { pname = "nvvm"; - version = "0.7.5.0"; - sha256 = "ccd9efb4f1f97318e98d3ad363810d2fd4780992c37fc92d7e526b3af8f59c85"; - setupHaskellDepends = [ base Cabal directory filepath ]; + version = "0.7.5.1"; + sha256 = "73914a6a1816432b0cc687a6200b52a030a705b51276f8266a984c3617f69109"; + setupHaskellDepends = [ + base Cabal directory filepath template-haskell + ]; libraryHaskellDepends = [ base bytestring cuda template-haskell ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/tmcdonell/nvvm"; @@ -126545,6 +126996,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_5_2_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, case-insensitive, containers, contravariant, multiset + , postgresql-simple, pretty, product-profunctors, profunctors + , QuickCheck, semigroups, text, time, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.5.2.1"; + sha256 = "ef175620163b6aaa5dc7aff6a49347b698134fb924869a789c097406ad746152"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups text time + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -127288,6 +127766,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "operate-do" = callPackage + ({ mkDerivation, base, charset, doctest, filemanip + , haskell-src-meta, hspec, QuickCheck, template-haskell + }: + mkDerivation { + pname = "operate-do"; + version = "0.1.0"; + sha256 = "c1daa940cd97336eecba200f8201f591ed1395390feeb3c9376fea86b7901764"; + libraryHaskellDepends = [ + base charset haskell-src-meta template-haskell + ]; + testHaskellDepends = [ base doctest filemanip hspec QuickCheck ]; + homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/operate-do"; + description = "Simple project template from stack"; + license = stdenv.lib.licenses.mit; + }) {}; + "operational" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { @@ -128843,6 +129338,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pandoc-stylefrommeta" = callPackage + ({ mkDerivation, base, containers, HaTeX, MissingH, pandoc + , pandoc-types + }: + mkDerivation { + pname = "pandoc-stylefrommeta"; + version = "0.1.0.1"; + sha256 = "8118b1f301b9a77ea855b217db98f3bc205bb04e673100a652460bea888af2d3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers HaTeX MissingH pandoc pandoc-types + ]; + homepage = "http://github.com/lyokha/styleFromMeta"; + description = "Pandoc filter to customize links, images and paragraphs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pandoc-types" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , ghc-prim, syb @@ -132421,20 +132934,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pinboard_0_9_10" = callPackage + "pinboard_0_9_11" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, either, hspec - , http-client, http-client-tls, http-types, mtl, network - , profunctors, QuickCheck, random, safe-exceptions, semigroups - , text, time, transformers, unordered-containers, vector + , http-client, http-client-tls, http-types, monad-logger, mtl + , network, profunctors, QuickCheck, random, safe-exceptions + , semigroups, text, time, transformers, unordered-containers + , vector }: mkDerivation { pname = "pinboard"; - version = "0.9.10"; - sha256 = "841e1a70daecec66d53fb3fdeb1c89fa5c2de0e5bd701129a9596492216a5249"; + version = "0.9.11"; + sha256 = "2fc06cd5f9afb134802d9777cb53052066eb7ee9b3fa6f24b7eb12907146f774"; libraryHaskellDepends = [ aeson base bytestring containers either http-client http-client-tls - http-types mtl network profunctors random safe-exceptions text time - transformers unordered-containers vector + http-types monad-logger mtl network profunctors random + safe-exceptions text time transformers unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers hspec mtl QuickCheck @@ -138493,42 +139007,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "purescript_0_10_1" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal - , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring - , clock, containers, data-ordlist, directory, dlist, edit-distance - , file-embed, filepath, fsnotify, Glob, haskeline, hspec - , hspec-discover, http-client, http-types, HUnit - , language-javascript, lifted-base, monad-control, monad-logger - , mtl, network, optparse-applicative, parallel, parsec - , pattern-arrows, pipes, pipes-http, process, protolude, regex-tdfa - , safe, semigroups, silently, sourcemap, spdx, split, stm, syb - , text, time, transformers, transformers-base, transformers-compat + "purescript_0_10_2" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty + , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json + , boxes, bytestring, clock, containers, data-ordlist, directory + , dlist, edit-distance, file-embed, filepath, foldl, fsnotify, Glob + , haskeline, hspec, hspec-discover, http-client, http-types, HUnit + , language-javascript, lens, lifted-base, monad-control + , monad-logger, mtl, network, optparse-applicative, parallel + , parsec, pattern-arrows, pipes, pipes-http, process, protolude + , regex-tdfa, safe, semigroups, silently, sourcemap, spdx, split + , stm, syb, system-filepath, text, time, transformers + , transformers-base, transformers-compat, turtle , unordered-containers, utf8-string, vector, wai, wai-websockets , warp, websockets }: mkDerivation { pname = "purescript"; - version = "0.10.1"; - sha256 = "954e333a0f7c860941384289de241b683cbdd606c5c71ab300fe7ac7b3573df0"; + version = "0.10.2"; + sha256 = "45e60466575afed67fbc5244c4e0d3c7184c5aa009ebe7b81aa92a673d212e14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-better-errors ansi-terminal base base-compat bower-json boxes bytestring clock containers data-ordlist directory dlist edit-distance filepath fsnotify Glob haskeline http-client - http-types language-javascript lifted-base monad-control + http-types language-javascript lens lifted-base monad-control monad-logger mtl parallel parsec pattern-arrows pipes pipes-http process protolude regex-tdfa safe semigroups sourcemap spdx split stm syb text time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat boxes - bytestring containers directory file-embed filepath Glob haskeline - http-types monad-logger mtl network optparse-applicative parsec - process protolude split stm text time transformers - transformers-compat utf8-string wai wai-websockets warp websockets + aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat + boxes bytestring containers directory file-embed filepath foldl + Glob haskeline http-types monad-logger mtl network + optparse-applicative parsec process protolude split stm + system-filepath text time transformers transformers-compat turtle + utf8-string wai wai-websockets warp websockets ]; testHaskellDepends = [ aeson aeson-better-errors base base-compat boxes bytestring @@ -141825,6 +142341,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_0_3" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.0.3"; + sha256 = "366a0d4224d4f80da4e6bcd80ed0027a2895e0b4504e11448cad9e03c1a9f82d"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + homepage = "https://github.com/nikita-volkov/rebase"; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "recaptcha" = callPackage ({ mkDerivation, base, HTTP, network, network-uri, xhtml }: mkDerivation { @@ -142812,10 +143351,8 @@ self: { }: mkDerivation { pname = "regex-do"; - version = "1.1"; - sha256 = "655a035f10fdb6a9db733d28a63b4f8a943224c14c3811779539112796689edc"; - revision = "1"; - editedCabalFile = "407ea11d3fe9a9307983b11124fab217db7d02bf36498b4953b1cf8e25323f77"; + version = "2.2"; + sha256 = "3da54464f6cac1c8410b04ddeb6152908377adc9b9f94fc2190c69988e5d1f7b"; libraryHaskellDepends = [ array base bytestring regex-base regex-pcre stringsearch text ]; @@ -142824,7 +143361,7 @@ self: { stringsearch text ]; homepage = "https://github.com/ciez/regex-do"; - description = "PCRE regex wrapper functions"; + description = "PCRE wrapper"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -144350,6 +144887,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "req" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, connection, data-default-class, hspec + , hspec-core, http-api-data, http-client, http-client-tls + , http-types, mtl, QuickCheck, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "req"; + version = "0.1.0"; + sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive connection + data-default-class http-api-data http-client http-client-tls + http-types mtl text time transformers + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class hspec hspec-core http-client http-types mtl + QuickCheck text time unordered-containers + ]; + homepage = "https://github.com/mrkkrp/req"; + description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reqcatcher" = callPackage ({ mkDerivation, base, http-client, http-types, HUnit, lens , network, tasty, tasty-hunit, text, wai, warp, wreq @@ -144582,6 +145145,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_1_8_1" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.8.1"; + sha256 = "833a3104a554bda7c434c38a8a63992e8b456f057fa8ec6d039e6abe28715527"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -146426,8 +147009,8 @@ self: { }: mkDerivation { pname = "rss"; - version = "3000.2.0.5"; - sha256 = "6155b9c686b026f0cb7be13f99d2555db06c8c57cf2563d798cb30553137b979"; + version = "3000.2.0.6"; + sha256 = "8de46fea948323030528367dfa2e5a81640d656a1c00d674377c809462fd990d"; libraryHaskellDepends = [ base HaXml network network-uri old-locale time ]; @@ -146693,10 +147276,10 @@ self: { ({ mkDerivation, array, base, mtl, parsec, safe, strict, Vec }: mkDerivation { pname = "ruff"; - version = "0.4"; - sha256 = "d4effe4cfe26b2ebfb486e7d68f1027aaa3b11d04277d18eb64d2e566e18f225"; + version = "0.4.0.1"; + sha256 = "e557e74593e1ab0fc35447f4f8d5cddc2af7c151655cc2c5ae1672fcddcda3c5"; libraryHaskellDepends = [ array base mtl parsec safe strict Vec ]; - homepage = "https://gitorious.org/ruff"; + homepage = "http://code.mathr.co.uk/ruff"; description = "relatively useful fractal functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -146894,6 +147477,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe_0_3_10" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "safe"; + version = "0.3.10"; + sha256 = "da724ad9cf4b424c4881a50439c3b13777f477e3301c068ce7d54e9031e14b9a"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/ndmitchell/safe#readme"; + description = "Library of safe (exception free) functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-access" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -149435,8 +150031,8 @@ self: { }: mkDerivation { pname = "semdoc"; - version = "0.1.1"; - sha256 = "05a2a838a25125bf8d8cf9f696f3745486e5d1d2c8a778b16c54a746b970882a"; + version = "0.1.2"; + sha256 = "b9a2c73fa5bd0346ae9b21e5ee158460689bf521f97996418b0d426c334b3dc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150710,18 +151306,20 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, data-default, elm-export, hspec, lens - , servant, servant-foreign, text + ({ mkDerivation, aeson, base, data-default, directory, elm-export + , formatting, hspec, interpolate, lens, mockery, process, servant + , servant-foreign, text }: mkDerivation { pname = "servant-elm"; - version = "0.1.0.2"; - sha256 = "ee5de357b7c835eb68115de8cfcacb81dd83944916afec87c52ff92606c8dbda"; + version = "0.2.0.0"; + sha256 = "0a120bc909b14390ef43db690f050b6afd1b9ac72a25586c5734e007c2ea4fda"; libraryHaskellDepends = [ - base elm-export lens servant servant-foreign text + base elm-export formatting lens servant servant-foreign text ]; testHaskellDepends = [ - aeson base data-default elm-export hspec servant + aeson base data-default directory elm-export formatting hspec + interpolate mockery process servant text ]; homepage = "http://github.com/mattjbray/servant-elm#readme"; description = "Automatically derive Elm functions to query servant webservices"; @@ -152983,8 +153581,8 @@ self: { }: mkDerivation { pname = "sibe"; - version = "0.2.0.1"; - sha256 = "964a03b7ba59444dcd0a776da94164840e402d6ca737ca2619a678080571046c"; + version = "0.2.0.3"; + sha256 = "324abe72b361aaef1286bbe8e76dda18e431010db60aa1ea018f95e045fe91ea"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152996,7 +153594,6 @@ self: { base Chart Chart-cairo containers data-default-class directory hmatrix JuicyPixels random random-shuffle split vector ]; - testHaskellDepends = [ base hmatrix ]; homepage = "https://github.com/mdibaiee/sibe"; description = "Machine Learning algorithms"; license = stdenv.lib.licenses.gpl3; @@ -153363,17 +153960,18 @@ self: { }) {}; "simple-effects" = callPackage - ({ mkDerivation, base, interlude-l, lens, list-t, monad-control - , mtl, transformers, transformers-base + ({ mkDerivation, base, ghc-prim, interlude-l, lens, list-t + , monad-control, mtl, transformers, transformers-base }: mkDerivation { pname = "simple-effects"; - version = "0.3.0.1"; - sha256 = "16796c57b5acea501c3b03c1306813a2488c1021ba5db51d168c2bc0c2f32c7b"; + version = "0.6.0.0"; + sha256 = "f448eb1750229b71894a9f482981de64439093ddd72abe5a8672fbaaae135189"; libraryHaskellDepends = [ - base interlude-l lens list-t monad-control mtl transformers - transformers-base + base ghc-prim interlude-l lens list-t monad-control mtl + transformers transformers-base ]; + testHaskellDepends = [ base interlude-l ]; homepage = "https://gitlab.com/LukaHorvat/simple-effects"; description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; @@ -155495,6 +156093,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snap-server_1_0_1_1" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, bytestring-builder, case-insensitive, clock + , containers, deepseq, directory, filepath, HsOpenSSL, http-common + , http-streams, HUnit, io-streams, io-streams-haproxy, lifted-base + , monad-control, mtl, network, old-locale, openssl-streams + , parallel, QuickCheck, random, snap-core, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, threads + , time, transformers, unix, unix-compat, vector + }: + mkDerivation { + pname = "snap-server"; + version = "1.0.1.1"; + sha256 = "878d83a815b9cc8f3d282ef6fafc441528b5f7819147f17f0c1b1f9904146c70"; + configureFlags = [ "-fopenssl" ]; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers filepath HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time unix unix-compat vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + bytestring-builder case-insensitive clock containers deepseq + directory filepath HsOpenSSL http-common http-streams HUnit + io-streams io-streams-haproxy lifted-base monad-control mtl network + old-locale openssl-streams parallel QuickCheck random snap-core + test-framework test-framework-hunit test-framework-quickcheck2 text + threads time transformers unix unix-compat vector + ]; + homepage = "http://snapframework.com/"; + description = "A web server for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-templates" = callPackage ({ mkDerivation, base, bytestring, containers, directory , directory-tree, filepath, hashable, old-time, template-haskell @@ -156225,15 +156859,15 @@ self: { "snaplet-sqlite-simple" = callPackage ({ mkDerivation, aeson, base, bytestring, clientsession , configurator, containers, direct-sqlite, directory, errors - , exceptions, HUnit, lens, lifted-base, monad-control, mtl, snap - , snap-core, sqlite-simple, stm, test-framework - , test-framework-hunit, text, time, transformers, transformers-base - , unordered-containers + , exceptions, HUnit, lens, lifted-base, monad-control, mtl + , SafeSemaphore, snap, snap-core, sqlite-simple, stm + , test-framework, test-framework-hunit, text, time, transformers + , transformers-base, unordered-containers }: mkDerivation { pname = "snaplet-sqlite-simple"; - version = "1.0.0.0"; - sha256 = "d787e7cadbabb380ac4a889d9d21ca1e94ead91ef0864788471d1a62f7189f38"; + version = "1.0.0.2"; + sha256 = "2d12f405b1a796d587a43646aa136c4a0e9e5761212cbdb84014e226bed360d7"; libraryHaskellDepends = [ aeson base bytestring clientsession configurator direct-sqlite lens lifted-base monad-control mtl snap sqlite-simple text transformers @@ -156241,9 +156875,9 @@ self: { ]; testHaskellDepends = [ aeson base bytestring clientsession configurator containers - directory errors exceptions HUnit lens mtl snap snap-core - sqlite-simple stm test-framework test-framework-hunit text time - transformers unordered-containers + directory errors exceptions HUnit lens mtl SafeSemaphore snap + snap-core sqlite-simple stm test-framework test-framework-hunit + text time transformers unordered-containers ]; homepage = "https://github.com/nurpax/snaplet-sqlite-simple"; description = "sqlite-simple snaplet for the Snap Framework"; @@ -156898,6 +157532,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "solga_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hashable + , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck + , resourcet, safe-exceptions, scientific, text + , unordered-containers, vector, wai, wai-extra + }: + mkDerivation { + pname = "solga"; + version = "0.1.0.2"; + sha256 = "fdb4825ebac855d411c6841e015fe7dd1ac0a56a3bcc78aef7a91a1d8444b06a"; + libraryHaskellDepends = [ + aeson base bytestring containers http-types resourcet + safe-exceptions text wai wai-extra + ]; + testHaskellDepends = [ + aeson base bytestring hashable hspec hspec-wai hspec-wai-json + http-types QuickCheck scientific text unordered-containers vector + wai wai-extra + ]; + homepage = "https://github.com/chpatrick/solga"; + description = "Simple typesafe web routing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "solga-swagger" = callPackage ({ mkDerivation, base, bytestring, dlist, http-types , insert-ordered-containers, lens, mtl, solga, swagger2, text @@ -156917,6 +157576,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "solga-swagger_0_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, dlist, http-types + , insert-ordered-containers, lens, mtl, solga, swagger2, text + , unordered-containers + }: + mkDerivation { + pname = "solga-swagger"; + version = "0.1.0.2"; + sha256 = "dcb77313090c82ce9f35843ecec2ce59741fffa5f7a337d77b5d545a8e2136d4"; + libraryHaskellDepends = [ + base bytestring dlist http-types insert-ordered-containers lens mtl + solga swagger2 text unordered-containers + ]; + homepage = "https://github.com/chpatrick/solga"; + description = "Swagger generation for Solga"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "solr" = callPackage ({ mkDerivation, base, base-prelude, bytestring , bytestring-tree-builder, case-insensitive, contravariant @@ -159552,8 +160230,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.1.1.0"; - sha256 = "1c44ee900e27ef1988a4875c39b2ceb32d116ad45dc1c95a8adecfa39e0e3857"; + version = "0.1.2.0"; + sha256 = "43db7f70ca360b0d858572afaf012ba10cda7f0ea19511c4e036bdfbb832e917"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164010,19 +164688,18 @@ self: { }) {}; "takusen-oracle" = callPackage - ({ mkDerivation, base, clntsh, mtl, old-time, sqlplus, time }: + ({ mkDerivation, base, clntsh, mtl, old-time, time }: mkDerivation { pname = "takusen-oracle"; - version = "0.9.3"; - sha256 = "4d290f84c6f35cc447df478c6afddb38633ed2442c58f4b1e1a3254036fba7b4"; + version = "0.9.4.1"; + sha256 = "492159551e80b58cff2318546f3649dd1c2b08eb4ff4f94d855d713df4ec868b"; libraryHaskellDepends = [ base mtl old-time time ]; librarySystemDepends = [ clntsh ]; - libraryToolDepends = [ sqlplus ]; homepage = "https://github.com/paulrzcz/takusen-oracle.git"; description = "Database library with left-fold interface for Oracle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {clntsh = null; sqlplus = null;}; + }) {clntsh = null;}; "tal" = callPackage ({ mkDerivation, base, containers, mtl, pretty, transformers @@ -164852,29 +165529,53 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; - "tcp-streams_0_5_0_0" = callPackage + "tcp-streams_0_6_0_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, directory - , HsOpenSSL, HsOpenSSL-x509-system, HUnit, io-streams, network - , openssl, pem, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, tls, x509, x509-store, x509-system + , HUnit, io-streams, network, pem, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, tls, x509 + , x509-store, x509-system }: mkDerivation { pname = "tcp-streams"; - version = "0.5.0.0"; - sha256 = "a963c6ad88b4feb4012c39bb6ebe1237b3e6263a3b1b0b14fb3b10f729df3be0"; + version = "0.6.0.0"; + sha256 = "cfd94893d4b4c177e600186ae8e369bd728c26ed7e626653b29ace274c4e0fbc"; libraryHaskellDepends = [ - base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system - io-streams network pem tls x509 x509-store x509-system + base bytestring data-default-class io-streams network pem tls x509 + x509-store x509-system ]; - librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring directory HUnit io-streams network QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + homepage = "https://github.com/winterland1989/tcp-streams"; description = "One stop solution for tcp client and server with tls support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openssl;}; + }) {}; + + "tcp-streams-openssl" = callPackage + ({ mkDerivation, base, bytestring, directory, HsOpenSSL + , HsOpenSSL-x509-system, HUnit, io-streams, network, QuickCheck + , tcp-streams, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "tcp-streams-openssl"; + version = "0.6.0.0"; + sha256 = "4c4c18ed031fe372507ef2361a79ffbfea9c2cda134eecf017aa48ac00bf8d94"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network + tcp-streams + ]; + testHaskellDepends = [ + base bytestring directory HUnit io-streams network QuickCheck + tcp-streams test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/winterland1989/tcp-streams"; + description = "Tcp streams using openssl for tls support"; + license = stdenv.lib.licenses.bsd3; + }) {}; "tdd-util" = callPackage ({ mkDerivation, base, bytestring, HUnit, lens @@ -166670,7 +167371,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-show_3_4_1" = callPackage + "text-show_3_4_1_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec @@ -166680,8 +167381,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.4.1"; - sha256 = "1a1ac1c88004b3c060d09d011f645e6fbcf59147b109ee4192cbe7724732558b"; + version = "3.4.1.1"; + sha256 = "f0ba04cb7389decad861b668764f7d7e58a6371269f2ac5809f842d2844f9921"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -166831,8 +167532,8 @@ self: { }: mkDerivation { pname = "text1"; - version = "0.0.3"; - sha256 = "4ca7215f67aa347fbc26b266c1b8455d0e4eae8533523acc8a8ef7b221827d50"; + version = "0.0.4"; + sha256 = "17b1175bae397eb48ddeb750820d44d2ac819f79efc5f4d023a1bb00c9737bec"; libraryHaskellDepends = [ base binary lens semigroups text ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -167282,6 +167983,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_3" = callPackage + ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift + , th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.3"; + sha256 = "7380d5b66d0c754e383e7b16e982b5d9ddf5f45f5a33118a20023ec8af78c46d"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ base hspec template-haskell ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-printf" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit , QuickCheck, template-haskell, text, transformers @@ -167342,6 +168060,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "th-to-exp" = callPackage + ({ mkDerivation, base, hspec, template-haskell }: + mkDerivation { + pname = "th-to-exp"; + version = "0.0.1.0"; + sha256 = "30283dcba984a48a048f77a5405be78df338050ad97da9df21fcfe49e519bf56"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec template-haskell ]; + homepage = "https://github.com/lexi-lambda/th-to-exp#readme"; + description = "Provides a way to persist data from compile-time to runtime"; + license = stdenv.lib.licenses.isc; + }) {}; + "th-traced" = callPackage ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { @@ -167916,8 +168647,8 @@ self: { }: mkDerivation { pname = "tianbar"; - version = "1.2.0.0"; - sha256 = "f822b063d0c213ee931b75d13ec39a23f135fa08172bd6aeac3222db5cec9456"; + version = "1.2.1.0"; + sha256 = "0ac03b869479eb576caa20bcfd76e2cf61a2cf9fbec61bc2cccbd4f4507e6c61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168463,6 +169194,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "time-warp" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , data-default, data-msgpack, exceptions, formatting, hslogger + , hspec, lens, lifted-base, monad-control, monad-loops, MonadRandom + , mtl, network-msgpack-rpc, pqueue, QuickCheck + , quickcheck-instances, random, safe, serokell-util, stm + , template-haskell, text, text-format, time, time-units + , transformers, transformers-base + }: + mkDerivation { + pname = "time-warp"; + version = "0.1.1.1"; + sha256 = "52bdeb1608ee7a5688ffec46fda64437a8bbb8d9648ce4f0a523a15405c9ea18"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring containers data-default data-msgpack + exceptions formatting hslogger lens lifted-base monad-control + monad-loops MonadRandom mtl network-msgpack-rpc pqueue QuickCheck + quickcheck-instances random safe serokell-util stm template-haskell + text text-format time time-units transformers transformers-base + ]; + executableHaskellDepends = [ + async base data-default data-msgpack exceptions formatting hspec + lens MonadRandom mtl network-msgpack-rpc QuickCheck random + serokell-util stm text text-format time-units transformers + ]; + testHaskellDepends = [ + async base data-default data-msgpack exceptions hspec lens mtl + network-msgpack-rpc QuickCheck random serokell-util stm text + text-format time-units transformers + ]; + homepage = "https://github.com/serokell/time-warp"; + description = "Distributed systems execution emulation"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "timecalc" = callPackage ({ mkDerivation, base, haskeline, uu-parsinglib }: mkDerivation { @@ -170004,6 +170772,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient_0_4_4_1" = callPackage + ({ mkDerivation, base, containers, directory, mtl, random, stm + , time, transformers + }: + mkDerivation { + pname = "transient"; + version = "0.4.4.1"; + sha256 = "f1ad34b6c3d4044d294abf4b37f35efb764b710851eab6e58e1b9abb8a68d0ed"; + libraryHaskellDepends = [ + base containers directory mtl random stm time transformers + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "Making composable programs with multithreading, events and distributed computing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transient-universe" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network @@ -173286,6 +174071,8 @@ self: { pname = "unicode-transforms"; version = "0.2.0"; sha256 = "3b27ca1ae8f0a906fbbefe1de819a80a01933610a4657ef6383db2590fdecb0e"; + revision = "1"; + editedCabalFile = "33480d6bb76758c9016397d10769d6ebf2db4004391961ad6dff05610a67d380"; libraryHaskellDepends = [ base bitarray bytestring text ]; testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text @@ -178613,6 +179400,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_9" = callPackage + ({ mkDerivation, array, async, auto-update, base, blaze-builder + , bytestring, bytestring-builder, case-insensitive, containers + , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.9"; + sha256 = "e2789a51b302dde7ab4145b5a0be745e1bdaae108761f9664718fbccbd55ebca"; + libraryHaskellDepends = [ + array async auto-update base blaze-builder bytestring + bytestring-builder case-insensitive containers ghc-prim hashable + http-date http-types http2 iproute network simple-sendfile stm + streaming-commons text unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base blaze-builder bytestring + bytestring-builder case-insensitive containers directory doctest + ghc-prim hashable hspec HTTP http-date http-types http2 HUnit + iproute lifted-base network process QuickCheck silently + simple-sendfile stm streaming-commons text time transformers unix + unix-compat vault wai word8 + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -184422,6 +185241,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_4_26" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , data-default, deepseq, deepseq-generics, directory, exceptions + , fast-logger, hspec, hspec-expectations, http-types, HUnit + , lifted-base, monad-control, monad-logger, mtl, mwc-random + , network, old-locale, parsec, path-pieces, primitive, QuickCheck + , random, resourcet, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.26"; + sha256 = "2441476cd66d5e615ce33d7d378f121e6f05875fa92a0e8afd3ab47c3d50dd6d"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq + deepseq-generics directory exceptions fast-logger http-types + lifted-base monad-control monad-logger mtl mwc-random old-locale + parsec path-pieces primitive random resourcet safe semigroups + shakespeare template-haskell text time transformers + transformers-base unix-compat unordered-containers vector wai + wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core From 6a53da63b3650f154b5afe391b71cb7118f53c42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Nov 2016 13:51:48 +0100 Subject: [PATCH 193/295] haskell-http-client: update reference in configuration-common.nix --- 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 e618059a7d4..20aa50282c2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -974,7 +974,7 @@ self: super: { # https://github.com/commercialhaskell/stack/issues/2263 stack = super.stack.overrideScope (self: super: { - http-client = self.http-client_0_5_3_4; + http-client = self.http-client_0_5_4; http-client-tls = self.http-client-tls_0_3_3; http-conduit = self.http-conduit_2_2_3; optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; From cb07aea0bd980a11d599bcbf35f094e8db911119 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Nov 2016 20:45:52 +0100 Subject: [PATCH 194/295] haskell-STMonadTrans: disable failing test suite to fix the build Closes https://github.com/NixOS/nixpkgs/issues/20309. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20aa50282c2..e4ceff8e781 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1074,4 +1074,7 @@ self: super: { # https://github.com/mulby/diff-parse/issues/9 diff-parse = doJailbreak super.diff-parse; + # https://github.com/josefs/STMonadTrans/issues/4 + STMonadTrans = dontCheck super.STMonadTrans; + } From a2a0fa6657d813528f61f4ea109428ff792d83ca Mon Sep 17 00:00:00 2001 From: Martijn Vermaat Date: Thu, 10 Nov 2016 14:00:40 -0400 Subject: [PATCH 195/295] python27Packages.consul: Disable tests to unbreak --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63b948d798d..43266c0b1b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4091,12 +4091,14 @@ in { buildInputs = with self; [ requests2 six pytest ]; + # No tests distributed. https://github.com/cablehead/python-consul/issues/133 + doCheck = false; + meta = { description = "Python client for Consul (http://www.consul.io/)"; homepage = https://github.com/cablehead/python-consul; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; - broken = true; }; }); From 663007d607657e569cb681cc77c54b5787454bb7 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 10 Nov 2016 23:31:16 +0100 Subject: [PATCH 196/295] chromium: 54.0.2840.90 -> 54.0.2840.100 fixes CVE-2016-5199 CVE-2016-5200 CVE-2016-5201 CVE-2016-5202 --- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5fa9bb86c51..1c71e7419a1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,9 +1,9 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "11a98nknz7lh5jmjslznccg11nr0wla4c9l40fvxqxjm2gs6qags"; - sha256bin64 = "0qdydj0i9ll72f5m9r48gc3dyc22q6qas5nq8h0mbnrxrwd9dnyj"; - version = "55.0.2883.35"; + sha256 = "1dw5difl42jch8pppk9z7ivvw0ah7azjx81allfm85ys075h0ppm"; + sha256bin64 = "1vd3ia7s7k8dkcc9sg1wmbi6x54wf7jmiavixnqb5swglczxfmxz"; + version = "55.0.2883.44"; }; dev = { sha256 = "1pfgb5dnygyxiwfq6ini5s159c178zz7235npaag7k8gcc10ybnz"; @@ -11,8 +11,8 @@ version = "56.0.2906.0"; }; stable = { - sha256 = "01h1qkdw5dpwz61dybpf4bhag198j082lzwpkdx2nj55k2j3lawl"; - sha256bin64 = "18mxgzi79qhi07wgyyx6bb0lqm9pzkw85ypg6vmqv8gh0abn7dn1"; - version = "54.0.2840.90"; + sha256 = "1pw91kqqvm9nkz9i6wmm83wnqzl34q8rxw1sjcpfr4qcg15gbrz2"; + sha256bin64 = "05w9yadn7kwn0aiqd2mrg67lpk413zp6xkgwxnwni7z13j3zrw49"; + version = "54.0.2840.100"; }; } From cb93b34999d36b7f6ecd4c94f84b7c3776bba505 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 7 Nov 2016 15:43:34 +0800 Subject: [PATCH 197/295] SMB2 support for CIFS [tuomas: removed unneeded kernel version check] Signed-off-by: Tuomas Tynkkynen --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4d5fac82d93..1fe6278d0a7 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -258,6 +258,7 @@ with stdenv.lib; CIFS_XATTR y CIFS_POSIX y CIFS_FSCACHE y + CIFS_SMB2 y ${optionalString (versionAtLeast version "3.12") '' CEPH_FSCACHE y ''} From 74ecbbe4e3243988267987e80906bd19c1f5eb96 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 10 Nov 2016 01:14:35 +0200 Subject: [PATCH 198/295] kernel config: Ensure SECCOMP_FILTER is enabled As noted in a97db109a206, SECCOMP_FILTER must be enabled or systemd gets very unhappy. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1fe6278d0a7..e650b7abc1c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -342,6 +342,7 @@ with stdenv.lib; CGROUPS y # used by systemd FHANDLE y # used by systemd SECCOMP y # used by systemd >= 231 + SECCOMP_FILTER y # ditto POSIX_MQUEUE y FRONTSWAP y FUSION y # Fusion MPT device support From 9028442fcbd03794af8bf5b3e606280aa91fa0c9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:05:27 -0500 Subject: [PATCH 199/295] ammonite-repl: 0.7.9 -> 0.8.0 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index c2cf9506c78..f9d3b3bfb20 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ammonite-repl-${version}"; - version = "0.7.9"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${version}"; - sha256 = "1jfb5rmab45j0bizfmjhygsjzijv3zcrygws3cr5awjd6js6jg27"; + sha256 = "1427p90nyizds8799nih527vixnw8qrwdih60bnd1aywz703yr7v"; }; propagatedBuildInputs = [ jre ] ; From 0b91aa42d2d9cb02d368f41ff48a908b82a496f6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:05:55 -0500 Subject: [PATCH 200/295] atom: 1.12.0 -> 1.12.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 ae571debe76..03483db3adf 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.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0grl5lw05gjw9381pr8asgqp9f912li28v0bvl8j6i0ynfy67jmk"; + sha256 = "0v7qlqkpq5zymn0ww35ywkh0vzm2mfpah18nqrc0rx0kvxr0xzqj"; name = "${name}.deb"; }; From ecd1a53df649709e4a528c8539d9f0f925fe83ae Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:06:20 -0500 Subject: [PATCH 201/295] rkt: 1.18.0 -> 1.19.0 --- pkgs/applications/virtualization/rkt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index e22e8468e9f..a1c6927043e 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0vvkwdpl9y0g5m00m1h7q8f95hj5qxigpxrb5zwfqrcv3clzn5a6"; + sha256 = "0s3x27m16jl7nw63zg8g522km1zkwwgafrs8l8sc7pfryhnpmvag"; }; stage1BaseImage = fetchurl { From cc62ecc2d96e2aec3731de547c83bcf3c9e2a87c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:06:54 -0500 Subject: [PATCH 202/295] linux: 3.12.66 -> 3.12.67 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 48f12307bd1..afdc8b82fbd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.66"; + version = "3.12.67"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "02nac7sr0c1h10mxp5azlsmz0gsr7qllsn2hibjknhk7jg8ry8cc"; + sha256 = "18laiqnqfabrqc6dw2pkimcg30hs865kgaflflav6zz9lb3ls1d5"; }; kernelPatches = args.kernelPatches; From 579f5fd9dd644092dff29638e7d456af7607562d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:07:24 -0500 Subject: [PATCH 203/295] linux: 4.4.30 -> 4.4.31 --- 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 2930ebdfc7b..e2d184c2c67 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.30"; + version = "4.4.31"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0p4r779fyhjp9fxc00qqfanjxm1xlajabd2b8d7y1p8jplrr294x"; + sha256 = "03fzi08xs9xp7r7bla6n3ykr81a365n8c5br1x7vwpgpacm63rk6"; }; kernelPatches = args.kernelPatches; From 0a1f39eb9125e09eba863fc4cebe6f1d105933ad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:07:56 -0500 Subject: [PATCH 204/295] linux: 4.8.6 -> 4.8.7 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index b3a5e97e5d5..a1f5230ac00 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.6"; + version = "4.8.7"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0szk5m4wj6w0avpri9168acid8apbsjv78wz0k4cymh88804wx3l"; + sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; }; kernelPatches = args.kernelPatches; From ad19b9bde532841c727618eeb3d3457fd7b98c6d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:08:28 -0500 Subject: [PATCH 205/295] linux: 4.9-rc3 -> 4.9-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 39bfbe76e6c..bb79494e171 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc3"; - modDirVersion = "4.9.0-rc3"; + version = "4.9-rc4"; + modDirVersion = "4.9.0-rc4"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "16dvjxh1i0s18mzm2bcj1v1drv7n2id39jgy71n7i5pyvzc5ffhj"; + sha256 = "09w3milw95916g1mc19phw6w51kma7f1i3dfjar2ijnrcri3hvmx"; }; features.iwlwifi = true; From 7fedbe7c981e1ca421873fa59b419384ac4bc1ff Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:40:38 -0500 Subject: [PATCH 206/295] opencv3: Move IPP to use sha256 --- pkgs/development/libraries/opencv/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 0167011ed49..9d5fc0a2e66 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { let ippicvVersion = "20151201"; ippicvPlatform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux" else throw "ICV is not available for this platform (or not yet supported by this package)"; - ippicvHash = if ippicvPlatform == "linux" then "808b791a6eac9ed78d32a7666804320e" + ippicvHash = if ippicvPlatform == "linux" then "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3" else throw "ippicvHash: impossible"; ippicvName = "ippicv_${ippicvPlatform}_${ippicvVersion}.tgz"; ippicvArchive = "3rdparty/ippicv/downloads/linux-${ippicvHash}/${ippicvName}"; ippicv = fetchurl { url = "https://github.com/Itseez/opencv_3rdparty/raw/ippicv/master_${ippicvVersion}/ippicv/${ippicvName}"; - md5 = ippicvHash; + sha256 = ippicvHash; }; in lib.optionalString enableIpp '' From ca9ab3bfe1acb8177e1084008c4d92c0f9494e3d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 03:03:04 +0100 Subject: [PATCH 207/295] ocaml-uuseg: 0.8.0 -> 0.9.0 This commit also refactors the expression. --- pkgs/development/ocaml-modules/uuseg/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 3c7a4ff5c58..92777129ca0 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,18 +1,16 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: +{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: let - inherit (stdenv.lib) getVersion versionAtLeast; - pname = "uuseg"; - version = "0.8.0"; webpage = "http://erratique.ch/software/${pname}"; in -assert versionAtLeast (getVersion ocaml) "4.01"; +buildOcaml rec { -stdenv.mkDerivation { + minimumSupportedOcamlVersion = "4.01"; - name = "ocaml-${pname}-${version}"; + name = pname; + version = "0.9.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; @@ -34,7 +32,7 @@ stdenv.mkDerivation { installPhase = '' opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/${pname} ''; meta = with stdenv.lib; { From 4402a3c599c6da6abd7619614fe58d658d246998 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Fri, 11 Nov 2016 08:27:37 +0000 Subject: [PATCH 208/295] python-plover: 3.0.0 -> 3.1.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a51ea9dca52..b7e904a8312 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14839,7 +14839,7 @@ in { plover = buildPythonPackage rec { name = "plover-${version}"; - version = "3.0.0"; + version = "3.1.0"; disabled = !isPy27; meta = { @@ -14850,7 +14850,7 @@ in { src = pkgs.fetchurl { url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1jja37nhiypdx1z6cazp8ffsf0z3yqmpdbprpdzf668lcb422rl0"; + sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; }; # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 From babbe0e14dfcfde06a57aa8f1e951fedcc0e9612 Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Fri, 11 Nov 2016 10:03:18 +0100 Subject: [PATCH 209/295] vim: 8.0.0005 -> 8.0.0075 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index c91df72f18c..39975c3dc69 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.0.0005"; + version = "8.0.0075"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; + sha256 = "1imhvrd90f797jlbzvx8sc08h53s55ns6jxy1kl5kh8lz1qq455w"; }; enableParallelBuilding = true; From 53c3cf3fb9038fe564d6544b73a5719e009d46b1 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 11 Nov 2016 08:04:59 -0200 Subject: [PATCH 210/295] lxqt: it is capable of setting a background --- nixos/modules/services/x11/desktop-managers/lxqt.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index d13b7352c95..c385e74dbb2 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -25,6 +25,7 @@ in services.xserver.desktopManager.session = singleton { name = "lxqt"; + bgSupport = true; start = '' exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt ''; From e15fdbe9fca506d62fd6a725fbf11f38c73b1811 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 11 Nov 2016 11:22:36 +0100 Subject: [PATCH 211/295] hipchat: 4.27.0.1658 -> 4.28.0.1659 --- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e2f99f20e7c..e4cc2700c03 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.27.0.1658"; + version = "4.28.0.1659"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1f0rgy5p9xcxfll6prir49vb7hjlnqx6xjaxlimhca4l30jvdsvn"; + sha256 = "091njvbihn0l7j5ymnl8ynz51pcy9varbvvny880r8szldash90y"; } else throw "HipChat is not supported on ${stdenv.system}"; From 13fbc6ccd12113d2789bb445eb76a7cfd8d276ee Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 11 Nov 2016 11:25:16 +0100 Subject: [PATCH 212/295] numix-icon-theme-circle: 2016-09-27 -> 2016-11-10 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5c7464098ad..33734e15c9c 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, numix-icon-theme }: stdenv.mkDerivation rec { - version = "2016-09-27"; + version = "2016-11-10"; package-name = "numix-icon-theme-circle"; - + name = "${package-name}-${version}"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "481bc1100f01e25e92deb7facf61436b27f9ca8a"; - sha256 = "0fkr7w6z6sz5yblgshr3qr2bszia6dsjszv3gmcbi2xqvjjd8wij"; + rev = "ba72743b0ee78cf56585bb498eb59e83d0de17a2"; + sha256 = "0zyvcpa8d8jc7r08chhv0chp7z29w6ir9hkgm9aq23aa80i6pdgv"; }; buildInputs = [ numix-icon-theme ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -dm 755 $out/share/icons cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ ''; - + meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; homepage = https://numixproject.org; From 857405442715e9f93d25605a2f283ecd060834ec Mon Sep 17 00:00:00 2001 From: = Date: Fri, 11 Nov 2016 12:21:40 +0100 Subject: [PATCH 213/295] josm: 10966 -> 11223 --- 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 dde6b151c8b..30398747d43 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 = "10966"; + version = "11223"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0ggiilqfr7n4b2qik1ddlx9h0dwzglfk10y1zmzw9ij0gfbxn791"; + sha256 = "0fv1hlp98f178jy7lxnvq2rk6rq1zj62q6dv0vn02fvm00ia53s8"; }; phases = [ "installPhase" ]; From bb2a67d226d2fc8b268655132fee33a720046613 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 11 Nov 2016 07:11:29 -0500 Subject: [PATCH 214/295] openssl_1_1_0: 1.1.0b -> 1.1.0c --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index efb9a9e1d4e..cd4a696b1d9 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -120,8 +120,8 @@ in { }; openssl_1_1_0 = common { - version = "1.1.0b"; - sha256 = "1xznrqvb1dbngv2k2nb6da6fdw00c01sy2i36yjdxr4vpxrf0pd4"; + version = "1.1.0c"; + sha256 = "1xfn5ydl14myd9wgxm4nxy5a42cpp1g12ijf3g9m4mz0l90n8hzw"; }; openssl_1_0_2-steam = common { From 092d7e9705e5dae05be0b59c7df02f1b460ff8ab Mon Sep 17 00:00:00 2001 From: Franz Thoma Date: Wed, 9 Nov 2016 13:47:20 +0100 Subject: [PATCH 215/295] i3-gaps: 4.12 -> 4.13 --- pkgs/applications/window-managers/i3/gaps.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index fa03bc47d9e..3d8067f1882 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -1,26 +1,20 @@ -{ fetchurl, stdenv, i3 }: +{ fetchurl, stdenv, i3, autoreconfHook }: i3.overrideDerivation (super : rec { name = "i3-gaps-${version}"; - version = "4.12"; - releaseDate = "2016-03-06"; + version = "4.13"; + releaseDate = "2016-11-08"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "1i9l993cak85fcw12zgrb5cpspmjixr3yf8naa4zb8589mg4rb8s"; + sha256 = "0w959nx2crn00fckqwb5y78vcr1j9mvq5lh25wyjszx04pjhf378"; }; - postUnpack = '' - echo -n "${version} (${releaseDate}, branch \\\"gaps-next\\\")" > ./i3-${version}/I3_VERSION - echo -n "${version}" > ./i3-${version}/VERSION - ''; + nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ]; - postInstall = '' - wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" - for program in $out/bin/i3-sensible-*; do - sed -i 's/which/command -v/' $program - done + postUnpack = '' + echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION ''; }) // { From 54199414e38081e016e7a525c90bcdbcd392621a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 10 Nov 2016 22:40:09 +0100 Subject: [PATCH 216/295] nsd service: fix typo Closes #20343. --- nixos/modules/services/networking/nsd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 6af1dd73643..ccfd219620c 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -118,8 +118,8 @@ let ''; yesOrNo = b: if b then "yes" else "no"; - maybeString = prefix: x: if x == null then "" else ''${prefix} "${s}"''; - maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString s}''; + maybeString = prefix: x: if x == null then "" else ''${prefix} "${x}"''; + maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString x}''; forEach = pre: l: concatMapStrings (x: pre + x + "\n") l; From cf57b79fb1b4d1c261a1b27eaed75aefe99bd498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Fri, 11 Nov 2016 16:34:11 +0100 Subject: [PATCH 217/295] homebank: 5.1 -> 5.1.1 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 20ab6ce6f60..5ee14c81e94 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,7 +3,7 @@ let download_root = "http://homebank.free.fr/public/"; - name = "homebank-5.1"; + name = "homebank-5.1.1"; lastrelease = download_root + name + ".tar.gz"; oldrelease = download_root + "old/" + name + ".tar.gz"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ lastrelease oldrelease ]; - sha256 = "1v6za6md5sjb1r3f5lc9k03v2q68cbx6g64vcn69666c42za2aq0"; + sha256 = "1gd4b8fsq89w486mfrclw4r1nrgh7lxp4sncbgprbz9id7f6vlww"; }; buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme From 1810f50e0e87721529623ad5b7579d6e53e74769 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 22:03:51 -0500 Subject: [PATCH 218/295] saxonb: Use sha256 --- pkgs/development/libraries/java/saxon/default8.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix index 7f1f0e260c0..7728737977c 100644 --- a/pkgs/development/libraries/java/saxon/default8.nix +++ b/pkgs/development/libraries/java/saxon/default8.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "saxonb-8.8"; src = fetchurl { url = mirror://sourceforge/saxon/saxonb8-8j.zip; - md5 = "35c4c376174cfe340f179d2e44dd84f0"; + sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8"; }; buildInputs = [unzip]; From 7d4ffab20206a7571a1605e3cbf142c5c1c164cd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 22:06:31 -0500 Subject: [PATCH 219/295] saxon: use sha256 --- pkgs/development/libraries/java/saxon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 1677376230b..fcd884f0a41 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./unzip-builder.sh; src = fetchurl { url = mirror://sourceforge/saxon/saxon6_5_3.zip; - md5 = "7b8c7c187473c04d2abdb40d8ddab5c6"; + sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; }; nativeBuildInputs = [ unzip ]; From b43a43d7a1fcb046e4ac39f521712e6afd84c745 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:35:07 -0500 Subject: [PATCH 220/295] pangoxsl: Use sha256 --- pkgs/development/libraries/pangoxsl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index 4a98704559b..38f1496062e 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pangoxsl-1.6.0.3"; src = fetchurl { url = mirror://sourceforge/pangopdf/pangoxsl-1.6.0.3.tar.gz; - md5 = "c98bad47ffa7de2e946a8e35d45e071c"; + sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; }; buildInputs = [ From dc3f9cd566a5ff0a8ac06f8b96d51cca4951c96c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 11 Nov 2016 15:36:47 -0500 Subject: [PATCH 221/295] jdom: use sha256 --- pkgs/development/libraries/java/jdom/builder.sh | 2 +- pkgs/development/libraries/java/jdom/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/jdom/builder.sh b/pkgs/development/libraries/java/jdom/builder.sh index d95feb5eeb4..dbec4b6f3e0 100755 --- a/pkgs/development/libraries/java/jdom/builder.sh +++ b/pkgs/development/libraries/java/jdom/builder.sh @@ -3,4 +3,4 @@ source $stdenv/setup tar zxvf $src mkdir -p $out -mv $name/* $out +mv * $out diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 9f0440f0304..99d213a01da 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz; - md5 = "ce29ecc05d63fdb419737fd00c04c281"; + sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; meta = { From 1b5ab63bd2f67f86d0798cc4d0c5ae84a4c55070 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 12 Aug 2016 14:27:50 +0300 Subject: [PATCH 222/295] go-bindata-assetfs: init at 20160814 --- .../tools/go-bindata-assetfs/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/go-bindata-assetfs/default.nix diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix new file mode 100644 index 00000000000..249fc21cdfe --- /dev/null +++ b/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-bindata-assetfs-${version}"; + version = "20160814-${rev}"; + rev = "e1a2a7e"; + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + + src = fetchFromGitHub { + inherit rev; + owner = "elazarl"; + repo = "go-bindata-assetfs"; + sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk"; + }; + + meta = with stdenv.lib; { + description = "Serve embedded files from jteeuwen/go-bindata"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ avnik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f56..9f6f634235d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11232,6 +11232,8 @@ in go-bindata = callPackage ../development/tools/go-bindata { }; + go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; + gocode = callPackage ../development/tools/gocode { }; kgocode = callPackage ../applications/misc/kgocode { From 9bd197fc975e78a21183f7616ab90d449329ecf7 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 13 Aug 2016 07:58:05 +0300 Subject: [PATCH 223/295] drone: init at 0.5-20160813 --- .../continuous-integration/drone/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/drone/default.nix diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix new file mode 100644 index 00000000000..3569f8215da --- /dev/null +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }: + +buildGoPackage rec { + name = "drone.io-${version}"; + version = "0.5-20160813-${stdenv.lib.strings.substring 0 7 revision}"; + revision = "e82ddd002276deb1741eca5345260ff1c2059abb"; + goPackagePath = "github.com/drone/drone"; + + extraSrcs = [ + { + goPackagePath = "github.com/drone/drone-ui"; + src = fetchFromGitHub { + owner = "drone"; + repo = "drone-ui"; + rev = "43bdae89a59c4d26e24f80f65748b9f78f1df0a9"; + sha256 = "0k0kg07nkk595yk10n1fym3x8wlgn34n3f4mb237gqp8hhlnp5ra"; + }; + } + ]; + nativeBuildInputs = [ go-bindata go-bindata-assetfs ]; + + preBuild = '' + go generate github.com/drone/drone/server/template + go generate github.com/drone/drone/store/datastore/ddl + ''; + + src = fetchFromGitHub { + owner = "drone"; + repo = "drone"; + rev = revision; + sha256 = "11ld8dzjn4g7wbfm4xqr3ih2dqaqqa8rdnw7m7d3sd78w7r7s3gs"; + }; + + meta = with stdenv.lib; { + maintainer = with maintainers; [ avnik ]; + license = licenses.asl20; + description = "Continuous Integration platform built on container technology"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f6f634235d..342b4e50d96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1443,6 +1443,8 @@ in driftnet = callPackage ../tools/networking/driftnet {}; + drone = callPackage ../development/tools/continuous-integration/drone { }; + dropbear = callPackage ../tools/networking/dropbear { }; dtach = callPackage ../tools/misc/dtach { }; From 9743c0e623ec0b62230241a4fa69b3cdc7ccaca1 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 4 Nov 2016 06:48:54 +0200 Subject: [PATCH 224/295] drone: fix build issue on OSX also update all hashes to recent snapshots --- .../continuous-integration/drone/default.nix | 43 ++++++++++++++++--- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 3569f8215da..0d9d19c8b93 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -2,18 +2,47 @@ buildGoPackage rec { name = "drone.io-${version}"; - version = "0.5-20160813-${stdenv.lib.strings.substring 0 7 revision}"; - revision = "e82ddd002276deb1741eca5345260ff1c2059abb"; + version = "0.5-20161104-${stdenv.lib.strings.substring 0 7 revision}"; + revision = "232df356afeeb4aec5e2959fa54b084dcadb267f"; goPackagePath = "github.com/drone/drone"; + # These dependencies pulled (in `drone` buildprocess) via Makefile, + # so I extracted them here, all revisions pinned by same date, as ${version} extraSrcs = [ { goPackagePath = "github.com/drone/drone-ui"; src = fetchFromGitHub { owner = "drone"; repo = "drone-ui"; - rev = "43bdae89a59c4d26e24f80f65748b9f78f1df0a9"; - sha256 = "0k0kg07nkk595yk10n1fym3x8wlgn34n3f4mb237gqp8hhlnp5ra"; + rev = "e66df33b4620917a2e7b59760887cc3eed543664"; + sha256 = "0d50xdzkh9akpf5c0sqgcgy11v2vz858l36jp5snr94zkrdkv0n1"; + }; + } + { + goPackagePath = "github.com/drone/mq"; + src = fetchFromGitHub { + owner = "drone"; + repo = "mq"; + rev = "0f296601feeed952dabd038793864acdbefe6dbe"; + sha256 = "1k7439c90l4w29g7wyixfmpbkap7bn8yh8zynbjyjf9qjzwsnw97"; + }; + } + { + goPackagePath = "github.com/tidwall/redlog"; + src = fetchFromGitHub { + owner = "tidwall"; + repo = "redlog"; + rev = "54086c8553cd23aba652513a87d2b085ea961541"; + sha256 = "12a7mk6r8figjinzkbisxcaly6sasggy62m8zs4cf35lpq2lhffq"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchFromGitHub { + owner = "golang"; + repo = "crypto"; + rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd"; + sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5"; }; } ]; @@ -24,11 +53,15 @@ buildGoPackage rec { go generate github.com/drone/drone/store/datastore/ddl ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/drone + ''; + src = fetchFromGitHub { owner = "drone"; repo = "drone"; rev = revision; - sha256 = "11ld8dzjn4g7wbfm4xqr3ih2dqaqqa8rdnw7m7d3sd78w7r7s3gs"; + sha256 = "0xrijcrlv3ag9n2kywkrhdkxyhxc8fs6zqn0hyav6a6jpqnsahg3"; }; meta = with stdenv.lib; { From c1dca9e40b7f357460f69e08e568b242c6e1bdfa Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 11 Nov 2016 23:11:54 +0100 Subject: [PATCH 225/295] etcd: make all service using etc go to 127.0.0.1:2379 by default The old etcd port 4001 is no longer enabled by default in etcd 3. The new port is 2379 and is officially assigned by IANA. There were still some services left that expect etcd on port 4001 by default. This changes the default to 2379 everywhere. It should not cause problems for users as the etcd by nix does listen on the new port only by default anyway. --- nixos/modules/services/cluster/fleet.nix | 2 +- nixos/modules/services/cluster/kubernetes.nix | 2 +- nixos/modules/services/cluster/panamax.nix | 2 +- nixos/modules/services/networking/skydns.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix index 78d4ea93c49..ec03be39594 100644 --- a/nixos/modules/services/cluster/fleet.nix +++ b/nixos/modules/services/cluster/fleet.nix @@ -28,7 +28,7 @@ in { etcdServers = mkOption { type = types.listOf types.str; - default = [ "http://127.0.0.1:4001" ]; + default = [ "http://127.0.0.1:2379" ]; description = '' Fleet list of etcd endpoints to use. ''; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 4bdd7f95f77..19303e97a70 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -23,7 +23,7 @@ in { etcdServers = mkOption { description = "Kubernetes list of etcd servers to watch."; - default = [ "127.0.0.1:4001" ]; + default = [ "127.0.0.1:2379" ]; type = types.listOf types.str; }; diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix index b47ff744fc2..4475e8d8c24 100644 --- a/nixos/modules/services/cluster/panamax.nix +++ b/nixos/modules/services/cluster/panamax.nix @@ -46,7 +46,7 @@ in { fleetctlEndpoint = mkOption { type = types.str; - default = "http://127.0.0.1:4001"; + default = "http://127.0.0.1:2379"; description = '' Panamax fleetctl endpoint. ''; diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix index ba913482e3c..6ad18bb2240 100644 --- a/nixos/modules/services/networking/skydns.nix +++ b/nixos/modules/services/networking/skydns.nix @@ -11,7 +11,7 @@ in { etcd = { machines = mkOption { - default = [ "http://localhost:4001" ]; + default = [ "http://127.0.0.1:2379" ]; type = types.listOf types.str; description = "Skydns list of etcd endpoints to connect to."; }; From fa180d0d6357efb175c8e0c7543875375f5c8602 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Sat, 12 Nov 2016 12:54:47 +1000 Subject: [PATCH 226/295] grsec: 4.8.6 -> 4.8.7 --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 98f89508fc1..3d4ba5d2b58 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.6"; - grrev = "201611091800"; - sha256 = "09kz4mjsrjixwvr8hf4q1lwk1miqb3mq6i6adzrha7c5s6c940x0"; + { kver = "4.8.7"; + grrev = "201611102210"; + sha256 = "1n7avhvzy4njf9wky38l99i18v1rr05bgspivnp440j8d6nh60nh"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 6be676014444e7f73d48edd00c7a46f62a74c5fb Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sat, 12 Nov 2016 11:04:56 +0300 Subject: [PATCH 227/295] yandex-disk: 0.1.5.948 -> 0.1.5.978 --- pkgs/tools/filesystems/yandex-disk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 1658a428920..77302f3d4a2 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -6,18 +6,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "0k05ybvnv0zx4vfx55jyhia38qqysaj68mapq0gwgf74k3a943g2"; + sha256 = "1skbzmrcjbw00a3jnbl2llqwz3ahsgvq74mjav68s2hw1wjidvk6"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "09z9idmp7idcq0alwkla9kal9h82dx11jqh678lc4rviqggxzxhp"; + sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx"; }; in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.948"; + version = "0.1.5.978"; src = fetchurl { url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; From 5f8aa15e846e14bdf034caaee908c321277aad22 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sat, 12 Nov 2016 11:34:35 +0300 Subject: [PATCH 228/295] yandex-disk service: correct permissions --- nixos/modules/services/network-filesystems/yandex-disk.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 982b6ca5ea7..d9e35e3953f 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -86,7 +86,7 @@ in chown ${u} ${dir} if ! test -d "${cfg.directory}" ; then - mkdir -p -m 755 ${cfg.directory} || + (mkdir -p -m 755 ${cfg.directory} && chown ${u} ${cfg.directory}) || exit 1 fi From ccf8566bdd5784d771ebf46b0a4be514b0204ae5 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sat, 12 Nov 2016 12:36:33 +0300 Subject: [PATCH 229/295] yandex-disk service: add exclude-dirs option --- .../services/network-filesystems/yandex-disk.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index d9e35e3953f..4de20664133 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -55,6 +55,15 @@ in description = "The directory to use for Yandex.Disk storage"; }; + excludes = mkOption { + default = ""; + type = types.string; + example = "data,backup"; + description = '' + Comma-separated list of directories which are excluded from synchronization. + ''; + }; + }; }; @@ -94,7 +103,7 @@ in -c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token' ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \ - -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory}' + -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory} --exclude-dirs=${cfg.excludes}' ''; }; From 52ccc27c1e8c41e6a59dc186eef2adafba1963c7 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Sat, 12 Nov 2016 14:32:04 +0300 Subject: [PATCH 230/295] fix autobuild compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently autobuild failed to build in both master and release-16.03. The error message is mv: cannot stat '/nix/store/a4jzlkrhd4b4nr5760caj3rrjxhyg4z3-autobuild-5.3/bin/abput-sourceforge': No such file or directory builder for ‘/nix/store/l19vywq8zvbarswby5h7vl4iq1c1pvq7-autobuild-5.3.drv’ failed with exit code 1 It happens in post install script postInstall = '' wrapProgram $out/bin/ab{put,build}-sourceforge \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}" ''; The problem is that in autobuild 5.0 the ab{put,build}-sourceforge were removed * Version 5.0 (released 2008-11-25) ... ** abput, abput-sourceforge, abput-testdrive: Remove. ** abbuild, abbuild-sourceforge: Remove. Both the SourceForge and TestDrive systems have been shutdown. The scripts were of questionable value anyway. Possibly the bug was introduced in commit 8c4fcc87f8320004e924f53bbaee29ae3b7b4692: autobuild: 3.5 -> 5.3. As the package doesn't contain these programs there is no need in wrapping them. This commit just remove the postInstall section of corresponding package. --- pkgs/development/tools/misc/autobuild/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index a7d6c42e6af..6919b03d47c 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -12,11 +12,6 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = '' - wrapProgram $out/bin/ab{put,build}-sourceforge \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}" - ''; - meta = { description = "Continuous integration tool"; From 24df641deba37fb6f9bed238f028052178721ac6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Nov 2016 09:39:16 +0100 Subject: [PATCH 231/295] ocamlPackages.conduit: refactor --- pkgs/development/ocaml-modules/conduit/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 26accd99db6..afe44ea0a7f 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,5 +1,7 @@ -{stdenv, buildOcaml, fetchurl, sexplib_p4, stringext, uri, cstruct, ipaddr, - async ? null, async_ssl ? null, lwt ? null}: +{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri, cstruct, ipaddr +, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, async_p4 ? null, async_ssl_p4 ? null, lwt ? null +}: buildOcaml rec { name = "conduit"; @@ -10,10 +12,10 @@ buildOcaml rec { sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; }; - propagatedBuildInputs = ([ sexplib_p4 stringext uri cstruct ipaddr ] - ++ stdenv.lib.optional (lwt != null) lwt - ++ stdenv.lib.optional (async != null) async - ++ stdenv.lib.optional (async_ssl != null) async_ssl); + propagatedBuildInputs = [ sexplib_p4 stringext uri cstruct ipaddr ]; + buildInputs = stdenv.lib.optional (lwt != null) lwt + ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 + ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; meta = with stdenv.lib; { homepage = https://github.com/mirage/ocaml-conduit; From 72c1a6f0f46cf4e35986b49f957f690922ba7a02 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Nov 2016 09:55:42 +0100 Subject: [PATCH 232/295] ocamlPackages.cohttp: refactor --- .../ocaml-modules/cohttp/default.nix | 17 +++++++++-------- pkgs/development/tools/misc/trv/default.nix | 5 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index dcf3c8c13d7..5a22e37d821 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,22 +1,23 @@ -{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib_p4, conduit, - stringext, base64, magic-mime, ounit, alcotest, lwt ? null, - async ? null, async_ssl ? null}: +{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri, fieldslib_p4 +, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest +, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, lwt ? null, async_p4 ? null, async_ssl_p4 ? null +}: buildOcaml rec { name = "cohttp"; version = "0.19.3"; - minimumSupportedOcamlVersion = "4.02"; + minimumSupportedOcamlVersion = "4.01"; src = fetchurl { url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz"; sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv"; }; - buildInputs = [ alcotest ]; - propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib_p4 sexplib_p4 - conduit stringext base64 magic-mime ounit async - async_ssl lwt ]; + buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ] + ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; + propagatedBuildInputs = [ re stringext uri fieldslib_p4 sexplib_p4 base64 ]; buildFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 4b83c12bed7..4b00e92b4c3 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -1,6 +1,7 @@ {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find -, cohttp, uri, tzdata}: +, cohttp, conduit, magic-mime, uri, tzdata +}: assert stdenv.lib.versionOlder "4.02" ocaml.version; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib camlp4 conduit magic-mime ]; propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4 async_extra_p4 sexplib_p4 async_shell core_extended_p4 async_find cohttp uri re2_p4 ]; From 2d136204c47985c9518105e1af9e14810c8319ec Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Nov 2016 10:17:30 +0100 Subject: [PATCH 233/295] ocamlPackages.cstruct: 1.6.0 -> 1.9.0, 2.3.0 --- .../ocaml-modules/cstruct/default.nix | 33 ++++++++++++------- .../ocaml-modules/nocrypto/default.nix | 4 +-- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index c9f04918d17..dd6cffb979c 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,20 +1,31 @@ -{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib, - async_p4 ? null, lwt ? null, camlp4}: +{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib_p4, findlib, ppx_tools +, async_p4 ? null, lwt ? null, camlp4 +}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01"; + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { version = "2.3.0"; sha256 = "19spsgkry41dhsbm6ij71kws90bqp7wiggc6lsqdl43xxvbgdmys"; } + else { version = "1.9.0"; sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; }; +in + +let opt = b: "--${if b != null then "en" else "dis"}able"; in stdenv.mkDerivation { - name = "ocaml-cstruct-1.6.0"; + name = "ocaml${ocaml.version}-cstruct-${param.version}"; - src = fetchurl { - url = https://github.com/mirage/ocaml-cstruct/archive/v1.6.0.tar.gz; - sha256 = "0f90a1b7a03091cf22a3ccb11a0cce03b6500f064ad3766b5ed81418ac008ece"; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-cstruct"; + rev = "v${param.version}"; + inherit (param) sha256; }; - configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ - (if async_p4 != null then ["--enable-async"] else [])); - buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async_p4]; + configureFlags = [ "${opt lwt}-lwt" "${opt async_p4}-async" "${opt ppx_tools}-ppx" ]; + + buildInputs = [ ocaml findlib ppx_tools camlp4 lwt async_p4 ]; + propagatedBuildInputs = [ ocplib-endian sexplib_p4 ]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index f8db935b612..fab048a9a9f 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ounit }: +{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ocaml_lwt, ounit }: assert stdenv.lib.versionAtLeast ocaml.version "4.01"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "15gffvixk12ghsfra9amfszd473c8h188zfj03ngvblbdm0d80m0"; }; - buildInputs = [ ocaml findlib type_conv ounit ]; + buildInputs = [ ocaml findlib type_conv ocaml_lwt ounit ]; propagatedBuildInputs = [ cstruct zarith ]; configureFlags = "--enable-tests"; From f059c7f7541bda789833d5c93cb6ea3c2b346820 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 12 Nov 2016 12:43:10 +0100 Subject: [PATCH 234/295] Revert "cjdns test: exercise host builder logic" This reverts commit daf3ba426b2558e73ef2742fab1a73c782ef62a6. This is an alternative to 0ba3d429a758cec15545fc11c9d3fd1424c5c5f8, which disables the test outright. Briefly, exercising builders which rely on import-from-derivation can cause Hydra jobsets to time out. --- nixos/tests/cjdns.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 1cedf168dcb..f61c82b916a 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -57,7 +57,6 @@ import ./make-test.nix ({ pkgs, ...} : { connectTo."192.168.0.1:1024}" = { password = carolPassword; publicKey = carolPubKey; - hostname = "carol"; }; }; }; From 852b365928bf0e54b5823a0e80aa071e7a57ed43 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 12 Nov 2016 12:47:43 +0100 Subject: [PATCH 235/295] Revert "cjdns: Disable tests" This reverts commit 0ba3d429a758cec15545fc11c9d3fd1424c5c5f8. --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 5687d5b0e6e..639ee45b38d 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -221,7 +221,7 @@ in rec { tests.boot-stage1 = callTest tests/boot-stage1.nix {}; tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable; - #tests.cjdns = callTest tests/cjdns.nix {}; + tests.cjdns = callTest tests/cjdns.nix {}; tests.containers-ipv4 = callTest tests/containers-ipv4.nix {}; tests.containers-ipv6 = callTest tests/containers-ipv6.nix {}; tests.containers-bridge = callTest tests/containers-bridge.nix {}; From 081a871771276e6a93f50977c1ad90d066b2eb56 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 12 Nov 2016 13:56:45 +0100 Subject: [PATCH 236/295] Revert "Merge pull request #20302 from spacekitteh/patch-10" This reverts commit e02173c70cd18dee1972713031c412eee35d73ef, reversing changes made to c2b4a0d2668fda88430e7067245fc63d977ea28c. Breaks all grsec packages; Not having binary substitutes for no good reason is disruptive to my workflow, so I'll just revert this for now. --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3d4ba5d2b58..6bba248374b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.7"; - grrev = "201611102210"; - sha256 = "1n7avhvzy4njf9wky38l99i18v1rr05bgspivnp440j8d6nh60nh"; + { kver = "4.7.10"; + grrev = "201611011946"; + sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 2079c92fa9275dccdd8ae9e69916c4aa1e6ffc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20G=C3=B6tz?= Date: Sat, 12 Nov 2016 15:39:45 +0100 Subject: [PATCH 237/295] qutebrowser: 0.8.2 -> 0.8.4 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index af1256d3442..0d9c1a113f8 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -24,12 +24,12 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.8.2"; + version = "0.8.4"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1kfxjdn1dqla8d8gcggp55zcgf4zb77knkfshd213my0iw2yzgcf"; + sha256 = "0wc6iq7rw89625v595bs4y8spzhid6nnz2gq67f2kbjppk2rikpm"; }; # Needs tox From 38c6a88274572d161368b840a7a4b957bca9efa8 Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 12 Nov 2016 15:33:07 +0000 Subject: [PATCH 238/295] citrix-receiver: 13.3.0 -> 13.4.0 --- .../networking/remote/citrix-receiver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index f8ec7ec01d9..57d04e52845 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -24,17 +24,17 @@ stdenv.mkDerivation rec { name = "citrix-receiver-${version}"; - version = "13.3.0"; + version = "13.4.0"; homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; src = requireFile rec { - name = "${prefixWithBitness}-${version}.344519.tar.gz"; + name = "${prefixWithBitness}-${version}.10109380.tar.gz"; sha256 = if stdenv.is64bit - then "11l0s4f1si43qlxai053ps4nks7v4bahipsmcdpnrdzq0vps17ls" - else "0sbgkb9a3ss2n08lal7qk8pmxyqbvkm7jj7l995ddjaa6jbkr3fz"; + then "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb" + else "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l"; message = '' In order to use Citrix Receiver, you need to comply with the Citrix EULA and download the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: From b83c0783d3f6c624342a3e57b9511f0794ddfc40 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sat, 12 Nov 2016 18:12:10 +0100 Subject: [PATCH 239/295] bluez: 5.40 -> 5.43 --- pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index de318a9474a..b5429812441 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.40"; + name = "bluez-5.43"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "09ywk3lvgis0nbi0d5z8d4qp5r33lzwnd6bdakacmbsm420qpnns"; + sha256 = "05cdnpz0w2lwq2x5ba87q1h2wgb4lfnpbnbh6p7499hx59fw1j8n"; }; pythonPath = with pythonPackages; From f68e16f0235989f11ad7394edf656649c652bef4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 11 Nov 2016 06:34:24 -0800 Subject: [PATCH 240/295] top-level: Make cross compiling slightly saner Removes the weird stdenv cycle used to match the old infrastructure. It turns out that matching it so precisely is not needed. --- pkgs/stdenv/cross/default.nix | 20 +++++++++----------- pkgs/top-level/all-packages.nix | 11 +++++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 93c5a21d9d5..575692ca012 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -8,24 +8,22 @@ rec { }; vanillaStdenv = (import ../. (args // argClobber // { allPackages = args: allPackages (argClobber // args); - })).stdenv; + })).stdenv // { + # Needed elsewhere as a hacky way to pass the target + cross = crossSystem; + }; - # Yeah this isn't so cleanly just build-time packages yet. Notice the - # buildPackages <-> stdenvCross cycle. Yup, it's very weird. - # - # This works because the derivation used to build `stdenvCross` are in - # fact using `forceNativeDrv` to use the `nativeDrv` attribute of the resulting - # derivation built with `vanillaStdenv` (second argument of `makeStdenvCross`). - # - # Eventually, `forceNativeDrv` should be removed and the cycle broken. + # For now, this is just used to build the native stdenv. Eventually, it should + # be used to build compilers and other such tools targeting the cross + # platform. Then, `forceNativeDrv` can be removed. buildPackages = allPackages { # It's OK to change the built-time dependencies allowCustomOverrides = true; - bootStdenv = stdenvCross; + bootStdenv = vanillaStdenv; inherit system platform crossSystem config; }; stdenvCross = buildPackages.makeStdenvCross - vanillaStdenv crossSystem + buildPackages.stdenv crossSystem buildPackages.binutilsCross buildPackages.gccCrossStageFinal; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 342b4e50d96..1cee2532076 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -46,10 +46,13 @@ in callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg); - forceNativeDrv = drv : if crossSystem == null then drv else - (drv // { crossDrv = drv.nativeDrv; }); - - stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal); + forceNativeDrv = drv: + # Even when cross compiling, some packages come from the stdenv's + # bootstrapping package set. Those packages are only built for the native + # platform. + if crossSystem != null && drv ? crossDrv + then drv // { crossDrv = drv.nativeDrv; } + else drv; # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's From 62f9196e35a2eb3eafb92628256450a88c5a530e Mon Sep 17 00:00:00 2001 From: Corbin Date: Sat, 12 Nov 2016 11:52:04 -0800 Subject: [PATCH 241/295] pythonPackages.stripe: init at 1.41.1 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59dfde790ae..23934589ccc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31258,4 +31258,28 @@ in { maintainers = with maintainers; [ mikefaille ]; }; }; + + stripe = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "stripe"; + version = "1.41.1"; + + # Tests require network connectivity and there's no easy way to disable + # them. ~ C. + doCheck = false; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/${pname}/${name}.tar.gz"; + sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5"; + }; + + buildInputs = with self; [ unittest2 mock ]; + propagatedBuildInputs = with self; [ requests ]; + + meta = { + homepage = "https://github.com/stripe/stripe-python"; + description = "Stripe Python bindings"; + license = licenses.mit; + }; + }; } From dcb76cda796a2f0a34da90a855146bb7e7c41eac Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 12 Nov 2016 16:37:20 -0500 Subject: [PATCH 242/295] atom: 1.12.1 -> 1.12.2 --- 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 03483db3adf..96b26e6bee1 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.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0v7qlqkpq5zymn0ww35ywkh0vzm2mfpah18nqrc0rx0kvxr0xzqj"; + sha256 = "03kznbxfxyjq9fqq1jvq3gvvy50dz3wqvn098n9k9gv8x3595mw4"; name = "${name}.deb"; }; From ed9b1c673b0a19fbddc5f8e757e94846ea174ec3 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 13 Nov 2016 11:38:35 +0100 Subject: [PATCH 243/295] google-cloud-sdk: 122.0.0 -> 134.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 27ca19178a0..49c8bf14f05 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -4,18 +4,18 @@ with python27Packages; stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "122.0.0"; + version = "134.0.0"; src = if stdenv.system == "i686-linux" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "0nx348yx1avbb34bpj316fb7jzyzkylscyx8kv183rg4s1q2f798"; + sha256 = "0pv2whqqcjvz3x02rn08vyssvbqxsncqvx9916v2ycdpiymffdz0"; } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "0jhw8yv2kv0fs64rzvddx3szzpn74nqnd3rbd9wx2vi6nmffkrwv"; + sha256 = "1kji861ii4ig73scg64lijcqdg2p0d2i2af1fdbkils0imwa3m5l"; }; buildInputs = [python27 makeWrapper]; From 8600e38bcaadef0d4b13e710d9c41b30abf0a9d7 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 13 Nov 2016 11:56:25 +0100 Subject: [PATCH 244/295] google-cloud-sdk: add assertion for x86/x86-64 Linux --- pkgs/tools/admin/google-cloud-sdk/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 49c8bf14f05..90bfd97ab59 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -2,6 +2,9 @@ with python27Packages; +# other systems not supported yet +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; + stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; version = "134.0.0"; From d6a3aaef89e9d640a3ba27afff06dcb432853730 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sun, 13 Nov 2016 12:07:10 +0000 Subject: [PATCH 245/295] vim-utils: fix typo --- pkgs/misc/vim-plugins/vim-utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index acb5b4fcbe1..5110897e32a 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -30,7 +30,7 @@ vim-with-plugins in PATH: # provide plugin which can be loaded manually: { name = "phpCompletion"; tag = "lazy"; } - # full ducomentation at github.com/MarcWeber/vim-addon-manager + # full documentation at github.com/MarcWeber/vim-addon-manager ]; # there is a pathogen implementation as well, but its startup is slower and [VAM] has more feature From 84c87dce2a7efda5d6823a775ef3746734abadfa Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 24 Sep 2016 09:42:18 -0700 Subject: [PATCH 246/295] vulkan-loader: fix evaluation without source --- pkgs/development/libraries/vulkan-loader/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4c00bb86142..8b986798517 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -11,7 +11,6 @@ let rev = "sdk-${version}"; sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58"; }; - getRev = name: builtins.substring 0 40 (builtins.readFile "${src}/${name}_revision"); in stdenv.mkDerivation rec { @@ -37,6 +36,15 @@ stdenv.mkDerivation rec { "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default ]; + preConfigure = '' + checkRev() { + [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1) + } + checkRev spirv-tools "${spirv-tools.src.rev}" + checkRev spirv-headers "${spirv-tools.headers.rev}" + checkRev glslang "${glslang.src.rev}" + ''; + installPhase = '' mkdir -p $out/lib mkdir -p $out/bin From 8fe96a1926e4eb96b69fe99f187b378d7cac461e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 25 Sep 2016 17:33:09 -0300 Subject: [PATCH 247/295] vulkan-loader: package headers, layers and demos --- .../libraries/vulkan-loader/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 8b986798517..334489cb22d 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default ]; + outputs = [ "out" "dev" "demos" ]; + preConfigure = '' checkRev() { [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1) @@ -46,11 +48,18 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/lib - mkdir -p $out/bin - cp loader/libvulkan.so* $out/lib + mkdir -p $out/lib $out/bin + cp -d loader/libvulkan.so* $out/lib cp demos/vulkaninfo $out/bin - ''; + mkdir -p $out/lib $out/etc/explicit_layer.d + cp -d layers/*.so $out/lib/ + cp -d layers/*.json $out/etc/explicit_layer.d/ + sed -i "s:\\./lib:$out/lib/lib:g" "$out/etc/"**/*.json + mkdir -p $dev/include + cp -rv ../include $dev/ + mkdir -p $demos/bin + cp demos/smoketest demos/tri demos/cube demos/*.spv demos/*.ppm $demos/bin + ''; meta = with stdenv.lib; { description = "LunarG Vulkan loader"; From 1624507eaf379f31cc133dd86fbbe90a5b2c8944 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 26 Sep 2016 19:53:08 -0300 Subject: [PATCH 248/295] vulkan-loader: allow 32-bit builds --- pkgs/development/libraries/vulkan-loader/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 334489cb22d..612ba238113 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, python3Packages, glslang, spirv-tools, x11, libxcb, wayland }: -assert stdenv.system == "x86_64-linux"; - let version = "1.0.26.0"; src = fetchFromGitHub { From e783cc90a092768d631559c9ee389269c1daad5e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sat, 12 Nov 2016 11:29:13 -0400 Subject: [PATCH 249/295] opengl: add driver paths to XDG_DATA_DIRS --- nixos/modules/hardware/opengl.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index bef500e30c0..c4fad9a6672 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -135,6 +135,12 @@ in environment.sessionVariables.LD_LIBRARY_PATH = [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]; + environment.extraInit = '' + export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver/share + '' + optionalString cfg.driSupport32Bit '' + export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver-32/share + ''; + hardware.opengl.package = mkDefault (makePackage pkgs); hardware.opengl.package32 = mkDefault (makePackage pkgs_i686); From 6bf27c2caeb621472151c63fc33c4951ce0188d1 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 11 Oct 2016 13:50:52 -0300 Subject: [PATCH 250/295] vulkan-loader: allow validation layers to be enabled The loader now uses XDK_DATA_DIRS to find drivers and layers. --- nixos/modules/config/system-path.nix | 1 + nixos/modules/hardware/video/amdgpu-pro.nix | 2 - .../libraries/vulkan-loader/default.nix | 8 +- .../vulkan-loader/use-xdg-paths.patch | 142 ++++++++++++++++++ pkgs/os-specific/linux/amdgpu-pro/default.nix | 5 +- 5 files changed, 151 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 775d0c39c4f..3ac5f634c7a 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -118,6 +118,7 @@ in "/share/terminfo" "/share/themes" "/share/vim-plugins" + "/share/vulkan" ]; system.path = pkgs.buildEnv { diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 3723d7690dc..979810abf90 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -45,10 +45,8 @@ in "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb"; "gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf"; "OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd"; - "vulkan/icd.d/amd_icd64.json".source = package + "/etc/vulkan/icd.d/amd_icd64.json"; } // optionalAttrs opengl.driSupport32Bit { "OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd"; - "vulkan/icd.d/amd_icd32.json".source = package32 + "/etc/vulkan/icd.d/amd_icd32.json"; }; }; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 612ba238113..622d027c60b 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default ]; + patches = [ ./use-xdg-paths.patch ]; + outputs = [ "out" "dev" "demos" ]; preConfigure = '' @@ -49,10 +51,10 @@ stdenv.mkDerivation rec { mkdir -p $out/lib $out/bin cp -d loader/libvulkan.so* $out/lib cp demos/vulkaninfo $out/bin - mkdir -p $out/lib $out/etc/explicit_layer.d + mkdir -p $out/lib $out/share/vulkan/explicit_layer.d cp -d layers/*.so $out/lib/ - cp -d layers/*.json $out/etc/explicit_layer.d/ - sed -i "s:\\./lib:$out/lib/lib:g" "$out/etc/"**/*.json + cp -d layers/*.json $out/share/vulkan/explicit_layer.d/ + sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json mkdir -p $dev/include cp -rv ../include $dev/ mkdir -p $demos/bin diff --git a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch new file mode 100644 index 00000000000..1ae0f20889f --- /dev/null +++ b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch @@ -0,0 +1,142 @@ +diff --git a/loader/loader.c b/loader/loader.c +index a950ea1..9462d05 100644 +--- a/loader/loader.c ++++ b/loader/loader.c +@@ -2671,6 +2671,94 @@ static VkResult loader_get_manifest_files( + } + } + ++#if !defined(_WIN32) ++ if (home_location && override == NULL) { ++ char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS"); ++ char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS"); ++ char *cur, *src = loc; ++ size_t src_size = strlen(src), rel_size = strlen(home_location); ++ size_t size = 0; ++ ++ if (src_size > 0) ++ size += src_size + 1; ++ ++ if (xdgconfdirs == NULL) ++ xdgconfdirs = "/etc/xdg"; ++ if (xdgdatadirs == NULL) ++ xdgdatadirs = "/usr/local/share:/usr/share"; ++ ++ for (char *x = xdgconfdirs; *x; ++x) ++ if (*x == PATH_SEPERATOR) size += rel_size; ++ size += strlen(xdgconfdirs) + rel_size + 1; ++ for (char *x = xdgdatadirs; *x; ++x) ++ if (*x == PATH_SEPERATOR) size += rel_size; ++ size += strlen(xdgdatadirs) + rel_size + 1; ++ ++#if defined(LOCALPREFIX) ++ size += strlen(LOCALPREFIX "/" SYSCONFDIR) + rel_size + 1; ++ size += strlen(LOCALPREFIX "/" DATADIR) + rel_size + 1; ++#endif ++ ++ loc = cur = loader_stack_alloc(size); ++ if (cur == NULL) { ++ loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, ++ "Out of memory can't get manifest files"); ++ res = VK_ERROR_OUT_OF_HOST_MEMORY; ++ goto out; ++ } ++ ++ if (src_size > 0) { ++ memcpy(cur, src, src_size); ++ cur += src_size; ++ *cur++ = PATH_SEPERATOR; ++ } ++ ++ src = xdgconfdirs; ++ for (char *x = src;; ++x) { ++ if (*x == PATH_SEPERATOR || *x == 0) { ++ size_t s = x - src; ++ memcpy(cur, src, s); cur += s; ++ memcpy(cur, home_location, rel_size); cur += rel_size; ++ *cur++ = PATH_SEPERATOR; ++ if (*x == 0) ++ break; ++ src = ++x; ++ } ++ } ++ ++#if defined(LOCALPREFIX) ++ strcpy(cur, LOCALPREFIX "/" SYSCONFDIR); ++ cur += strlen(cur); ++ memcpy(cur, home_location, rel_size); cur += rel_size; ++ *cur++ = PATH_SEPERATOR; ++#endif ++ ++ src = xdgdatadirs; ++ for (char *x = src;; ++x) { ++ if (*x == PATH_SEPERATOR || *x == 0) { ++ size_t s = x - src; ++ memcpy(cur, src, s); cur += s; ++ memcpy(cur, home_location, rel_size); cur += rel_size; ++ *cur++ = PATH_SEPERATOR; ++ if (*x == 0) ++ break; ++ src = ++x; ++ } ++ } ++ ++#if defined(LOCALPREFIX) ++ strcpy(cur, LOCALPREFIX "/" DATADIR); ++ cur += strlen(cur); ++ memcpy(cur, home_location, rel_size); cur += rel_size; ++ *cur++ = PATH_SEPERATOR; ++#endif ++ ++ loc[size - 1] = 0; ++ assert(cur == loc + size); ++ list_is_dirs = true; ++ } ++#endif ++ + // Print out the paths being searched if debugging is enabled + loader_log(inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, + "Searching the following paths for manifest files: %s\n", loc); +diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h +index 3a02640..70a2652 100644 +--- a/loader/vk_loader_platform.h ++++ b/loader/vk_loader_platform.h +@@ -57,35 +57,10 @@ + #define VULKAN_ILAYERCONF_DIR "implicit_layer.d" + #define VULKAN_LAYER_DIR "layer" + +-#if defined(LOCALPREFIX) +-#define LOCAL_DRIVERS_INFO \ +- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ +- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" +-#define LOCAL_ELAYERS_INFO \ +- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ +- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" +-#define LOCAL_ILAYERS_INFO \ +- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ +- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" +-#else +-#define LOCAL_DRIVERS_INFO +-#define LOCAL_ELAYERS_INFO +-#define LOCAL_ILAYERS_INFO +-#endif +- +-#define DEFAULT_VK_DRIVERS_INFO \ +- LOCAL_DRIVERS_INFO \ +- "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ +- "/usr/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR ++#define DEFAULT_VK_DRIVERS_INFO "" + #define DEFAULT_VK_DRIVERS_PATH "" +-#define DEFAULT_VK_ELAYERS_INFO \ +- LOCAL_ELAYERS_INFO \ +- "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ +- "/usr/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR +-#define DEFAULT_VK_ILAYERS_INFO \ +- LOCAL_ILAYERS_INFO \ +- "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ +- "/usr/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ++#define DEFAULT_VK_ELAYERS_INFO "" ++#define DEFAULT_VK_ILAYERS_INFO "" + #define DEFAULT_VK_LAYERS_PATH "" + #if !defined(LAYERS_SOURCE_PATH) + #define LAYERS_SOURCE_PATH NULL diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 17a06664041..856989381ef 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -92,12 +92,13 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r usr/bin $out/bin + cp -r usr/share $out/share cp -r etc $out/etc + mv $out/etc/vulkan $out/share cp -r usr/include $out/include cp -r usr/lib/${libArch} $out/lib mv $out/lib/amdgpu-pro/* $out/lib/ rmdir $out/lib/amdgpu-pro - cp -r usr/share $out/share '' + optionalString (!libsOnly) '' if [ -d $out/lib/xorg ]; then rm $out/lib/xorg @@ -133,7 +134,7 @@ in stdenv.mkDerivation rec { perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib" fi done - substituteInPlace "$out/etc/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" + substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" ''; buildInputs = [ From e1a25aeb656d7f458936a83d1c2937a8778714a1 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 26 Oct 2016 22:50:56 -0300 Subject: [PATCH 251/295] amdgpu-pro: fix kernel module for linux-4.8 --- pkgs/os-specific/linux/amdgpu-pro/default.nix | 27 ++- ...-vga-switcheroo-handler-flag-for-4.8.patch | 27 +++ .../0001-add-OS-detection-for-arch.patch | 26 --- ...002-Remove-dependency-on-System.map.patch} | 20 +- ...ate-kcl_ttm_bo_reserve-for-linux-4.7.patch | 25 --- .../0003-add-kcl_drm_gem_object_lookup.patch | 204 ------------------ ...atch => 0003-disable-dal-by-default.patch} | 0 .../0004-paging-changes-for-linux-4.6.patch | 42 ---- ...RU-stuff-isn-t-available-until-4.7.x.patch | 48 ----- ...blank_disable_allowed-to-vblank_disa.patch | 29 --- ...-parameter-from-__drm_atomic_helper_.patch | 29 --- ...o-in-bandwidth_calcs-causing-array-e.patch | 25 --- 12 files changed, 53 insertions(+), 449 deletions(-) create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch rename pkgs/os-specific/linux/amdgpu-pro/patches/{0010-remove-dependency-on-System.map.patch => 0002-Remove-dependency-on-System.map.patch} (85%) delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch rename pkgs/os-specific/linux/amdgpu-pro/patches/{0009-disable-dal-by-default.patch => 0003-disable-dal-by-default.patch} (100%) delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 856989381ef..5c11fad3597 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, elfutils, mesa_noglu , xorg, patchelf, openssl, libdrm, libudev , libxcb, libxshmfence, epoxy, perl, zlib +, fetchFromGitHub , libsOnly ? false, kernel ? null }: @@ -42,6 +43,13 @@ in stdenv.mkDerivation rec { curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; }; + vulkanOverlay = fetchFromGitHub { + owner = "Lucretia"; + repo = "vulkan-overlay"; + rev = "70558192e7ac16103e1ec6100c1bebd6f162c818"; + sha256 = "1ycl55m3wc72q0a6pkyhhzji7llliw8076aiynr60jyv6cnmcgdz"; + }; + hardeningDisable = [ "pic" "format" ]; inherit libsOnly; @@ -55,21 +63,18 @@ in stdenv.mkDerivation rec { ''; modulePatches = [ - ./patches/0001-add-OS-detection-for-arch.patch - ./patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch - ./patches/0003-add-kcl_drm_gem_object_lookup.patch - ./patches/0004-paging-changes-for-linux-4.6.patch - ./patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch - ./patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch - ./patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch - ./patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch - ./patches/0009-disable-dal-by-default.patch - ./patches/0010-remove-dependency-on-System.map.patch + ./patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch + ./patches/0002-Remove-dependency-on-System.map.patch + ./patches/0003-disable-dal-by-default.patch ]; patchPhase = optionalString (!libsOnly) '' pushd usr/src/amdgpu-pro-${build} - for patch in $modulePatches; do echo $patch; patch -p1 < $patch; done + for patch in $vulkanOverlay/sys-kernel/amdgpu-pro-dkms/files/${build}/*.patch $modulePatches + do + echo $patch + patch -f -p1 < $patch || true + done popd ''; diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch new file mode 100644 index 00000000000..eba98965e67 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch @@ -0,0 +1,27 @@ +From c41b07cad36b1019e8d8debc8d46a7f2673982b7 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Wed, 26 Oct 2016 22:19:05 -0300 +Subject: [PATCH 1/2] Add vga switcheroo handler flag for 4.8 + +--- + amd/amdgpu/amdgpu_atpx_handler.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c +index cc9b998..e48d935 100644 +--- a/amd/amdgpu/amdgpu_atpx_handler.c ++++ b/amd/amdgpu/amdgpu_atpx_handler.c +@@ -565,7 +565,9 @@ void amdgpu_register_atpx_handler(void) + if (!r) + return; + +- vga_switcheroo_register_handler(&amdgpu_atpx_handler); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0); ++#endif + } + + /** +-- +2.10.0 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch deleted file mode 100644 index 46302ae0ea8..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e78ede724fff53fc0220999f6381242142ce8c33 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:30:25 -0300 -Subject: [PATCH 1/8] add OS detection for arch - ---- - amd/backport/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/amd/backport/Makefile b/amd/backport/Makefile -index 0c285ef..6447a15 100644 ---- a/amd/backport/Makefile -+++ b/amd/backport/Makefile -@@ -17,6 +17,9 @@ else ifeq ("ubuntu",$(OS_NAME)) - ccflags-y += -DOS_NAME_UBUNTU - else ifeq ("steamos",$(OS_NAME)) - ccflags-y += -DOS_NAME_STEAMOS -+else ifeq ("arch",$(OS_NAME)) -+ccflags-y += -DOS_NAME_ARCH -+OS_VERSION = "0.0" - else - ccflags-y += -DOS_NAME_UNKNOWN - endif --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch similarity index 85% rename from pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch rename to pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch index ec8f2c5a599..3e36e9166bb 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch @@ -1,7 +1,7 @@ -From fbc0d704f47526ca38f518b60237962cc6b08305 Mon Sep 17 00:00:00 2001 +From e03fd9f392af963a534dd3c40df06e81976766e6 Mon Sep 17 00:00:00 2001 From: David McFarland -Date: Thu, 25 Aug 2016 23:08:02 -0300 -Subject: [PATCH] remove dependency on System.map +Date: Wed, 26 Oct 2016 22:26:39 -0300 +Subject: [PATCH 2/2] Remove dependency on System.map --- amd/backport/Makefile | 3 +-- @@ -14,10 +14,10 @@ Subject: [PATCH] remove dependency on System.map delete mode 100755 pre-build.sh diff --git a/amd/backport/Makefile b/amd/backport/Makefile -index 6447a15..4682e0f 100644 +index dcc94d5..ef27e94 100644 --- a/amd/backport/Makefile +++ b/amd/backport/Makefile -@@ -53,10 +53,9 @@ ccflags-y += -DOS_NAME_RHEL_7 +@@ -55,10 +55,9 @@ ccflags-y += -DOS_NAME_RHEL_7 endif endif @@ -60,18 +60,18 @@ index 2d3f2ee..0000000 - -SYMS+="fence_default_wait_cb" diff --git a/dkms.conf b/dkms.conf -index 9ca148e..36be480 100644 +index f553501..e50ec3d 100644 --- a/dkms.conf +++ b/dkms.conf @@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu" BUILT_MODULE_LOCATION[0]="amd/amdgpu" - DEST_MODULE_LOCATION[0]="/extra" + DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu" AUTOINSTALL="yes" -PRE_BUILD="pre-build.sh $kernelver" \ No newline at end of file diff --git a/pre-build.sh b/pre-build.sh deleted file mode 100755 -index 88ec680..0000000 +index 6f45523..0000000 --- a/pre-build.sh +++ /dev/null @@ -1,32 +0,0 @@ @@ -104,9 +104,9 @@ index 88ec680..0000000 - -echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c -for sym in $SYMS; do -- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}') +- addr=$(grep $sym /boot/System.map*-$KERNELVER | awk -F' ' '{print $1}') - echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c -done -- -2.9.3 +2.10.0 diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch deleted file mode 100644 index 4101662a4eb..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d84bd62a10308efb6a414e8f6582a7b1e9860638 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:31:12 -0300 -Subject: [PATCH 2/8] update kcl_ttm_bo_reserve for linux-4.7 - ---- - amd/backport/include/kcl/kcl_ttm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h -index 3575004..0d1560d 100644 ---- a/amd/backport/include/kcl/kcl_ttm.h -+++ b/amd/backport/include/kcl/kcl_ttm.h -@@ -84,7 +84,7 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo, - bool interruptible, bool no_wait, - struct ww_acquire_ctx *ticket) - { --#if defined(BUILD_AS_DKMS) -+#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) - return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket); - #else - return ttm_bo_reserve(bo, interruptible, no_wait, ticket); --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch deleted file mode 100644 index 214b8effd9d..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch +++ /dev/null @@ -1,204 +0,0 @@ -From 2637dfe990e4c277bc724f6ba48e6661506805ec Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:37:34 -0300 -Subject: [PATCH 3/8] add kcl_drm_gem_object_lookup - ---- - amd/amdgpu/amdgpu_atpx_handler.c | 4 ++++ - amd/amdgpu/amdgpu_bo_list.c | 2 +- - amd/amdgpu/amdgpu_cs.c | 2 +- - amd/amdgpu/amdgpu_display.c | 2 +- - amd/amdgpu/amdgpu_gem.c | 10 +++++----- - amd/amdgpu/dce_v10_0.c | 2 +- - amd/amdgpu/dce_v11_0.c | 2 +- - amd/amdgpu/dce_v8_0.c | 2 +- - amd/backport/include/kcl/kcl_drm.h | 11 +++++++++++ - amd/dal/amdgpu_dm/amdgpu_dm_types.c | 2 +- - 10 files changed, 27 insertions(+), 12 deletions(-) - -diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c -index cc9b998..7e47478 100644 ---- a/amd/amdgpu/amdgpu_atpx_handler.c -+++ b/amd/amdgpu/amdgpu_atpx_handler.c -@@ -565,7 +565,11 @@ void amdgpu_register_atpx_handler(void) - if (!r) - return; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0); -+#else - vga_switcheroo_register_handler(&amdgpu_atpx_handler); -+#endif - } - - /** -diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c -index 35d0856..1d163ec 100644 ---- a/amd/amdgpu/amdgpu_bo_list.c -+++ b/amd/amdgpu/amdgpu_bo_list.c -@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, - struct amdgpu_bo *bo; - struct mm_struct *usermm; - -- gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); -+ gobj = kcl_drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); - if (!gobj) { - r = -ENOENT; - goto error_free; -diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c -index d16ed26..b0390b5 100644 ---- a/amd/amdgpu/amdgpu_cs.c -+++ b/amd/amdgpu/amdgpu_cs.c -@@ -92,7 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, - { - struct drm_gem_object *gobj; - -- gobj = drm_gem_object_lookup(p->adev->ddev, p->filp, -+ gobj = kcl_drm_gem_object_lookup(p->adev->ddev, p->filp, - data->handle); - if (gobj == NULL) - return -EINVAL; -diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c -index 46326b3..9b5441f 100644 ---- a/amd/amdgpu/amdgpu_display.c -+++ b/amd/amdgpu/amdgpu_display.c -@@ -594,7 +594,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, - struct amdgpu_framebuffer *amdgpu_fb; - int ret; - -- obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); -+ obj = kcl_drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); - if (obj == NULL) { - dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " - "can't create framebuffer\n", mode_cmd->handles[0]); -diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c -index 0069aec..d10c282 100644 ---- a/amd/amdgpu/amdgpu_gem.c -+++ b/amd/amdgpu/amdgpu_gem.c -@@ -397,7 +397,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, - struct drm_gem_object *gobj; - struct amdgpu_bo *robj; - -- gobj = drm_gem_object_lookup(dev, filp, handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); - if (gobj == NULL) { - return -ENOENT; - } -@@ -461,7 +461,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data, - int r = 0; - long ret; - -- gobj = drm_gem_object_lookup(dev, filp, handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); - if (gobj == NULL) { - return -ENOENT; - } -@@ -495,7 +495,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data, - int r = -1; - - DRM_DEBUG("%d \n", args->handle); -- gobj = drm_gem_object_lookup(dev, filp, args->handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); - if (gobj == NULL) - return -ENOENT; - robj = gem_to_amdgpu_bo(gobj); -@@ -643,7 +643,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, - return -EINVAL; - } - -- gobj = drm_gem_object_lookup(dev, filp, args->handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); - if (gobj == NULL) - return -ENOENT; - rbo = gem_to_amdgpu_bo(gobj); -@@ -705,7 +705,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, - struct amdgpu_bo *robj; - int r; - -- gobj = drm_gem_object_lookup(dev, filp, args->handle); -+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); - if (gobj == NULL) { - return -ENOENT; - } -diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c -index 7554dd7..6d38754 100644 ---- a/amd/amdgpu/dce_v10_0.c -+++ b/amd/amdgpu/dce_v10_0.c -@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, - return -EINVAL; - } - -- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); -+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); - if (!obj) { - DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); - return -ENOENT; -diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c -index d9c9b88..93dbc1a 100644 ---- a/amd/amdgpu/dce_v11_0.c -+++ b/amd/amdgpu/dce_v11_0.c -@@ -2604,7 +2604,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, - return -EINVAL; - } - -- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); -+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); - if (!obj) { - DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); - return -ENOENT; -diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c -index 7a027ce..c56a298 100644 ---- a/amd/amdgpu/dce_v8_0.c -+++ b/amd/amdgpu/dce_v8_0.c -@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, - return -EINVAL; - } - -- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); -+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); - if (!obj) { - DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); - return -ENOENT; -diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h -index a65ee25..5a8a7b3 100644 ---- a/amd/backport/include/kcl/kcl_drm.h -+++ b/amd/backport/include/kcl/kcl_drm.h -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - #if defined(BUILD_AS_DKMS) - extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw); -@@ -123,4 +124,14 @@ static inline int kcl_drm_universal_plane_init(struct drm_device *dev, struct dr - #endif - } - -+static inline struct drm_gem_object *kcl_drm_gem_object_lookup(struct drm_device *dev, -+ struct drm_file *filp, -+ u32 handle) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) -+ return drm_gem_object_lookup(filp, handle); -+#else -+ return drm_gem_object_lookup(dev, filp, handle); -+#endif -+} -+ - #endif /* AMDGPU_BACKPORT_KCL_DRM_H */ -diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -index 3f357a5..2e2d2e6 100644 ---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c -+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -@@ -152,7 +152,7 @@ static int dm_crtc_pin_cursor_bo_new( - - amdgpu_crtc = to_amdgpu_crtc(crtc); - -- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); -+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); - - if (!obj) { - DRM_ERROR( --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch similarity index 100% rename from pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch rename to pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch deleted file mode 100644 index 54394b7879b..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2bd83488ccea22bb9e399986c171cccc3b6beb93 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:40:32 -0300 -Subject: [PATCH 4/8] paging changes for linux-4.6 - ---- - amd/amdgpu/amdgpu_ttm.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c -index 7bdebde..8b676c2 100644 ---- a/amd/amdgpu/amdgpu_ttm.c -+++ b/amd/amdgpu/amdgpu_ttm.c -@@ -548,8 +548,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) - list_add(&guptask.list, >t->guptasks); - spin_unlock(>t->guptasklock); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+ r = get_user_pages(userptr, num_pages, write, 0, p, NULL); -+#else - r = get_user_pages(current, current->mm, userptr, num_pages, -- write, 0, p, NULL); -+ write, 0, p, NULL); -+#endif - - spin_lock(>t->guptasklock); - list_del(&guptask.list); -@@ -625,7 +629,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) - set_page_dirty(page); - - mark_page_accessed(page); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+ put_page(page); -+#else - page_cache_release(page); -+#endif - } - - sg_free_table(ttm->sg); --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch deleted file mode 100644 index 6da3e46a3ee..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c41c15fa04e363c41272e7b5d767710170691347 Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Mon, 4 Jul 2016 19:19:45 +0100 -Subject: [PATCH 5/8] LRU stuff isn't available until >= 4.7.x - ---- - amd/amdgpu/amdgpu_ttm.c | 4 ++-- - amd/backport/kcl_ttm.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c -index 8b676c2..752d065 100644 ---- a/amd/amdgpu/amdgpu_ttm.c -+++ b/amd/amdgpu/amdgpu_ttm.c -@@ -907,7 +907,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, - return flags; - } - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) - - static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo) - { -@@ -969,7 +969,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = { - .fault_reserve_notify = &amdgpu_bo_fault_reserve_notify, - .io_mem_reserve = &amdgpu_ttm_io_mem_reserve, - .io_mem_free = &amdgpu_ttm_io_mem_free, --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) - .lru_removal = &amdgpu_ttm_lru_removal, - .lru_tail = &amdgpu_ttm_lru_tail, - .swap_lru_tail = &amdgpu_ttm_swap_lru_tail, -diff --git a/amd/backport/kcl_ttm.c b/amd/backport/kcl_ttm.c -index 24f7a83..1a2cb7b 100644 ---- a/amd/backport/kcl_ttm.c -+++ b/amd/backport/kcl_ttm.c -@@ -7,7 +7,7 @@ static int _kcl_ttm_bo_del_from_lru(struct ttm_buffer_object *bo) - { - int put_count = 0; - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) - struct ttm_bo_device *bdev = bo->bdev; - - if (bdev->driver->lru_removal) --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch deleted file mode 100644 index 5be5acad00d..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5b90b8d8ab44637c707623b25ee98aa4ebded308 Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Mon, 4 Jul 2016 19:30:08 +0100 -Subject: [PATCH 6/8] Change name of vblank_disable_allowed to - vblank_disable_immediate under 4.7.x. - ---- - amd/amdgpu/amdgpu_irq.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c -index d13865a..5cfa69f 100644 ---- a/amd/amdgpu/amdgpu_irq.c -+++ b/amd/amdgpu/amdgpu_irq.c -@@ -240,7 +240,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev) - INIT_WORK(&adev->hotplug_work, - amdgpu_hotplug_work_func); - } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) -+ adev->ddev->vblank_disable_immediate = true; -+#else - adev->ddev->vblank_disable_allowed = true; -+#endif - - INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func); - --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch deleted file mode 100644 index 13d4a282ac8..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 27ef2ce0d4d8eeb3bca32ddeae503f0a334832aa Mon Sep 17 00:00:00 2001 -From: "Luke A. Guest" -Date: Mon, 4 Jul 2016 19:41:08 +0100 -Subject: [PATCH 7/8] Remove connector parameter from - __drm_atomic_helper_connector_destroy_state for 4.7.x kernels. - ---- - amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -index 2e2d2e6..cd34607 100644 ---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c -+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c -@@ -1205,7 +1205,11 @@ void amdgpu_dm_connector_atomic_destroy_state( - struct dm_connector_state *dm_state = - to_dm_connector_state(state); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) -+ __drm_atomic_helper_connector_destroy_state(state); -+#else - __drm_atomic_helper_connector_destroy_state(connector, state); -+#endif - - kfree(dm_state); - } --- -2.9.3 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch deleted file mode 100644 index 693ad8b2f40..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c9f2501131da0d9173e21f7e8ff5741a7fcfedb6 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 21 Aug 2016 16:58:45 -0300 -Subject: [PATCH 8/8] fix apparent typo in bandwidth_calcs causing array error - ---- - amd/dal/dc/calcs/bandwidth_calcs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amd/dal/dc/calcs/bandwidth_calcs.c b/amd/dal/dc/calcs/bandwidth_calcs.c -index 8a19139..c4ededd 100644 ---- a/amd/dal/dc/calcs/bandwidth_calcs.c -+++ b/amd/dal/dc/calcs/bandwidth_calcs.c -@@ -3181,7 +3181,7 @@ static void calculate_bandwidth( - bw_int_to_fixed( - 2), - vbios->mcifwrmc_urgent_latency), -- results->dmif_burst_time[i][j]), -+ results->dmif_burst_time[results->y_clk_level][results->sclk_level]), - results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])), - results->dispclk), - bw_int_to_fixed( --- -2.9.3 - From 3d4a280c354bb21b711055ca7e02ee3e7999292b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 27 Oct 2016 23:10:44 -0300 Subject: [PATCH 252/295] amdgpu-pro: 16.30.3-315407 -> 16.40-348864 --- pkgs/os-specific/linux/amdgpu-pro/default.nix | 107 +++++----- ...-vga-switcheroo-handler-flag-for-4.8.patch | 27 --- .../0001-Find-correct-System.map.patch | 25 +++ ...2-Fix-kernel-module-install-location.patch | 25 +++ ...0002-Remove-dependency-on-System.map.patch | 112 ---------- .../0003-Add-Gentoo-as-build-option.patch | 30 +++ ...ameter-from-ttm_bo_reserve-for-4.7.0.patch | 28 +++ ...rst-param-from-drm_gem_object_lookup.patch | 196 ++++++++++++++++++ ...ve-vblank_disable_allowed-assignment.patch | 26 +++ ..._helper_connector_destroy_state-call.patch | 28 +++ ...seq_printf-format-for-64-bit-context.patch | 30 +++ .../patches/0009-Fix-vblank-calls.patch | 135 ++++++++++++ ...0-Fix-crtc_gamma-functions-for-4.8.0.patch | 163 +++++++++++++++ ...m_atomic_helper_swap_state-for-4.8.0.patch | 28 +++ ...lag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch | 40 ++++ ...0013-Remove-dependency-on-System.map.patch | 61 ++++++ ...atch => 0014-disable-dal-by-default.patch} | 8 +- 17 files changed, 878 insertions(+), 191 deletions(-) delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch rename pkgs/os-specific/linux/amdgpu-pro/patches/{0003-disable-dal-by-default.patch => 0014-disable-dal-by-default.patch} (79%) diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 5c11fad3597..4a0527242c7 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, elfutils, mesa_noglu , xorg, patchelf, openssl, libdrm, libudev , libxcb, libxshmfence, epoxy, perl, zlib -, fetchFromGitHub +, fetchFromGitHub, ncurses , libsOnly ? false, kernel ? null }: @@ -26,11 +26,13 @@ let libReplaceDir = "/usr/lib/${libArch}"; + ncurses5 = ncurses.override { abiVersion = "5"; }; + in stdenv.mkDerivation rec { - version = "16.30"; + version = "16.40"; pname = "amdgpu-pro"; - build = "16.30.3-315407"; + build = "16.40-348864"; libCompatDir = "/run/lib/${libArch}"; @@ -38,16 +40,9 @@ in stdenv.mkDerivation rec { src = fetchurl { url = - "https://www2.ati.com/drivers/linux/amdgpu-pro_${build}.tar.xz"; - sha256 = "97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354"; - curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; - }; - - vulkanOverlay = fetchFromGitHub { - owner = "Lucretia"; - repo = "vulkan-overlay"; - rev = "70558192e7ac16103e1ec6100c1bebd6f162c818"; - sha256 = "1ycl55m3wc72q0a6pkyhhzji7llliw8076aiynr60jyv6cnmcgdz"; + "https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz"; + sha256 = "1c06lx07irmlpmbmgb3qcgpzj6q6rimszrbbdrgz8kqnfpcv3mjr"; + curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx"; }; hardeningDisable = [ "pic" "format" ]; @@ -58,19 +53,30 @@ in stdenv.mkDerivation rec { cd $sourceRoot mkdir root cd root - for deb in ../*.deb; do echo $deb; ar p $deb data.tar.xz | tar -xJ; done + for deb in ../*_all.deb ../*_i386.deb '' + optionalString stdenv.is64bit "../*_amd64.deb" + ''; do echo $deb; ar p $deb data.tar.xz | tar -xJ; done sourceRoot=. ''; modulePatches = [ - ./patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch - ./patches/0002-Remove-dependency-on-System.map.patch - ./patches/0003-disable-dal-by-default.patch + ./patches/0001-Find-correct-System.map.patch + ./patches/0002-Fix-kernel-module-install-location.patch + ./patches/0003-Add-Gentoo-as-build-option.patch + ./patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch + ./patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch + ./patches/0006-Remove-vblank_disable_allowed-assignment.patch + ./patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch + ./patches/0008-Change-seq_printf-format-for-64-bit-context.patch + ./patches/0009-Fix-vblank-calls.patch + ./patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch + ./patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch + ./patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch + ./patches/0013-Remove-dependency-on-System.map.patch + ./patches/0014-disable-dal-by-default.patch ]; patchPhase = optionalString (!libsOnly) '' pushd usr/src/amdgpu-pro-${build} - for patch in $vulkanOverlay/sys-kernel/amdgpu-pro-dkms/files/${build}/*.patch $modulePatches + for patch in $modulePatches do echo $patch patch -f -p1 < $patch || true @@ -91,55 +97,60 @@ in stdenv.mkDerivation rec { depLibPath = makeLibraryPath [ stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib - xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev + xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev ncurses5 ]; installPhase = '' mkdir -p $out - cp -r usr/bin $out/bin - cp -r usr/share $out/share + cp -r etc $out/etc - mv $out/etc/vulkan $out/share - cp -r usr/include $out/include - cp -r usr/lib/${libArch} $out/lib - mv $out/lib/amdgpu-pro/* $out/lib/ - rmdir $out/lib/amdgpu-pro + cp -r lib $out/lib + + pushd usr + cp -r lib/${libArch}/* $out/lib + '' + optionalString (!libsOnly) '' + cp -r src/amdgpu-pro-${build}/firmware $out/lib/firmware + '' + '' + cp -r share $out/share + popd + + pushd opt/amdgpu-pro + '' + optionalString (!stdenv.is64bit) '' + cp -r bin $out/bin + '' + '' + cp -r include $out/include + cp -r lib/${libArch}/* $out/lib + '' + optionalString (!libsOnly) '' + mv lib/xorg $out/lib/xorg + '' + '' + popd + '' + optionalString (!libsOnly) '' - if [ -d $out/lib/xorg ]; then - rm $out/lib/xorg - mv $out/lib/1.18 $out/lib/xorg - rm -r $out/lib/1.* - fi - cp -r lib/firmware $out/lib/firmware mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz cp usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz '' + '' + mv $out/etc/vulkan $out/share interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" libPath="$out/lib:$out/lib/gbm:$depLibPath" - echo patching with $interpreter $libPath - for prog in "$out"/bin/*; do - echo patching program $prog - patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$prog" - done - for lib in `find "$out/lib/" -name '*.so*'`; do - echo patching library $lib - patchelf --set-rpath "$libPath" "$lib" + '' + optionalString (!stdenv.is64bit) '' + for prog in clinfo modetest vbltest kms-universal-planes kms-steal-crtc modeprint amdgpu_test kmstest proptest; do + patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$out/bin/$prog" done + '' + '' + ln -s libgbm.so.1.0.0 $out/lib/libgbm.so.1 + ln -s ${makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5 ''; + # we'll just set the full rpath on everything to avoid having to track down dlopen problems postFixup = assert (stringLength libReplaceDir == stringLength libCompatDir); '' libPath="$out/lib:$out/lib/gbm:$depLibPath" - for lib in libgbm.so.1.0.0 ${optionalString (!libsOnly) "xorg/modules/drivers/amdgpu_drv.so"} amdvlk${bitness}.so vdpau/libvdpau_amdgpu.so; do - if [ -e "$out/lib/$lib" ]; then - patchelf --set-rpath "$libPath" "$out/lib/$lib" - fi + for lib in `find "$out/lib/" -name '*.so*' -type f`; do + patchelf --set-rpath "$libPath" "$lib" done for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do - if [ -e "$out/lib/$lib" ]; then - perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib" - fi + perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib" done - substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" + substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/opt/amdgpu-pro/lib/${libArch}" "$out/lib" ''; buildInputs = [ diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch deleted file mode 100644 index eba98965e67..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Add-vga-switcheroo-handler-flag-for-4.8.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c41b07cad36b1019e8d8debc8d46a7f2673982b7 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Wed, 26 Oct 2016 22:19:05 -0300 -Subject: [PATCH 1/2] Add vga switcheroo handler flag for 4.8 - ---- - amd/amdgpu/amdgpu_atpx_handler.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c -index cc9b998..e48d935 100644 ---- a/amd/amdgpu/amdgpu_atpx_handler.c -+++ b/amd/amdgpu/amdgpu_atpx_handler.c -@@ -565,7 +565,9 @@ void amdgpu_register_atpx_handler(void) - if (!r) - return; - -- vga_switcheroo_register_handler(&amdgpu_atpx_handler); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0); -+#endif - } - - /** --- -2.10.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch new file mode 100644 index 00000000000..2a086cf37bc --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch @@ -0,0 +1,25 @@ +From 4243cf67bcdf8c3865efbfe19dc8841c88ab2daa Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:30:26 +0100 +Subject: [PATCH 01/14] Find correct System.map + +--- + pre-build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pre-build.sh b/pre-build.sh +index 95457bd..169ccf0 100755 +--- a/pre-build.sh ++++ b/pre-build.sh +@@ -27,7 +27,7 @@ source amd/backport/symbols + + echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c + for sym in $SYMS; do +- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}') ++ addr=$(grep $sym /boot/System.map*-$KERNELVER | awk -F' ' '{print $1}') + echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c + done + +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch new file mode 100644 index 00000000000..be886883556 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch @@ -0,0 +1,25 @@ +From c1860b4e8c2ebb784a07d6ba067c510950e67d24 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:31:13 +0100 +Subject: [PATCH 02/14] Fix kernel module install location + +--- + dkms.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dkms.conf b/dkms.conf +index d1a5e1d..0e03f08 100644 +--- a/dkms.conf ++++ b/dkms.conf +@@ -2,7 +2,7 @@ PACKAGE_NAME="amdgpu-pro" + PACKAGE_VERSION="16.40-348864" + BUILT_MODULE_NAME[0]="amdgpu" + BUILT_MODULE_LOCATION[0]="amd/amdgpu" +-DEST_MODULE_LOCATION[0]="/extra" ++DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu" + AUTOINSTALL="yes" + PRE_BUILD="pre-build.sh $kernelver" + REMAKE_INITRD="yes" +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch deleted file mode 100644 index 3e36e9166bb..00000000000 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Remove-dependency-on-System.map.patch +++ /dev/null @@ -1,112 +0,0 @@ -From e03fd9f392af963a534dd3c40df06e81976766e6 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Wed, 26 Oct 2016 22:26:39 -0300 -Subject: [PATCH 2/2] Remove dependency on System.map - ---- - amd/backport/Makefile | 3 +-- - amd/backport/kcl_fence.c | 10 ++++++++-- - amd/backport/symbols | 3 --- - dkms.conf | 1 - - pre-build.sh | 32 -------------------------------- - 5 files changed, 9 insertions(+), 40 deletions(-) - delete mode 100644 amd/backport/symbols - delete mode 100755 pre-build.sh - -diff --git a/amd/backport/Makefile b/amd/backport/Makefile -index dcc94d5..ef27e94 100644 ---- a/amd/backport/Makefile -+++ b/amd/backport/Makefile -@@ -55,10 +55,9 @@ ccflags-y += -DOS_NAME_RHEL_7 - endif - endif - --BACKPORT_OBJS = symbols.o - endif - --BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o -+BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o - - amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS)) - -diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c -index 2141eef..ceef1fe 100644 ---- a/amd/backport/kcl_fence.c -+++ b/amd/backport/kcl_fence.c -@@ -22,8 +22,14 @@ struct default_wait_cb { - struct task_struct *task; - }; - --extern void --(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb); -+static void -+fence_default_wait_cb(struct fence *fence, struct fence_cb *cb) -+{ -+ struct default_wait_cb *wait = -+ container_of(cb, struct default_wait_cb, base); -+ -+ wake_up_process(wait->task); -+} - - signed long - _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count, -diff --git a/amd/backport/symbols b/amd/backport/symbols -deleted file mode 100644 -index 2d3f2ee..0000000 ---- a/amd/backport/symbols -+++ /dev/null -@@ -1,3 +0,0 @@ --SYMS="" -- --SYMS+="fence_default_wait_cb" -diff --git a/dkms.conf b/dkms.conf -index f553501..e50ec3d 100644 ---- a/dkms.conf -+++ b/dkms.conf -@@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu" - BUILT_MODULE_LOCATION[0]="amd/amdgpu" - DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu" - AUTOINSTALL="yes" --PRE_BUILD="pre-build.sh $kernelver" -\ No newline at end of file -diff --git a/pre-build.sh b/pre-build.sh -deleted file mode 100755 -index 6f45523..0000000 ---- a/pre-build.sh -+++ /dev/null -@@ -1,32 +0,0 @@ --#!/bin/bash -- --KERNELVER=$1 --KERNELVER_BASE=${KERNELVER%%-*} -- --version_lt () { -- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) -- [ "$1" != "$newest" ] --} -- --version_ge () { -- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) -- [ "$1" = "$newest" ] --} -- --version_gt () { -- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) -- [ "$1" != "$oldest" ] --} -- --version_le () { -- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) -- [ "$1" = "$oldest" ] --} -- --source amd/backport/symbols -- --echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c --for sym in $SYMS; do -- addr=$(grep $sym /boot/System.map*-$KERNELVER | awk -F' ' '{print $1}') -- echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c --done --- -2.10.0 - diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch new file mode 100644 index 00000000000..d8b0f289d84 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch @@ -0,0 +1,30 @@ +From c26c7670869e02c39c0d0f6dee9094a621f42252 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:31:49 +0100 +Subject: [PATCH 03/14] Add Gentoo as build option + +--- + amd/backport/Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index 0c285ef..dcc94d5 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -17,8 +17,13 @@ else ifeq ("ubuntu",$(OS_NAME)) + ccflags-y += -DOS_NAME_UBUNTU + else ifeq ("steamos",$(OS_NAME)) + ccflags-y += -DOS_NAME_STEAMOS ++else ifeq ("gentoo",$(OS_NAME)) ++ccflags-y += -DOS_NAME_GENTOO ++# We don't have a version inside /etc/os-release. ++OS_VERSION = "0.0" + else + ccflags-y += -DOS_NAME_UNKNOWN ++OS_VERSION = "0.0" + endif + + ccflags-y += \ +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch new file mode 100644 index 00000000000..794da9b5fb7 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch @@ -0,0 +1,28 @@ +From d21e811c6f26674a0e1c2398dce6d247a1dd4918 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:46:58 +0100 +Subject: [PATCH 04/14] Remove extra parameter from ttm_bo_reserve for 4.7.0 + +--- + amd/backport/include/kcl/kcl_ttm.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h +index 05c444b..c5a602c 100644 +--- a/amd/backport/include/kcl/kcl_ttm.h ++++ b/amd/backport/include/kcl/kcl_ttm.h +@@ -106,7 +106,11 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo, + struct ww_acquire_ctx *ticket) + { + #if defined(BUILD_AS_DKMS) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ return ttm_bo_reserve(bo, interruptible, no_wait, ticket); ++#else + return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket); ++#endif + #else + return ttm_bo_reserve(bo, interruptible, no_wait, ticket); + #endif +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch new file mode 100644 index 00000000000..94cb3e72ed5 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch @@ -0,0 +1,196 @@ +From 4ac701dce0a4139e89c80237fc4eaa65f48c6f07 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 15:53:50 +0100 +Subject: [PATCH 05/14] Remove first param from drm_gem_object_lookup + +--- + amd/amdgpu/amdgpu_bo_list.c | 4 ++++ + amd/amdgpu/amdgpu_cs.c | 4 ++++ + amd/amdgpu/amdgpu_display.c | 4 ++++ + amd/amdgpu/amdgpu_gem.c | 20 ++++++++++++++++++++ + amd/amdgpu/dce_v10_0.c | 4 ++++ + amd/amdgpu/dce_v11_0.c | 4 ++++ + amd/amdgpu/dce_v8_0.c | 4 ++++ + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ + 8 files changed, 48 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c +index 844214d..7ae09cf 100644 +--- a/amd/amdgpu/amdgpu_bo_list.c ++++ b/amd/amdgpu/amdgpu_bo_list.c +@@ -107,7 +107,11 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, + struct amdgpu_bo *bo; + struct mm_struct *usermm; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, info[i].bo_handle); ++#else + gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); ++#endif + if (!gobj) { + r = -ENOENT; + goto error_free; +diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c +index 20f6ab2..22363ab 100644 +--- a/amd/amdgpu/amdgpu_cs.c ++++ b/amd/amdgpu/amdgpu_cs.c +@@ -92,8 +92,12 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, + { + struct drm_gem_object *gobj; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(p->filp, data->handle); ++#else + gobj = drm_gem_object_lookup(p->adev->ddev, p->filp, + data->handle); ++#endif + if (gobj == NULL) + return -EINVAL; + +diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c +index 96c4fa5..862611c 100644 +--- a/amd/amdgpu/amdgpu_display.c ++++ b/amd/amdgpu/amdgpu_display.c +@@ -601,7 +601,11 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, + struct amdgpu_framebuffer *amdgpu_fb; + int ret; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]); ++#else + obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); ++#endif + if (obj == NULL) { + dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " + "can't create framebuffer\n", mode_cmd->handles[0]); +diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c +index 0069aec..6da025b 100644 +--- a/amd/amdgpu/amdgpu_gem.c ++++ b/amd/amdgpu/amdgpu_gem.c +@@ -397,7 +397,11 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, + struct drm_gem_object *gobj; + struct amdgpu_bo *robj; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, handle); ++#endif + if (gobj == NULL) { + return -ENOENT; + } +@@ -461,7 +465,11 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data, + int r = 0; + long ret; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, handle); ++#endif + if (gobj == NULL) { + return -ENOENT; + } +@@ -495,7 +503,11 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data, + int r = -1; + + DRM_DEBUG("%d \n", args->handle); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, args->handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, args->handle); ++#endif + if (gobj == NULL) + return -ENOENT; + robj = gem_to_amdgpu_bo(gobj); +@@ -643,7 +655,11 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, + return -EINVAL; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, args->handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, args->handle); ++#endif + if (gobj == NULL) + return -ENOENT; + rbo = gem_to_amdgpu_bo(gobj); +@@ -705,7 +721,11 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, + struct amdgpu_bo *robj; + int r; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ gobj = drm_gem_object_lookup(filp, args->handle); ++#else + gobj = drm_gem_object_lookup(dev, filp, args->handle); ++#endif + if (gobj == NULL) { + return -ENOENT; + } +diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c +index 3fae88d..0fd1e4f 100644 +--- a/amd/amdgpu/dce_v10_0.c ++++ b/amd/amdgpu/dce_v10_0.c +@@ -2594,7 +2594,11 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, handle); ++#else + obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++#endif + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c +index fe87795..a85eb5f 100644 +--- a/amd/amdgpu/dce_v11_0.c ++++ b/amd/amdgpu/dce_v11_0.c +@@ -2604,7 +2604,11 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, handle); ++#else + obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++#endif + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c +index 1f5959b..308f5e4 100644 +--- a/amd/amdgpu/dce_v8_0.c ++++ b/amd/amdgpu/dce_v8_0.c +@@ -2448,7 +2448,11 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, handle); ++#else + obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++#endif + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index d14c96f..a9de2e5 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -156,7 +156,11 @@ static int dm_crtc_pin_cursor_bo_new( + + amdgpu_crtc = to_amdgpu_crtc(crtc); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ obj = drm_gem_object_lookup(file_priv, handle); ++#else + obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++#endif + + if (!obj) { + DRM_ERROR( +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch new file mode 100644 index 00000000000..dc35fe4c96a --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch @@ -0,0 +1,26 @@ +From d4a070e6d68ff7ce8ac49c6135acc759c9a1cf6e Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:01:43 +0100 +Subject: [PATCH 06/14] Remove vblank_disable_allowed assignment + +--- + amd/amdgpu/amdgpu_irq.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c +index 6e85e69..71358c9 100644 +--- a/amd/amdgpu/amdgpu_irq.c ++++ b/amd/amdgpu/amdgpu_irq.c +@@ -240,7 +240,9 @@ int amdgpu_irq_init(struct amdgpu_device *adev) + INIT_WORK(&adev->hotplug_work, + amdgpu_hotplug_work_func); + } ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) + adev->ddev->vblank_disable_allowed = true; ++#endif + + INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func); + +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch new file mode 100644 index 00000000000..9e8749a31ca --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch @@ -0,0 +1,28 @@ +From 406bb3a83b51b2bcf61a972721aa116e69c0a771 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:10:27 +0100 +Subject: [PATCH 07/14] Fix __drm_atomic_helper_connector_destroy_state call + +--- + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index a9de2e5..fedf490 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -1224,7 +1224,11 @@ void amdgpu_dm_connector_atomic_destroy_state( + struct dm_connector_state *dm_state = + to_dm_connector_state(state); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ __drm_atomic_helper_connector_destroy_state(connector->state); ++#else + __drm_atomic_helper_connector_destroy_state(connector, state); ++#endif + + kfree(dm_state); + } +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch new file mode 100644 index 00000000000..827237a5f9a --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch @@ -0,0 +1,30 @@ +From f268e7fa537fd8e12f4023803df795b2e29747e7 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:46:39 +0100 +Subject: [PATCH 08/14] Change seq_printf format for 64 bit context + +--- + amd/amdgpu/amdgpu_sa.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c +index 768a265..51d118e 100644 +--- a/amd/amdgpu/amdgpu_sa.c ++++ b/amd/amdgpu/amdgpu_sa.c +@@ -428,8 +428,13 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, + soffset, eoffset, eoffset - soffset); + + if (i->fence) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ seq_printf(m, " protected by 0x%08x on context %llu", ++ i->fence->seqno, i->fence->context); ++#else + seq_printf(m, " protected by 0x%08x on context %d", + i->fence->seqno, i->fence->context); ++#endif + + seq_printf(m, "\n"); + } +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch new file mode 100644 index 00000000000..82db5905a45 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch @@ -0,0 +1,135 @@ +From 9da98ec93816277a2d4e93d3205da044bace08bc Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:49:09 +0100 +Subject: [PATCH 09/14] Fix vblank calls + +--- + amd/amdgpu/amdgpu_display.c | 8 ++++++++ + amd/amdgpu/dce_v10_0.c | 8 ++++++++ + amd/amdgpu/dce_v11_0.c | 8 ++++++++ + amd/amdgpu/dce_v8_0.c | 8 ++++++++ + amd/dal/amdgpu_dm/amdgpu_dm.c | 4 ++++ + 5 files changed, 36 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c +index 862611c..267c65f 100644 +--- a/amd/amdgpu/amdgpu_display.c ++++ b/amd/amdgpu/amdgpu_display.c +@@ -268,7 +268,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc, + + work->base = base; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ r = drm_crtc_vblank_get(crtc); ++#else + r = drm_vblank_get(crtc->dev, amdgpu_crtc->crtc_id); ++#endif + if (r) { + DRM_ERROR("failed to get vblank before flip\n"); + goto pflip_cleanup; +@@ -296,7 +300,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc, + return 0; + + vblank_cleanup: ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_vblank_put(&amdgpu_crtc->base); ++#else + drm_vblank_put(crtc->dev, amdgpu_crtc->crtc_id); ++#endif + + pflip_cleanup: + if (unlikely(amdgpu_bo_reserve(new_rbo, false) != 0)) { +diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c +index 0fd1e4f..5f0044c 100644 +--- a/amd/amdgpu/dce_v10_0.c ++++ b/amd/amdgpu/dce_v10_0.c +@@ -3372,11 +3372,19 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev, + + /* wakeup usersapce */ + if (works->event) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); ++#else + drm_send_vblank_event(adev->ddev, crtc_id, works->event); ++#endif + + spin_unlock_irqrestore(&adev->ddev->event_lock, flags); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_vblank_put(&amdgpu_crtc->base); ++#else + drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); ++#endif + schedule_work(&works->unpin_work); + + return 0; +diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c +index a85eb5f..8edc670 100644 +--- a/amd/amdgpu/dce_v11_0.c ++++ b/amd/amdgpu/dce_v11_0.c +@@ -3432,11 +3432,19 @@ static int dce_v11_0_pageflip_irq(struct amdgpu_device *adev, + + /* wakeup usersapce */ + if(works->event) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); ++#else + drm_send_vblank_event(adev->ddev, crtc_id, works->event); ++#endif + + spin_unlock_irqrestore(&adev->ddev->event_lock, flags); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_vblank_put(&amdgpu_crtc->base); ++#else + drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); ++#endif + schedule_work(&works->unpin_work); + + return 0; +diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c +index 308f5e4..57e8014 100644 +--- a/amd/amdgpu/dce_v8_0.c ++++ b/amd/amdgpu/dce_v8_0.c +@@ -3323,11 +3323,19 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev, + + /* wakeup usersapce */ + if (works->event) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); ++#else + drm_send_vblank_event(adev->ddev, crtc_id, works->event); ++#endif + + spin_unlock_irqrestore(&adev->ddev->event_lock, flags); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_vblank_put(&amdgpu_crtc->base); ++#else + drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id); ++#endif + schedule_work(&works->unpin_work); + + return 0; +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm.c b/amd/dal/amdgpu_dm/amdgpu_dm.c +index 30865ec..f49999b 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm.c +@@ -196,10 +196,14 @@ static void dm_pflip_high_irq(void *interrupt_params) + + /* wakeup usersapce */ + if(works->event) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event); ++#else + drm_send_vblank_event( + adev->ddev, + amdgpu_crtc->crtc_id, + works->event); ++#endif + + spin_unlock_irqrestore(&adev->ddev->event_lock, flags); + +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch new file mode 100644 index 00000000000..b11ab3e557e --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch @@ -0,0 +1,163 @@ +From b41eafa282a003cde9729e2ff486f55dc54f12c6 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 16:56:47 +0100 +Subject: [PATCH 10/14] Fix crtc_gamma functions for 4.8.0 + +--- + amd/amdgpu/dce_v10_0.c | 19 +++++++++++++++++++ + amd/amdgpu/dce_v11_0.c | 19 +++++++++++++++++++ + amd/amdgpu/dce_v8_0.c | 19 +++++++++++++++++++ + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 12 ++++++++++++ + 4 files changed, 69 insertions(+) + +diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c +index 5f0044c..85378aa 100644 +--- a/amd/amdgpu/dce_v10_0.c ++++ b/amd/amdgpu/dce_v10_0.c +@@ -2671,6 +2671,24 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc) + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static int dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, ++ u16 *blue, uint32_t size) ++{ ++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); ++ int i; ++ ++ /* userspace palettes are always correct as is */ ++ for (i = 0; i < size; i++) { ++ amdgpu_crtc->lut_r[i] = red[i] >> 6; ++ amdgpu_crtc->lut_g[i] = green[i] >> 6; ++ amdgpu_crtc->lut_b[i] = blue[i] >> 6; ++ } ++ dce_v10_0_crtc_load_lut(crtc); ++ ++ return 0; ++} ++#else + static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + u16 *blue, uint32_t start, uint32_t size) + { +@@ -2685,6 +2703,7 @@ static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green + } + dce_v10_0_crtc_load_lut(crtc); + } ++#endif + + static void dce_v10_0_crtc_destroy(struct drm_crtc *crtc) + { +diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c +index 8edc670..0129543 100644 +--- a/amd/amdgpu/dce_v11_0.c ++++ b/amd/amdgpu/dce_v11_0.c +@@ -2681,6 +2681,24 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc) + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static int dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, ++ u16 *blue, uint32_t size) ++{ ++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); ++ int i; ++ ++ /* userspace palettes are always correct as is */ ++ for (i = 0; i < size; i++) { ++ amdgpu_crtc->lut_r[i] = red[i] >> 6; ++ amdgpu_crtc->lut_g[i] = green[i] >> 6; ++ amdgpu_crtc->lut_b[i] = blue[i] >> 6; ++ } ++ dce_v11_0_crtc_load_lut(crtc); ++ ++ return 0; ++} ++#else + static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + u16 *blue, uint32_t start, uint32_t size) + { +@@ -2695,6 +2713,7 @@ static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green + } + dce_v11_0_crtc_load_lut(crtc); + } ++#endif + + static void dce_v11_0_crtc_destroy(struct drm_crtc *crtc) + { +diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c +index 57e8014..d0d9267 100644 +--- a/amd/amdgpu/dce_v8_0.c ++++ b/amd/amdgpu/dce_v8_0.c +@@ -2525,6 +2525,24 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc) + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static int dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, ++ u16 *blue, uint32_t size) ++{ ++ struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); ++ int i; ++ ++ /* userspace palettes are always correct as is */ ++ for (i = 0; i < size; i++) { ++ amdgpu_crtc->lut_r[i] = red[i] >> 6; ++ amdgpu_crtc->lut_g[i] = green[i] >> 6; ++ amdgpu_crtc->lut_b[i] = blue[i] >> 6; ++ } ++ dce_v8_0_crtc_load_lut(crtc); ++ ++ return 0; ++} ++#else + static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + u16 *blue, uint32_t start, uint32_t size) + { +@@ -2539,6 +2557,7 @@ static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + } + dce_v8_0_crtc_load_lut(crtc); + } ++#endif + + static void dce_v8_0_crtc_destroy(struct drm_crtc *crtc) + { +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index fedf490..c1f3c27 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -995,6 +995,13 @@ void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc) + kfree(crtc); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static int amdgpu_dm_atomic_crtc_gamma_set(struct drm_crtc *crtc, ++ u16 *red, ++ u16 *green, ++ u16 *blue, ++ uint32_t size) ++#else + static void amdgpu_dm_atomic_crtc_gamma_set( + struct drm_crtc *crtc, + u16 *red, +@@ -1002,6 +1009,7 @@ static void amdgpu_dm_atomic_crtc_gamma_set( + u16 *blue, + uint32_t start, + uint32_t size) ++#endif + { + struct drm_device *dev = crtc->dev; + struct drm_property *prop = dev->mode_config.prop_crtc_id; +@@ -1009,6 +1017,10 @@ static void amdgpu_dm_atomic_crtc_gamma_set( + crtc->state->mode.private_flags |= AMDGPU_CRTC_MODE_PRIVATE_FLAGS_GAMMASET; + + drm_atomic_helper_crtc_set_property(crtc, prop, 0); ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ return 0; ++#endif + } + + static int dm_crtc_funcs_atomic_set_property( +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch new file mode 100644 index 00000000000..d205fc3189c --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch @@ -0,0 +1,28 @@ +From 32422de1ddaf539d284b32de5fe43d07b7553499 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 17:00:32 +0100 +Subject: [PATCH 11/14] Fix drm_atomic_helper_swap_state for 4.8.0 + +--- + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index c1f3c27..60cba1a 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -2331,7 +2331,11 @@ int amdgpu_dm_atomic_commit( + * the software side now. + */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ drm_atomic_helper_swap_state(state, true); ++#else + drm_atomic_helper_swap_state(dev, state); ++#endif + + /* + * From this point state become old state really. New state is +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch new file mode 100644 index 00000000000..77b0cf79640 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch @@ -0,0 +1,40 @@ +From 69207f061e13e6f02418d5706d230135abcc1a72 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Sun, 25 Sep 2016 19:19:45 +0100 +Subject: [PATCH 12/14] Add extra flag to ttm_bo_move_ttm for >=4.8.0-rc2 + +--- + amd/amdgpu/amdgpu_ttm.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 145732a..dd691fa 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -344,7 +344,11 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, + if (unlikely(r)) { + goto out_cleanup; + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, new_mem); ++#else + r = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem); ++#endif + out_cleanup: + ttm_bo_mem_put(bo, &tmp_mem); + return r; +@@ -377,7 +381,11 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, + if (unlikely(r)) { + return r; + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, &tmp_mem); ++#else + r = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem); ++#endif + if (unlikely(r)) { + goto out_cleanup; + } +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch new file mode 100644 index 00000000000..23a648e0d52 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch @@ -0,0 +1,61 @@ +From 115cdb5a06b112674d9652ef44d7f19583ff0136 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Wed, 26 Oct 2016 22:26:39 -0300 +Subject: [PATCH 13/14] Remove dependency on System.map + +--- + amd/backport/Makefile | 3 +-- + amd/backport/kcl_fence.c | 10 ++++++++-- + amd/backport/symbols | 3 --- + 3 files changed, 9 insertions(+), 7 deletions(-) + delete mode 100644 amd/backport/symbols + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index dcc94d5..ef27e94 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -55,10 +55,9 @@ ccflags-y += -DOS_NAME_RHEL_7 + endif + endif + +-BACKPORT_OBJS = symbols.o + endif + +-BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o ++BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o + + amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS)) + +diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c +index 8c697aa..85d96d3 100644 +--- a/amd/backport/kcl_fence.c ++++ b/amd/backport/kcl_fence.c +@@ -25,8 +25,14 @@ struct default_wait_cb { + struct task_struct *task; + }; + +-extern void +-(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb); ++static void ++fence_default_wait_cb(struct fence *fence, struct fence_cb *cb) ++{ ++ struct default_wait_cb *wait = ++ container_of(cb, struct default_wait_cb, base); ++ ++ wake_up_process(wait->task); ++} + + signed long + _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count, +diff --git a/amd/backport/symbols b/amd/backport/symbols +deleted file mode 100644 +index 2d3f2ee..0000000 +--- a/amd/backport/symbols ++++ /dev/null +@@ -1,3 +0,0 @@ +-SYMS="" +- +-SYMS+="fence_default_wait_cb" +-- +2.10.1 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch similarity index 79% rename from pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch rename to pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch index 05bcbf8bd06..693985ec2a2 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-dal-by-default.patch +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch @@ -1,14 +1,14 @@ -From 49d45957ddaafe13a9cc7bacd1b9665fe9c517ac Mon Sep 17 00:00:00 2001 +From 942064886eae63ed7aa0a63c07e9f175898dddf7 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 25 Aug 2016 22:17:06 -0300 -Subject: [PATCH] disable dal by default +Subject: [PATCH 14/14] disable dal by default --- amd/amdgpu/amdgpu_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c -index 793528b..9a4dfcc 100644 +index 66f3242..df62815 100644 --- a/amd/amdgpu/amdgpu_drv.c +++ b/amd/amdgpu/amdgpu_drv.c @@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1; @@ -21,5 +21,5 @@ index 793528b..9a4dfcc 100644 int amdgpu_sched_hw_submission = 2; int amdgpu_powerplay = -1; -- -2.9.3 +2.10.1 From d4da4fa5f971e8afc543cc9ba6bcf66f945e464b Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Sun, 13 Nov 2016 17:51:11 +0100 Subject: [PATCH 253/295] Geany: 1.28 -> 1.29 --- pkgs/applications/editors/geany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 961c7ba0461..c0370229580 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: let - version = "1.28"; + version = "1.29"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "0nha21rbdhl10vdpaq8d5v5fszvggl1xar555pvrnvm2y443ffpp"; + sha256 = "394307596bc908419617e4c33e93eae8b5b733dfc8d01161677b8cbd3a4fb20f"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; From feb8a692a17184124308409f89d4309073a63204 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 13 Nov 2016 17:12:04 +0000 Subject: [PATCH 254/295] getxbook: init at 1.2 --- pkgs/applications/misc/getxbook/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/getxbook/default.nix diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix new file mode 100644 index 00000000000..a77f87f6f1f --- /dev/null +++ b/pkgs/applications/misc/getxbook/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "getxbook-${version}"; + version = "1.2"; + + src = fetchurl { + url = "https://njw.me.uk/getxbook/${name}.tar.xz"; + sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; + }; + + buildInputs = [ openssl ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "A collection of tools to download books from Google Books"; + homepage = https://njw.me.uk/getxbook/; + license = licenses.isc; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cee2532076..b3a881fc9ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12994,6 +12994,8 @@ in get_iplayer = callPackage ../applications/misc/get_iplayer {}; + getxbook = callPackage ../applications/misc/getxbook {}; + gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome2) libart_lgpl; webkit = null; From 2ded9f3f7b2222b8aea5e779416f8a6ed3528009 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 13 Nov 2016 14:01:01 -0500 Subject: [PATCH 255/295] coq: Improve emacs buffer handling --- pkgs/applications/science/logic/coq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 6c421117807..f162fe4a86e 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -72,9 +72,9 @@ stdenv.mkDerivation { (when (fboundp 'get-coq-library-directory) (inherit-local-permanent coq-library-directory (get-coq-library-directory)) (coq-prog-args)) - ; Pass proof-general's coq flags to flycheck command (pretty ugly, should probably be part of PG) - (inherit-local-permanent flycheck-command-wrapper-function (lambda (cmd) - (append (funcall (default-value 'flycheck-command-wrapper-function) cmd) (coq-coqtop-prog-args coq-load-path)))) + (mapc (lambda (arg) + (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib")) + (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; From 181ed4c82bc85ec818db07047c1da522c63a31d0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Nov 2016 21:50:11 +0100 Subject: [PATCH 256/295] bmon: 3.8 -> 3.9 --- pkgs/tools/misc/bmon/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 1bbabcf5523..30412016e50 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -3,16 +3,18 @@ stdenv.mkDerivation rec { name = "bmon-${version}"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "tgraf"; repo = "bmon"; rev = "v${version}"; - sha256 = "19jv14r9j9n54bqhidw3z11z3wys1v2cagqpsxn0kjga1gkg87xs"; + sha256 = "1a4sj8pf02392zghr9wa1dc8x38fj093d4hg1fcakzrdjvrg1p2h"; }; - buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ]; + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + buildInputs = [ ncurses confuse libnl ]; preConfigure = "sh ./autogen.sh"; From 83fe4fa0bfed7d402732a6c31817daefaaed8e64 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 13 Nov 2016 20:58:50 +0000 Subject: [PATCH 257/295] e2fsprogs: 1.42.13 -> 1.43.3 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index f00a80603f9..8ff10039449 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.13"; + name = "e2fsprogs-1.43.3"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; + sha256 = "09wrn60rlqdgjkmm09yv32zxdjba2pd4ya3704bhywyln2xz33nf"; }; outputs = [ "bin" "dev" "out" "man" ]; From cbe8c3f62f8a7dde0898e112dffaf2e59c3578cd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Nov 2016 22:15:44 +0100 Subject: [PATCH 258/295] zile: 2.4.11 -> 2.4.13 --- pkgs/applications/editors/zile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 7282dc0ba20..58971b3199b 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }: stdenv.mkDerivation rec { - name = "zile-2.4.11"; + name = "zile-2.4.13"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "1k593y1xzvlj52q0gyhcx2lllws4sg84b8r9pcginjb1vjypplhz"; + sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7"; }; buildInputs = [ pkgconfig ncurses boehmgc ]; From cad9212813603cf3339dc56be974177941a8b3a7 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 12 Nov 2016 16:22:32 +0100 Subject: [PATCH 259/295] grsecurity: 4.7.10-201611011946 -> 4.8.7-201611102210 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 6 +++--- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index eda2dd26163..a1f5230ac00 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.10"; - extraMeta.branch = "4.7"; + version = "4.8.7"; + extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1p2r5d0jcrak9gxp0339g9z198x9laf09h08ck4jllhhaajrnicj"; + sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6bba248374b..3d4ba5d2b58 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.7.10"; - grrev = "201611011946"; - sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql"; + { kver = "4.8.7"; + grrev = "201611102210"; + sha256 = "1n7avhvzy4njf9wky38l99i18v1rr05bgspivnp440j8d6nh60nh"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From f7e1da5fd1d7f4256ae9b1005ba4945af96cd7c9 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Mon, 14 Nov 2016 00:27:40 +0100 Subject: [PATCH 260/295] nodejs: 4.6.0 -> 4.6.2; 6.8.0 -> 6.9.1 --- pkgs/development/web/nodejs/v4.nix | 4 ++-- pkgs/development/web/nodejs/v6.nix | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 04ea7086f74..9a142a89677 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "4.6.0"; + version = "4.6.2"; name = "${baseName}-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2"; + sha256 = "17ick2r2biyxs5zf83i8q8844fbcphm0d5g1z70mcrb86yrmi545"; }; }) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 50bd2cb672e..b91ec8df687 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -10,19 +10,12 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "6.8.0"; + version = "6.9.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq"; + sha256 = "0a87vzb33xdg8w0xi3c605hfav3c9m4ylab1436whz3p0l9qvp8b"; }; - patches = nodejs.patches ++ [ - (fetchpatch { - url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; - sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; - }) - ]; - }) From 4fd9a608747d05896ecfd4519ebaa96355b96fea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 12 Nov 2016 18:11:56 +0100 Subject: [PATCH 261/295] pythonPackages.prompt_toolkit: 1.0.3 -> 1.0.9 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23934589ccc..b4537e1222a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18963,10 +18963,10 @@ in { prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "1.0.3"; + version = "1.0.9"; src = pkgs.fetchurl { - sha256 = "18lbmmkyjf509klc3217lq0x863pfzix779zx5kp9lms1iph4pl0"; + sha256 = "172r15k9kwdw2lnajvpz1632dd16nqz1kcal1p0lq5ywdarj6rfd"; url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; }; checkPhase = '' From 7f71b89454ebfb0699ca441329f8cb36466d74ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Nov 2016 18:00:34 +0100 Subject: [PATCH 262/295] dpkg: 1.18.10 -> 1.18.14 --- pkgs/tools/package-management/dpkg/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index ce720898255..b940c574d60 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.10"; + version = "1.18.14"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1ibdidmc8nfiigadfpl3xrccrxw6hvmqiqqizy1v265s87d28m82"; + sha256 = "0njd8pdq1vx70sjlgymi79lijg05fmd8vxnqndzhjjb0a8cf920p"; }; - postPatch = '' - # dpkg tries to force some dependents like debian-devscripts to use - # -fstack-protector-strong - not (yet?) a good idea. Disable for now: - substituteInPlace scripts/Dpkg/Vendor/Debian.pm \ - --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" - ''; +# postPatch = '' +# # dpkg tries to force some dependents like debian-devscripts to use +# # -fstack-protector-strong - not (yet?) a good idea. Disable for now: +# substituteInPlace scripts/Dpkg/Vendor/Debian.pm \ +# --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" +# ''; configureFlags = [ "--disable-dselect" From e82c325bff0295ed4bbbd308fd4f99cdfd9ab515 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 14 Nov 2016 05:28:22 +0100 Subject: [PATCH 263/295] btrfs-progs: 4.8.2 -> 4.8.3 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 525aa2fec28..0e7e6fbcdec 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.2"; in +let version = "4.8.3"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; + sha256 = "1wlflrygnpndppil9g12pk184f75g9qx1lkr0x1gijigglqhr9n1"; }; buildInputs = [ From 8ef3eaeb4e531929ec29a880cb4c67f790e5eb70 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 14 Nov 2016 05:32:22 +0100 Subject: [PATCH 264/295] dpkg: remove commented old postPatch This was supposed to be removed in 7f71b89454ebfb0699ca441329f8cb36466d74ee since it doesn't appear to be needed any longer. --- pkgs/tools/package-management/dpkg/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index b940c574d60..c1d4cd319b8 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -9,13 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0njd8pdq1vx70sjlgymi79lijg05fmd8vxnqndzhjjb0a8cf920p"; }; -# postPatch = '' -# # dpkg tries to force some dependents like debian-devscripts to use -# # -fstack-protector-strong - not (yet?) a good idea. Disable for now: -# substituteInPlace scripts/Dpkg/Vendor/Debian.pm \ -# --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" -# ''; - configureFlags = [ "--disable-dselect" "--with-admindir=/var/lib/dpkg" From 3a3706c07f42685309865393cda23886cabd3ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Faille?= Date: Mon, 14 Nov 2016 00:15:57 -0500 Subject: [PATCH 265/295] vagrant: 1.8.6 -> 1.8.7 I upgrade vagrant mainly for this bug : https://github.com/mitchellh/vagrant/issues/7844 --- pkgs/development/tools/vagrant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 062873f0ccd..40e42d47861 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }: let - version = "1.8.6"; + version = "1.8.7"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -17,9 +17,9 @@ let else "system ${stdenv.system} not supported"; sha256 = { - "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; - "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; - "x86_64-darwin" = "1nd2adxwhs2vwmi5vw2z720ny4q9rpj8i4dlcdxzbyli7h8cs5mr"; + "x86_64-linux" = "10c77b643b73dd3ad7a45a89d8ab95b58b79dc10e0cf6e760fe24abc436b2fdb"; + "i686-linux" = "9d2a70f34ab65d8d2cb013917f221835432aa63cd4ef781c9fd1404cfcfe7898"; + "x86_64-darwin" = "14d68f599a620cf421838ed037f0a1c4467e1b67475deeff62330a21fda4937b"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; From 86f63755f5cc2635a428c21a2f633a0f0bb32292 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Nov 2016 17:50:29 +0100 Subject: [PATCH 266/295] ocamlPackages.batteries: 2.5.2 -> 2.5.3 --- pkgs/development/ocaml-modules/batteries/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 904a214c34f..d24c6174510 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }: -let version = "2.5.2"; in +let version = "2.5.3"; in stdenv.mkDerivation { name = "ocaml-batteries-${version}"; src = fetchzip { url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07"; + sha256 = "047v05qy0526ad52hzhfa0giczhyzbmw9fwsn6l319icq77ms6jh"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; From 328ad178588c8a2bc690f937ef60acef41162ec8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 14 Nov 2016 08:15:37 +0000 Subject: [PATCH 267/295] Update hash for xnu 3248.60.10, the tarball changed upstream, it seems. (cherry picked from commit 5ddaca179c15154efae4e5b7efea843d2c67cff8) --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 8625ac72c10..c66096c2fed 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -213,7 +213,7 @@ let ppp = applePackage "ppp" "osx-10.11.6" "1dql6r1v0vbcs04958nn2i6p31yfsxyy51jca63bm5mf0gxalk3f" {}; removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; - xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; + xnu = applePackage "xnu" "osx-10.11.6" "1vij2q5bpvp1sd2maf154mjk9g5z5hxyzcg5wcd4z7i8j5h36xnv" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; From 2ef41c34f82c646bc659af7b7043b8c0619a962b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 14 Nov 2016 09:47:31 +0100 Subject: [PATCH 268/295] pythonPackages.asgiref: 0.14.0 -> 1.0.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4537e1222a..6f0f3034271 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -645,11 +645,11 @@ in { asgiref = buildPythonPackage rec { name = "asgiref-${version}"; - version = "0.14.0"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "1ww4z14pd7g2mwz5nyvxm4rif0rsm9h8i0lwk78v58b2j45r43lc"; + sha256 = "1jg4nxjsn7nc4vd3170xd60m6syn57m6xwyyna6r68vniq8nhg7i"; }; propagatedBuildInputs = with self ; [ six ]; From 710ae1b5b3fd24679b22050c251fe81f494945a7 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 14 Nov 2016 09:48:01 +0100 Subject: [PATCH 269/295] pythonPackages.asgi_ipc: 1.1.0 -> 1.2.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f0f3034271..ecf9c607541 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -663,11 +663,11 @@ in { asgi_ipc = buildPythonPackage rec { name = "asgi_ipc-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "16q5x2cvx3rpnikmqv8l4clkfib8baqy7diy18rsmzj6hqqli3xy"; + sha256 = "03phyfj30s4sgaqfbmv38nfvx3kdmjwsh3558d2lxrf2gdrimmf9"; }; propagatedBuildInputs = with self ; [ asgiref msgpack posix_ipc ]; From 2f48d75b8dffd09135332510516c300bc4e659de Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 14 Nov 2016 09:48:23 +0100 Subject: [PATCH 270/295] pythonPackages.asgi_redis: 0.14.1 -> 1.0.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ecf9c607541..4212b0aa56c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -681,11 +681,11 @@ in { asgi_redis = buildPythonPackage rec { name = "asgi_redis-${version}"; - version = "0.14.1"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; - sha256 = "13ixh1nwgla7wm2xa42inwrd3g5lri89gd31xl62zhs8m6jmg122"; + sha256 = "1pdzxannmgb0as2x6xy0rk4xi8ygnsggpsa0z31pzpwbk6jsgwxd"; }; # Requires a redis server available From 92df69fb22d34d1387ebe2821e77e9202c777f23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 10 Nov 2016 18:34:52 +0100 Subject: [PATCH 271/295] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/5e084e904a16887236499910167127c7cd79a861. --- .../haskell-modules/hackage-packages.nix | 962 +++++++++++++++--- 1 file changed, 802 insertions(+), 160 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 728684fd028..c835d85b97e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1668,6 +1668,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "BlastHTTP_1_2_1" = callPackage + ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring + , conduit, HTTP, http-conduit, hxt, mtl, network, transformers + }: + mkDerivation { + pname = "BlastHTTP"; + version = "1.2.1"; + sha256 = "cee85e0fba0530aff57209b3d91a800db52b63c3f7e4a431a04e7a9cbd355bd5"; + libraryHaskellDepends = [ + base biocore biofasta blastxml bytestring conduit HTTP http-conduit + hxt mtl network transformers + ]; + homepage = "https://github.com/eggzilla/BlastHTTP"; + description = "Libary to interface with the NCBI blast REST interface"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Blobs" = callPackage ({ mkDerivation, base, containers, directory, HaXml, polyparse , pretty, wx, wxcore @@ -4504,8 +4522,8 @@ self: { }: mkDerivation { pname = "EntrezHTTP"; - version = "1.0.2"; - sha256 = "547f087fcc10e85550775bb02c56b9eea6d2cd32d419cdbe0ab33ad28c0335e9"; + version = "1.0.3"; + sha256 = "395c438c8b5b68fc0826e1946483d252a8936d5a91a25bf928eef113b4f9a89b"; libraryHaskellDepends = [ base biocore bytestring conduit HTTP http-conduit hxt mtl network Taxonomy text transformers @@ -5751,12 +5769,19 @@ self: { }) {}; "GPipe-GLFW" = callPackage - ({ mkDerivation, base, GLFW-b, GPipe, transformers }: + ({ mkDerivation, base, exception-transformers, GLFW-b, GPipe + , transformers + }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.2.2"; - sha256 = "b2c2764511504225550b7e03badba80ba6e264eb86bee3fcc2f7d54e2e11d652"; + version = "1.2.3"; + sha256 = "a6854b9e0a2790db5205d22035cfa6e68c8e2341918a875e851f22264a9b5c40"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; + executableHaskellDepends = [ + base exception-transformers GPipe transformers + ]; homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; @@ -13686,10 +13711,10 @@ self: { ({ mkDerivation, base, containers, mtl, old-time, random }: mkDerivation { pname = "QIO"; - version = "1.2"; - sha256 = "a6c35c08c698137e2923a1e5d5877d0349f75711d6119fcb68eb395b72b1a0f2"; + version = "1.3"; + sha256 = "e81da8f965cc031009fd9005f5cc253b83466bc0a14a2857d73c2c902ab6aba7"; libraryHaskellDepends = [ base containers mtl old-time random ]; - homepage = "http://www.cs.nott.ac.uk/~asg/QIO/"; + homepage = "https://github.com/alexandersgreen/qio-haskell"; description = "The Quantum IO Monad is a library for defining quantum computations in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -14136,8 +14161,8 @@ self: { }: mkDerivation { pname = "RNAlien"; - version = "1.2.5"; - sha256 = "ab604c7e96b0801d9dc4fa7f30335e918b485dc433efdfb1e56f4c4dc38be6cd"; + version = "1.2.6"; + sha256 = "a3a0de2cde3813f9e7f87f27f8ebf306bcb6da8da6b818624a335c329e051874"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17976,8 +18001,8 @@ self: { }: mkDerivation { pname = "XSaiga"; - version = "1.3.0.1"; - sha256 = "a913eac19f76759271bc331084773e04f4d6d16dd70190e10bd9403e51cdaad2"; + version = "1.4.0.1"; + sha256 = "f9eae0f1298cf4ab340b9a2761a1b4f80cffdf25a73ef8679c750008ba4316d2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32797,6 +32822,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitx-bitcoin_0_11_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, directory + , doctest, exceptions, hspec, http-client, http-client-tls + , http-types, microlens, microlens-th, network, QuickCheck, safe + , scientific, split, text, time + }: + mkDerivation { + pname = "bitx-bitcoin"; + version = "0.11.0.0"; + sha256 = "9f46782f5a9688b7c1681789d7165c9a21247dc5fc67807cf847bf526414ce20"; + libraryHaskellDepends = [ + aeson base bytestring deepseq exceptions http-client + http-client-tls http-types microlens microlens-th network + QuickCheck scientific split text time + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest hspec http-client + http-types microlens safe text time + ]; + homepage = "https://github.com/tebello-thejane/bitx.hs"; + description = "A Haskell library for working with the BitX bitcoin exchange"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -34410,8 +34460,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.13"; - sha256 = "5e5687cdb05065e564140d1970d737f8c8a73f57b321fb522cc7b32c96765ee7"; + version = "0.14"; + sha256 = "5cccff3f432593ad50288e66a78a115c5e030bbb3aca37c332a914d6743bcc81"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -34632,6 +34682,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "btrfs_0_1_2_1" = callPackage + ({ mkDerivation, base, bytestring, time, unix }: + mkDerivation { + pname = "btrfs"; + version = "0.1.2.1"; + sha256 = "85b28c30a369958cd86ab2d822aa874846950e2720d0b9cda5ef8cd225cf3ee0"; + libraryHaskellDepends = [ base bytestring time unix ]; + homepage = "https://github.com/redneb/hs-btrfs"; + description = "Bindings to the btrfs API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, mtl, quickcheck-instances, text @@ -37951,6 +38014,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava_0_4_5_1" = callPackage + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , containers, deepseq, hashable, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , unordered-containers, vector + }: + mkDerivation { + pname = "cassava"; + version = "0.4.5.1"; + sha256 = "7c622ae9dc647508662a1cda3fe3f6d7032786e4e3d15f8488de9e9330cf9d9f"; + libraryHaskellDepends = [ + array attoparsec base blaze-builder bytestring containers deepseq + hashable text unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hashable HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + unordered-containers vector + ]; + homepage = "https://github.com/hvr/cassava"; + description = "A CSV parsing and encoding library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-conduit" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, mtl, QuickCheck, text @@ -40387,6 +40475,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classyplate" = callPackage + ({ mkDerivation, base, template-haskell, type-list }: + mkDerivation { + pname = "classyplate"; + version = "0.1.0.0"; + sha256 = "b10d14b679f41e41755013b18b11158310bf80ff415cb369444a8f82388f6fbc"; + libraryHaskellDepends = [ base template-haskell type-list ]; + description = "Fuseable type-class based generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "clay" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { @@ -41149,6 +41248,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clustering_0_3_1" = callPackage + ({ mkDerivation, base, binary, containers, hierarchical-clustering + , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty + , tasty-hunit, tasty-quickcheck, unordered-containers, vector + }: + mkDerivation { + pname = "clustering"; + version = "0.3.1"; + sha256 = "bc69248083d4c7f7ed32b1f0971d18a52414fd0ee8bc1f05fea8e4538fe87f86"; + libraryHaskellDepends = [ + base binary containers matrices mwc-random parallel primitive + unordered-containers vector + ]; + testHaskellDepends = [ + base binary hierarchical-clustering matrices mwc-random Rlang-QQ + split tasty tasty-hunit tasty-quickcheck vector + ]; + description = "High performance clustering algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clustertools" = callPackage ({ mkDerivation, base, bio, bytestring, containers, QuickCheck , regex-compat, simpleargs @@ -43452,7 +43573,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "conduit-extra_1_1_14" = callPackage + "conduit-extra_1_1_15" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, directory, exceptions, filepath , hspec, monad-control, network, primitive, process, QuickCheck @@ -43461,8 +43582,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.14"; - sha256 = "6f3abc94f28fb577fc03383ba477fe4f2635cb14fed2f90c7520e1331dc343c6"; + version = "1.1.15"; + sha256 = "7bef29eb0db59c236519b0c5cac82183ed7741a535a57e0772aac1158e90bb8d"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -43470,7 +43591,7 @@ self: { ]; testHaskellDepends = [ async attoparsec base blaze-builder bytestring bytestring-builder - conduit exceptions hspec process QuickCheck resourcet stm + conduit directory exceptions hspec process QuickCheck resourcet stm streaming-commons text transformers transformers-base ]; homepage = "http://github.com/snoyberg/conduit"; @@ -45923,8 +46044,8 @@ self: { }: mkDerivation { pname = "crawlchain"; - version = "0.1.0.9"; - sha256 = "12bd2f1f2f9dbe5abb67a77a85db087669917381f2ddcc2b28fb5d3aa1248238"; + version = "0.1.1.4"; + sha256 = "0754ba3c874648e6c6e84c17d2d729cc3427f3cad2f1d0f37fbbcb4841020917"; libraryHaskellDepends = [ base bytestring directory HTTP network-uri split tagsoup time ]; @@ -47404,8 +47525,8 @@ self: { }: mkDerivation { pname = "cubicbezier"; - version = "0.4.0.2"; - sha256 = "b3e87a3fa4000f44121b6278d1a0b258acc2c71425fe7bf9d565fa7c36581a17"; + version = "0.5.0.0"; + sha256 = "96c2792707bc80a45a428886af97c1b4c7524a2e9ba0be13fa60d7bac879e508"; libraryHaskellDepends = [ base containers integration matrices microlens microlens-mtl microlens-th mtl vector @@ -50786,8 +50907,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.91.1"; - sha256 = "0624b718aec8e1d28fdf4d471c1236a66099555ac22858dbe49a7ee00f9b25e6"; + version = "3.91.2"; + sha256 = "16b14ad562ef5895462b59790f42d591d977e1433c4c2763a3a6a34e052e0d56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52294,7 +52415,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-contrib_1_4" = callPackage + "diagrams-contrib_1_4_0_1" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , cubicbezier, data-default, data-default-class, diagrams-core , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens @@ -52304,8 +52425,8 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.4"; - sha256 = "1b06f7d5fb4ae77a851ef2c6e6f7193418e679198b757bbd75b81798c6f8dceb"; + version = "1.4.0.1"; + sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -55761,11 +55882,11 @@ self: { ({ mkDerivation, base, drmaa, inline-c, shelly, text }: mkDerivation { pname = "drmaa"; - version = "0.1.0.1"; - sha256 = "5cb530e4c7f8cde9e8b4520ef116a44e9c5cde8191ad7f91964ca270c69ae1e7"; + version = "0.1.1"; + sha256 = "66b095d3b94ed531e2a704fba319002e8d3b7b6f9b3f68102a4b4d0f7a048567"; libraryHaskellDepends = [ base inline-c shelly text ]; librarySystemDepends = [ drmaa ]; - description = "A simple Haskell bindings to DRMAA C library"; + description = "A minimal Haskell bindings to DRMAA C library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {drmaa = null;}; @@ -58136,6 +58257,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "emailaddress_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest + , email-validate, Glob, http-api-data, opaleye, path-pieces + , persistent, postgresql-simple, product-profunctors, profunctors + , text + }: + mkDerivation { + pname = "emailaddress"; + version = "0.2.0.0"; + sha256 = "390b0aaf8fa2d3a694b812ad83fc0f26ed5c7172cc318a7d46c1fc3456d9c15c"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring email-validate http-api-data + opaleye path-pieces persistent postgresql-simple + product-profunctors profunctors text + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/emailaddress#readme"; + description = "Wrapper around email-validate library adding instances for common type classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "emailparse" = callPackage ({ mkDerivation, attoparsec, base, bytestring, either , either-unwrap, HUnit, mime, MissingH, mtl, QuickCheck, strptime @@ -61463,8 +61606,8 @@ self: { }: mkDerivation { pname = "fbmessenger-api"; - version = "0.1.2.0"; - sha256 = "94bba7cff0abeb451ca841d30ef8237c9803331e1e988a9a5f6303eb4797ab2c"; + version = "0.1.2.1"; + sha256 = "9df807a7c6ecf9dc374a17cbda52433b2567aa60753797497c7e043ef6837237"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68584,6 +68727,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_6_6" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.6.6"; + sha256 = "62f567852111da733b6feedbfb37ff561889e27af63d16df048f37a4bfeb6ab0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs directory extra filepath process terminal-size time + unix + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + homepage = "https://github.com/ndmitchell/ghcid#readme"; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -68612,8 +68784,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.5.0.2"; - sha256 = "78b95464b0101d3ffe9d23452c738bdb924c7a3737121e2a938fde863627bd8e"; + version = "0.6.0.0"; + sha256 = "35b859e5a09dd12ada9cea7c343dae75500f50cd7d5ff247d5a5868d419049d6"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -68642,8 +68814,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.5.0.0"; - sha256 = "8886b7ee0f737b23139845d5dd5c56b79e891df15f632378a064f26d404bbda8"; + version = "0.6.0.0"; + sha256 = "92dea9556a700d8473b0657f80228868194984dd9edb3405cd11f58939d81e5a"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -68655,8 +68827,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.5.0.2"; - sha256 = "4e7042c09170af65a486a87a134d40519c1cecf663956349f26729490063d878"; + version = "0.6.0.0"; + sha256 = "cf65462c0b94e3d2b21efc78dd60e90e147767a0b9719a7542f4a040dc00e60d"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -68706,6 +68878,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-promise" = callPackage + ({ mkDerivation, base, ghcjs-base, protolude }: + mkDerivation { + pname = "ghcjs-promise"; + version = "0.1.0.3"; + sha256 = "2395a17260e27ac252df2a5968de8ee5f0cf55d970c2fbe6fb27b2ccf01af81b"; + libraryHaskellDepends = [ base ghcjs-base protolude ]; + homepage = "https://github.com/vwwv/ghcjs-promise"; + description = "Bidirectional bidings to javascript's promise"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {ghcjs-base = null;}; + "ghcjs-websockets" = callPackage ({ mkDerivation, base, base64-bytestring, binary, bytestring, text }: @@ -69697,8 +69882,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.7.0"; - sha256 = "97918cba0952621a9bdb78718c824a6f43a0098f6e52335d35164a2f9c7d7afa"; + version = "0.3.7.1"; + sha256 = "6e30c1fff6bd5ebc5bea71307e3cc6e726d96487d1b66894e754dc90afe76831"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69920,8 +70105,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20161031"; - sha256 = "6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce"; + version = "6.20161111"; + sha256 = "d6ea2566b5883fce8cdbd498d5b6fc22c4ed042de6514622b8b4a59ea4564f45"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -70147,17 +70332,22 @@ self: { }) {}; "git-repair" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , exceptions, filepath, hslogger, IfElse, MissingH, mtl, network - , network-uri, optparse-applicative, process, QuickCheck, text - , time, transformers, unix, unix-compat, utf8-string + ({ mkDerivation, async, base, bytestring, Cabal, containers + , data-default, directory, exceptions, filepath, hslogger, IfElse + , MissingH, mtl, network, network-uri, optparse-applicative + , process, QuickCheck, text, time, transformers, unix, unix-compat + , utf8-string }: mkDerivation { pname = "git-repair"; - version = "1.20151215"; - sha256 = "e1e5756f7ffba86a36abcdc296e0730b2a74e0f5e7711b0b6b89a09eb6f10463"; + version = "1.20161111"; + sha256 = "4ce6447c2a2b678b7fd3f677aa29b8f1b018d5d11822bf5488df83e6c9cbaf54"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ + base bytestring Cabal data-default directory exceptions filepath + hslogger IfElse MissingH process unix unix-compat + ]; executableHaskellDepends = [ async base bytestring containers directory exceptions filepath hslogger IfElse MissingH mtl network network-uri @@ -77980,25 +78170,27 @@ self: { }) {}; "hackport" = callPackage - ({ mkDerivation, array, base, base64-bytestring, binary, bytestring - , containers, cryptohash, deepseq, directory, ed25519 - , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit - , MissingH, mtl, network, network-uri, old-locale, old-time, parsec - , pretty, process, random, regex-compat, split, stm, tar - , template-haskell, time, transformers, unix, xml, zlib + ({ mkDerivation, array, async, base, base16-bytestring + , base64-bytestring, binary, bytestring, containers, cryptohash + , deepseq, directory, ed25519, extensible-exceptions, filepath + , ghc-prim, hashable, HTTP, HUnit, MissingH, mtl, network + , network-uri, old-locale, old-time, parsec, pretty, process + , random, regex-compat, split, stm, tar, template-haskell, time + , transformers, unix, xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.5"; - sha256 = "90594dc1ff022a8fd2779548835555576df134feaf875cadca24378ece7fd97f"; + version = "0.5.1"; + sha256 = "667af1dc76c2833dd1fec935c5e61cc331be3c7b20c77ff68206177f70eccdad"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base base64-bytestring binary bytestring containers - cryptohash deepseq directory ed25519 extensible-exceptions filepath - ghc-prim hashable HTTP MissingH mtl network network-uri old-locale - old-time parsec pretty process random regex-compat split stm tar - template-haskell time transformers unix xml zlib + array async base base16-bytestring base64-bytestring binary + bytestring containers cryptohash deepseq directory ed25519 + extensible-exceptions filepath ghc-prim hashable HTTP MissingH mtl + network network-uri old-locale old-time parsec pretty process + random regex-compat split stm tar template-haskell time + transformers unix xml zlib ]; testHaskellDepends = [ base binary bytestring containers deepseq directory @@ -78429,6 +78621,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hailgun-simple" = callPackage + ({ mkDerivation, base, email-validate, hailgun, mtl, text + , transformers + }: + mkDerivation { + pname = "hailgun-simple"; + version = "0.1.0.0"; + sha256 = "30526e6b7ec6083b090e880ef6fe942cc8425d3b2700bac565e4fc6629ec2954"; + libraryHaskellDepends = [ + base email-validate hailgun mtl text transformers + ]; + homepage = "https://github.com/cdepillabout/hailgun-simple"; + description = "Easy-to-use wrapper for the hailgun package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hails" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bson, bytestring, conduit, conduit-extra @@ -85079,8 +85287,8 @@ self: { }: mkDerivation { pname = "heckle"; - version = "2.0.1.1"; - sha256 = "ba4defee459e282b1308ee66ed9148ea9bd936eae41136f82c6ffbb71981dd14"; + version = "2.0.1.5"; + sha256 = "64655fc2c10b00e31cbd8ba6ca6a339fdb184f580f56e24258ecf85605e7d97b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85281,6 +85489,8 @@ self: { pname = "heist"; version = "1.0.1.0"; sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb"; + revision = "1"; + editedCabalFile = "35cc7972ed625260f5f5885852551b9151cea0fad1c9855af09c5d82e20ae830"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -88752,6 +88962,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats_0_4_1_6" = callPackage + ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex + , vector + }: + mkDerivation { + pname = "hmatrix-gsl-stats"; + version = "0.4.1.6"; + sha256 = "1bf5bb87312525256868872a5d51e43d851b75ef549a8834052263171b91cd71"; + libraryHaskellDepends = [ + base binary hmatrix storable-complex vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "http://code.haskell.org/hmatrix-gsl-stats"; + description = "GSL Statistics interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: mkDerivation { @@ -90097,7 +90325,7 @@ self: { description = "Haskell binding to libopencc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {opencc = null;}; + }) {inherit (pkgs) opencc;}; "hopencl" = callPackage ({ mkDerivation, base, bytestring, c2hs, HUnit, OpenCL, QuickCheck @@ -92243,8 +92471,8 @@ self: { ({ mkDerivation, base, containers, directory, filepath, process }: mkDerivation { pname = "hsc2hs"; - version = "0.68"; - sha256 = "13834608a7a768e4aeeefee0a79660b2fc7c91bb83e036f0c1cb7b0543c61fda"; + version = "0.68.1"; + sha256 = "507bf174c7ab14667d452efb6b539798a944f2a5fd4cd45120a1afb8551ebe75"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92795,6 +93023,8 @@ self: { pname = "hsdev"; version = "0.2.1.0"; sha256 = "8d89f4cf2e67c2e55a94068538818e297efa07429a26b4009eff5d04724e7794"; + revision = "1"; + editedCabalFile = "2ed64491515bb9af5b43ee11a203925987797d5492a3c143a37ad6eae8a7c8f6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93153,6 +93383,28 @@ self: { }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; + "hsignal_0_2_7_5" = callPackage + ({ mkDerivation, array, base, binary, blas, bytestring, gsl + , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack + , mtl, storable-complex, vector + }: + mkDerivation { + pname = "hsignal"; + version = "0.2.7.5"; + sha256 = "0f61f820556c431c3811643cc40e49a6d6c68075da1be0b39298a41c1c7119ac"; + libraryHaskellDepends = [ + array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats + hstatistics mtl storable-complex vector + ]; + librarySystemDepends = [ blas liblapack ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "http://code.haskell.org/hsignal"; + description = "Signal processing and EEG data analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) blas; inherit (pkgs) gsl; + inherit (pkgs) liblapack;}; + "hsilop" = callPackage ({ mkDerivation, base, directory, filepath, haskeline, xdg-basedir }: @@ -94861,6 +95113,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hstatistics_0_2_5_4" = callPackage + ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random + , vector + }: + mkDerivation { + pname = "hstatistics"; + version = "0.2.5.4"; + sha256 = "e657ac9bb672b502d5dec0e8920679a5833be5bfe0a8a981b7eccc0a99a0e47b"; + libraryHaskellDepends = [ + array base hmatrix hmatrix-gsl-stats random vector + ]; + homepage = "http://code.haskell.org/hstatistics"; + description = "Statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hstats" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -99378,6 +99647,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ieee754_0_7_9" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ieee754"; + version = "0.7.9"; + sha256 = "dc1860c545d7143ea8c7e53509ac535ca2932495f0f89b2801c960295cfcdd15"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/patperry/hs-ieee754"; + description = "Utilities for dealing with IEEE floating point numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ieee754-parser" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -104056,23 +104338,17 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , filepath, http-types, lens, primitive, process, QuickCheck - , ref-tf, stm, template-haskell, text, time, transformers, vector - , wai, wai-app-static, wai-websockets, warp, websockets + ({ mkDerivation, aeson, base, bytestring, containers, filepath + , http-types, lens, primitive, process, ref-tf, stm + , template-haskell, text, time, transformers }: mkDerivation { pname = "jsaddle"; - version = "0.5.2.0"; - sha256 = "216fe089de60352956df2aa3abcb1e28861e81d1943ae1a17ac7947aad18a4fb"; + version = "0.6.0.1"; + sha256 = "16bca9ea2c962ecaeb42961b9795de61504f1c214a20d189c3e3483cdbc557e1"; libraryHaskellDepends = [ aeson base bytestring containers filepath http-types lens primitive - process ref-tf stm template-haskell text time transformers wai - wai-app-static wai-websockets warp websockets - ]; - testHaskellDepends = [ - base bytestring doctest filepath http-types process QuickCheck text - vector wai wai-app-static wai-websockets warp websockets + process ref-tf stm template-haskell text time transformers ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -104085,8 +104361,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.5.0.1"; - sha256 = "fb64e3a7924c6191e39f61845fec44acc14502b5d70e6ec3b8fd12dbadb9904a"; + version = "0.6.0.0"; + sha256 = "ef270104ea9a4eef9eca156bd2406f1ad453f1d7543e9dc3054d4549e8a85e37"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -104110,6 +104386,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsaddle-warp" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , filepath, http-types, jsaddle, lens, primitive, process + , QuickCheck, ref-tf, stm, text, time, transformers, wai + , wai-websockets, warp, websockets + }: + mkDerivation { + pname = "jsaddle-warp"; + version = "0.6.0.1"; + sha256 = "c91ba8f83df56044247ee8deadec3889346c640b069efed2b8035162e8c4cfc0"; + libraryHaskellDepends = [ + aeson base containers http-types jsaddle stm text time transformers + wai wai-websockets warp websockets + ]; + testHaskellDepends = [ + base bytestring doctest filepath jsaddle lens primitive process + QuickCheck ref-tf + ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = stdenv.lib.licenses.mit; + }) {}; + + "jsaddle-wkwebview" = callPackage + ({ mkDerivation, aeson, base, bytestring, jsaddle }: + mkDerivation { + pname = "jsaddle-wkwebview"; + version = "0.6.0.0"; + sha256 = "cedc6b826bc2b07841aed149ecf3ad3c39f5ed75964f3ea49e0ee3c445b5373c"; + libraryHaskellDepends = [ aeson base bytestring jsaddle ]; + description = "Interface for JavaScript that works with GHCJS and GHC"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsc" = callPackage ({ mkDerivation, base, jmacro, lens, template-haskell, text , transformers, webkitgtk3, webkitgtk3-javascriptcore @@ -104323,8 +104632,8 @@ self: { }: mkDerivation { pname = "json-bytes-builder"; - version = "0.4"; - sha256 = "f4f6084ee679640c97a62e0bf108fc7526fab7d69e786c881281c94e416e2e97"; + version = "0.5"; + sha256 = "b2c1114ef0a164fdf6b5c0899790fd5c91fa98b66b4a65475ba82829a5efa3ad"; libraryHaskellDepends = [ base base-prelude bytestring scientific semigroups text ]; @@ -113044,6 +113353,8 @@ self: { pname = "logging-facade"; version = "0.1.1"; sha256 = "60f9f29d54e9756825400f281101872ed87de55271e87571068838a7b3d98da2"; + revision = "1"; + editedCabalFile = "fc89005336a9b64c524183154716ebf8a26c27f8fa5730225f818f0128c2a2b2"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base hspec ]; description = "Simple logging abstraction that allows multiple back-ends"; @@ -113590,8 +113901,8 @@ self: { }: mkDerivation { pname = "lp-diagrams"; - version = "2.0.0"; - sha256 = "8ff64960d7874d4a34867d8834eac9c535b73175f0abe8743b50dfd886aabf50"; + version = "2.1.0"; + sha256 = "289129d3581ea5276c3e9a829322bc1ce38ca62094390706a5fa2c6f176c37be"; libraryHaskellDepends = [ base containers gasp graphviz labeled-tree lens mtl parsek polynomials-bernstein process reflection text typography-geometry @@ -115727,27 +116038,25 @@ self: { }) {}; "marxup" = callPackage - ({ mkDerivation, base, configurator, containers, cubicbezier - , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens - , mtl, parsek, polynomials-bernstein, pretty, process, text - , typography-geometry, vector + ({ mkDerivation, base, configurator, containers, directory, dlist + , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl + , parsek, pretty, process, text }: mkDerivation { pname = "marxup"; - version = "3.0.0.1"; - sha256 = "1675a378317ff0b1b3e2500ae8b4e62555dc85c4ab8d8f72c0d3cc227c4edf07"; + version = "3.1.0.0"; + sha256 = "21dded8147b7eed7ae4ae5a1ba10648467f77334e01351d1dff754fc59585f2f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers cubicbezier directory filepath glpk-hs graphviz - labeled-tree lens mtl polynomials-bernstein process text - typography-geometry vector + base containers directory filepath haskell-src-exts labeled-tree + lens lp-diagrams mtl process text ]; executableHaskellDepends = [ base configurator dlist parsek pretty ]; description = "Markup language preprocessor for Haskell"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -118472,15 +118781,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "modify-fasta_0_8_2_2" = callPackage + "modify-fasta_0_8_2_3" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative - , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text - , text-show + , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split + , text, text-show }: mkDerivation { pname = "modify-fasta"; - version = "0.8.2.2"; - sha256 = "76d72306f18d23ef72ec8dada391483136689f3b0a2f074ec79506759908100f"; + version = "0.8.2.3"; + sha256 = "dcee07de4f97b10c557cc3a18aee35d75caf8ef65bdc104bcd6785bfabc7465e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118489,7 +118798,7 @@ self: { ]; executableHaskellDepends = [ base containers fasta mtl optparse-applicative pipes pipes-text - split text + semigroups split text ]; homepage = "https://github.com/GregorySchwartz/modify-fasta"; description = "Modify fasta (and CLIP) files in several optional ways"; @@ -120036,6 +120345,8 @@ self: { pname = "monky"; version = "2.1.0.0"; sha256 = "044ea050aa7be67209652fb1a8cca97ad017a2effcdd41432c959a1b840439d0"; + revision = "1"; + editedCabalFile = "8dac5d11177a4374041712a519d50cb6b1fd41fffe201e77eff44f103257c446"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120981,12 +121292,12 @@ self: { }) {}; "mtl-c" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "mtl-c"; - version = "0.1"; - sha256 = "eb852379c1710af26179c148114b5269f568e3b8317b1a5716f2a07d00942159"; - libraryHaskellDepends = [ base mtl ]; + version = "0.1.1"; + sha256 = "2dd7da3c2ed207aa2e4bb5b49aa09e537cfe8c2cae241d026bc52cd091f6ea8b"; + libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/fumieval/mtl-c"; description = "Very strict CPS'd transformers"; license = stdenv.lib.licenses.bsd3; @@ -122019,6 +122330,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mustache_2_1_2" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, either, filepath, hspec, lens + , mtl, parsec, process, scientific, tar, template-haskell + , temporary, text, th-lift, unordered-containers, vector, wreq + , yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.1.2"; + sha256 = "383305b302400070f0b4f6d95f28d5b6b9ffc5d6d660421bb18d122351880f80"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory either filepath mtl + parsec scientific template-haskell text th-lift + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + homepage = "https://github.com/JustusAdam/mustache"; + description = "A mustache template parser library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mustache-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , optparse-applicative, parsec, pretty-show, scientific, text @@ -122809,15 +123151,16 @@ self: { }) {}; "nanovg" = callPackage - ({ mkDerivation, base, bytestring, containers, freeglut, GLEW + ({ mkDerivation, base, bytestring, c2hs, containers, freeglut, GLEW , hspec, inline-c, mesa, QuickCheck, text, vector }: mkDerivation { pname = "nanovg"; - version = "0.5.0.0"; - sha256 = "26fae2bd7cc430b5fa46200ae0100779f481cde5c236d33f87a78feca3678f6e"; + version = "0.5.1.0"; + sha256 = "2e76eaf2b3814d5651a6c13bea84c561d416d0138303cd3826ed89a399c6e437"; libraryHaskellDepends = [ base bytestring containers text vector ]; librarySystemDepends = [ freeglut GLEW mesa ]; + libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; homepage = "https://github.com/cocreature/nanovg-hs"; description = "Haskell bindings for nanovg"; @@ -124886,6 +125229,8 @@ self: { pname = "ngx-export"; version = "0.2.4.2"; sha256 = "547a786039d88cbb0aa6ba355c8930245232121a06b63bbf005f725bc8f93ffa"; + revision = "1"; + editedCabalFile = "d02abcd1d1c9458ec03f8966a90143cd4353a41ed4e4d42f2f55f194abc01305"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -125042,13 +125387,14 @@ self: { }) {}; "nix-eval" = callPackage - ({ mkDerivation, base, process, QuickCheck, tasty, tasty-quickcheck + ({ mkDerivation, base, hindent, process, QuickCheck, strict, tasty + , tasty-quickcheck }: mkDerivation { pname = "nix-eval"; - version = "0.1.0.2"; - sha256 = "f603ce62cd8abaab8cf09c8cf3f8b17332b0490658310eadea5242826b2ef419"; - libraryHaskellDepends = [ base process ]; + version = "0.3.3.0"; + sha256 = "4bf250e5a866b4cdfc9d9feaf6c186bfdd45ea04dcfa30dcb1131aa38d7910b1"; + libraryHaskellDepends = [ base hindent process strict ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; homepage = "http://chriswarbo.net/git/nix-eval"; description = "Evaluate Haskell expressions using Nix to get packages"; @@ -126735,15 +127081,14 @@ self: { "ombra" = callPackage ({ mkDerivation, base, gl, hashable, hashtables, transformers - , unordered-containers, vect, vector + , unordered-containers, vect }: mkDerivation { pname = "ombra"; - version = "0.1.1.0"; - sha256 = "d23a834bfd3195eadc37e9f8b443dfec9b2d223bec8ab1e7eecfb1278055de72"; + version = "0.2.0.0"; + sha256 = "d2b256d023b9124176fc132860ba2338556ad6757ad2703bcc853d0c8bc318d9"; libraryHaskellDepends = [ base gl hashable hashtables transformers unordered-containers vect - vector ]; homepage = "https://github.com/ziocroc/Ombra"; description = "Render engine"; @@ -129184,8 +129529,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.1.0"; - sha256 = "2200bed5ca32cb6fd74b53dec3e913c0298ada8434154f97c34991a1e9fe568f"; + version = "1.2.1"; + sha256 = "99e0988741a8b820ca951b2aabc35d251119c84e0a8245bf0c9b55cbe0e22121"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132346,8 +132691,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.2"; - sha256 = "8b27c1af6318c385027b1fa89c7459a0cbb274383148ec1d434c16cf8111216a"; + version = "10.4"; + sha256 = "333f39cc5317bd188435e001b3dfbe44d5b2afbc536b59e76b86fa23d827e9f7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135149,12 +135494,12 @@ self: { }) {}; "pong-server" = callPackage - ({ mkDerivation, base, hspec, network, QuickCheck }: + ({ mkDerivation, base, data-default, hspec, network, QuickCheck }: mkDerivation { pname = "pong-server"; - version = "0.0.2.0"; - sha256 = "2964703036c52a24afc15522f3ad0a5eee5ee14f3153dd35a9e3ddd7501761ad"; - libraryHaskellDepends = [ base network ]; + version = "0.0.2.1"; + sha256 = "145242c8ad672f358eb83f503ba5f92478040d943236b25010d343085f42779a"; + libraryHaskellDepends = [ base data-default network ]; testHaskellDepends = [ base hspec network QuickCheck ]; homepage = "http://github.com/RobertFischer/pong-server#readme"; description = "A simple embedded pingable server that runs in the background"; @@ -137911,8 +138256,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.2.1"; - sha256 = "757188dbf42e595e3b2eee8df4b30076ae929df636e83750ae99777612cc0cf2"; + version = "3.2.2"; + sha256 = "255082b7c52f4892e2e7aa4b5f68ffe0da897025b59e3cbcd6b8e3f3f20354fe"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141442,24 +141787,22 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bimap, binary , binary-bits, bytestring, containers, data-binary-ieee754 - , filepath, hlint, tasty, tasty-hspec, template-haskell, text + , filepath, tasty, tasty-hspec, template-haskell, temporary, text , vector }: mkDerivation { pname = "rattletrap"; - version = "0.2.0"; - sha256 = "874bb97133deed106534ab4a8b387d3bb14a7ad89504a9e2767301491bc3c077"; + version = "1.0.0"; + sha256 = "faba10702e6e41b73ab6b30d3232c1dfdf648ab5131392bdf24da81fc0f34e49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bimap binary binary-bits bytestring containers - data-binary-ieee754 text vector - ]; - executableHaskellDepends = [ - aeson aeson-casing base binary bytestring template-haskell + aeson aeson-casing base bimap binary binary-bits bytestring + containers data-binary-ieee754 template-haskell text vector ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - base binary bytestring filepath hlint tasty tasty-hspec + base bytestring filepath tasty tasty-hspec temporary ]; homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; @@ -142701,6 +143044,32 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "reduce-equations" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , haskell-src-exts, MissingH, mtl, QuickCheck, quickspec + , stringable, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "reduce-equations"; + version = "0.1.1.0"; + sha256 = "255b5757a180d042c96d55a4fc165796801b83217cebb4237a30685b68ab57ad"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers haskell-src-exts mtl QuickCheck + quickspec stringable text transformers + ]; + executableHaskellDepends = [ aeson base ]; + testHaskellDepends = [ + aeson base bytestring containers directory haskell-src-exts + MissingH QuickCheck quickspec stringable tasty tasty-quickcheck + text + ]; + homepage = "http://chriswarbo.net/projects/repos/reduce-equations.html"; + description = "Simplify a set of equations by removing redundancies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reducers" = callPackage ({ mkDerivation, array, base, bytestring, containers, fingertree , hashable, semigroupoids, semigroups, text, transformers @@ -143351,8 +143720,8 @@ self: { }: mkDerivation { pname = "regex-do"; - version = "2.2"; - sha256 = "3da54464f6cac1c8410b04ddeb6152908377adc9b9f94fc2190c69988e5d1f7b"; + version = "2.6.1"; + sha256 = "bb10301f247b92037562e7fe263e0f443c7076ca03044fe7e938e20136d6533e"; libraryHaskellDepends = [ array base bytestring regex-base regex-pcre stringsearch text ]; @@ -144913,6 +145282,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "req-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec + , http-client, req, resourcet, temporary, transformers + }: + mkDerivation { + pname = "req-conduit"; + version = "0.1.0"; + sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447"; + libraryHaskellDepends = [ + base bytestring conduit http-client req resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec req resourcet temporary + transformers + ]; + homepage = "https://github.com/mrkkrp/req-conduit"; + description = "Conduit helpers for the req HTTP client library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reqcatcher" = callPackage ({ mkDerivation, base, http-client, http-types, HUnit, lens , network, tasty, tasty-hunit, text, wai, warp, wreq @@ -147386,6 +147775,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "runtime-arbitrary" = callPackage + ({ mkDerivation, base, ifcxt, QuickCheck, template-haskell }: + mkDerivation { + pname = "runtime-arbitrary"; + version = "0.1.0.6"; + sha256 = "012e31cb21f0a057aa8a08c71834d0a5fff52c9742064fea956cd54d4e6069d1"; + libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ]; + homepage = "http://chriswarbo.net/projects/repos/runtime-arbitrary.html"; + description = "Runtime generation of Arbitrary values"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "rvar" = callPackage ({ mkDerivation, base, MonadPrompt, mtl, random-source , transformers @@ -153479,6 +153880,19 @@ self: { license = "GPL"; }) {}; + "show-prettyprint" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.1.0.2"; + sha256 = "212012543071bd0d983b003c107dbf551f44331d94ff3429cd53a51815c58c22"; + libraryHaskellDepends = [ ansi-wl-pprint base trifecta ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/quchen/show-prettyprint#readme"; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -153573,6 +153987,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shunya-library" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shunya-library"; + version = "0.1.0.4"; + sha256 = "a497607995efa72ded74f07eb4305afc1bfe9c9df0c70f9334fa062d6f6db1c6"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/shunya-library#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shunyalib" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shunyalib"; + version = "0.1.0.1"; + sha256 = "ea423c1b87c14dea651bbb6fbbaa6b6c186c7c8014e8308e176071091deb06fa"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/penguinshunya/shunyalib"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sibe" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, containers , data-default-class, deepseq, directory, hmatrix, JuicyPixels @@ -153965,8 +154403,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.6.0.0"; - sha256 = "f448eb1750229b71894a9f482981de64439093ddd72abe5a8672fbaaae135189"; + version = "0.6.0.1"; + sha256 = "df8de9fae3ee9c2226565af8f8c4171d1b79678de37e3b280cda3ca013b52944"; libraryHaskellDepends = [ base ghc-prim interlude-l lens list-t monad-control mtl transformers transformers-base @@ -155746,6 +156184,8 @@ self: { pname = "snap"; version = "1.0.0.1"; sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8"; + revision = "1"; + editedCabalFile = "81129d186348ab67fda4278bb6c8575ee7a7caed3e6069e0045f464a4ed911ab"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -155886,6 +156326,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-core_1_0_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , case-insensitive, containers, deepseq, directory, filepath + , hashable, HUnit, io-streams, lifted-base, monad-control, mtl + , old-locale, parallel, QuickCheck, random, readable, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers, transformers-base, unix-compat + , unordered-containers, vector, zlib + }: + mkDerivation { + pname = "snap-core"; + version = "1.0.1.0"; + sha256 = "f5d2a8b690e77b03626e7bd1856011fc2a13b286939176bde7b61c064aafa37c"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers directory filepath HUnit io-streams lifted-base + monad-control mtl old-locale random readable regex-posix text time + transformers transformers-base unix-compat unordered-containers + vector + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers deepseq directory filepath hashable HUnit io-streams + lifted-base monad-control mtl old-locale parallel QuickCheck random + readable regex-posix test-framework test-framework-hunit + test-framework-quickcheck2 text time transformers transformers-base + unix-compat unordered-containers vector zlib + ]; + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework (core interfaces and types)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-cors" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive , hashable, network, network-uri, snap, text, transformers @@ -157351,14 +157825,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "socket_0_6_2_0" = callPackage + "socket_0_7_0_0" = callPackage ({ mkDerivation, async, base, bytestring, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "socket"; - version = "0.6.2.0"; - sha256 = "c7aed50b213c56c03f22a537acfd794e99564f50f412ec2dcaee6dd9cd9bad1c"; + version = "0.7.0.0"; + sha256 = "84dad156fe2d792194e86c4496db648e5fe0bbb55db2070b93058d6aa5f08962"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -158099,8 +158573,8 @@ self: { }: mkDerivation { pname = "spatial-math"; - version = "0.3.1.0"; - sha256 = "0b3ab1617e6c5eb74aacdc156d5b74fd1c1ed8d416d793f7b6e2d279773573da"; + version = "0.4.0.0"; + sha256 = "e54b9ecf64ca50aea8b7d4e152bbb462672ac74518d844617bfccbf5c584c5e3"; libraryHaskellDepends = [ base binary cereal ghc-prim lens linear TypeCompose ]; @@ -161893,6 +162367,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {stripe-tests = null;}; + "strips" = callPackage + ({ mkDerivation, base, containers, hspec, mtl }: + mkDerivation { + pname = "strips"; + version = "0.1.0.0"; + sha256 = "6235efbdbf6505b9579266f047020240f642d1f3ee20e8b07480a638e0f71dce"; + revision = "1"; + editedCabalFile = "7bd62d7118703833b341b9e596a402ab58e339fe925cfc8b2650b2491fe57ae1"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ base containers hspec mtl ]; + homepage = "https://github.com/y-kamiya/strips-haskell#readme"; + description = "resolver using strips algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strive" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit @@ -165042,8 +165531,8 @@ self: { }: mkDerivation { pname = "tasty-discover"; - version = "1.0.0"; - sha256 = "a4c4a3fcf1a3908ebd8f3dbbf1714b2dd50026285f4ba73bc868f79533c0e0a0"; + version = "1.0.1"; + sha256 = "d64eb1d6f2d21de2e55fc21cb666423a35d79c4732cc7a0931d6995bbd58adbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165053,8 +165542,8 @@ self: { executableHaskellDepends = [ base directory filepath tasty-th ]; testHaskellDepends = [ base ]; homepage = "https://github.com/lwm/tasty-discover/"; - description = "Automatically discover and run Tasty framework tests"; - license = "GPL"; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.gpl3; }) {}; "tasty-expected-failure" = callPackage @@ -167504,8 +167993,8 @@ self: { ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.8.3"; - sha256 = "3baf7623d26dc96f19e30c1c54e3be19607b8bd7917ea62e8d35a2b233e4e09f"; + version = "0.9"; + sha256 = "4601bf9bc703a85a5053f507474b8d0227c3391b4ce95ef0d22f9affa0dfd9b6"; libraryHaskellDepends = [ base deepseq text vector ]; homepage = "https://github.com/jtdaugherty/text-zipper/"; description = "A text editor zipper library"; @@ -167824,6 +168313,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-expand-syns_0_4_1_0" = callPackage + ({ mkDerivation, base, containers, syb, template-haskell }: + mkDerivation { + pname = "th-expand-syns"; + version = "0.4.1.0"; + sha256 = "c198f592cc5cd644da97209f1aca0decd10e0847dd676195cb5dcb6abbbe48ea"; + libraryHaskellDepends = [ base containers syb template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "Expands type synonyms in Template Haskell ASTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-extras" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -170182,8 +170684,8 @@ self: { }: mkDerivation { pname = "torrent"; - version = "10000.0.0"; - sha256 = "5914bc8b4c32c10dc82bfe373ba73745e1e785424a052b0ede5352802aa1140c"; + version = "10000.0.1"; + sha256 = "ba7c9565f5397f7603b924a67537abe6738cdc20649ff3fb510b5731d1e18725"; libraryHaskellDepends = [ base bencode binary bytestring containers filepath syb ]; @@ -174510,12 +175012,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "unix_2_7_2_0" = callPackage + "unix_2_7_2_1" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { pname = "unix"; - version = "2.7.2.0"; - sha256 = "9444ea785b9f3547d3e04d2d42ead6bc3c2e0129390d9d41a655b18b0c322bf0"; + version = "2.7.2.1"; + sha256 = "fc05365594367779122465eee132162267c319c3679ff801f050ed30d18d099c"; libraryHaskellDepends = [ base bytestring time ]; homepage = "https://github.com/haskell/unix"; description = "POSIX functionality"; @@ -176696,6 +177198,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-binary-instances_0_2_3_3" = callPackage + ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: + mkDerivation { + pname = "vector-binary-instances"; + version = "0.2.3.3"; + sha256 = "20158b1ab2fb8dd1bad57896fa3f75bb7fbc5354020c5715e997972b6ffb9f5c"; + libraryHaskellDepends = [ base binary vector ]; + testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; + homepage = "https://github.com/bos/vector-binary-instances"; + description = "Instances of Data.Binary and Data.Serialize for vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-buffer" = callPackage ({ mkDerivation, base, deepseq, vector }: mkDerivation { @@ -176911,8 +177427,8 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-sized"; - version = "0.4.0.0"; - sha256 = "4f13d24329b6a60eebfe4d31026cf3b489c622b8afad4f30650f6664f61f1061"; + version = "0.4.0.1"; + sha256 = "88880ec1fafecf2ef3ab545c43ff3256a32dc7dd854eec4aaa0d6bd4afd7b008"; libraryHaskellDepends = [ base deepseq vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -177756,6 +178272,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_12" = 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.12"; + sha256 = "999cc0c66a6e08cada8810f91b0f08e33282361cc01182ea3774e96b13642a56"; + 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 @@ -179350,8 +179903,10 @@ self: { }: mkDerivation { pname = "warc"; - version = "0.3.0"; - sha256 = "f1a2d1f51ec16ccf21b5fd0a74a5e485d3bc207deda8ba0e6944971688b19dfc"; + version = "0.3.1"; + sha256 = "2b8752553865feee48aa41d9940bc752e8d22dd866d1ba3e901fb3f7f9dd9510"; + revision = "1"; + editedCabalFile = "194f11d8f498f829f3f9dfd4ac145d1afbf6fdde1394fa4564377bcc47acbc76"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181210,8 +181765,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.2.12"; - sha256 = "fabd09aa41a108a0d10fbb2611c3a7c0faf123103809428e235d2dbfa8080ade"; + version = "0.2.13"; + sha256 = "3c6ab5d67238b760d883c3943c3131720d0f07f4edb037c6531b9a827529f7d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181350,6 +181905,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wordpass_1_0_0_7" = callPackage + ({ mkDerivation, base, containers, deepseq, directory, filepath + , hflags, random-fu, random-source, text, unix-compat, vector + }: + mkDerivation { + pname = "wordpass"; + version = "1.0.0.7"; + sha256 = "2283d16807261457c54022ca028e3c3a7fec1df6b66b9074ddbf0f14e721d9d8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers deepseq directory filepath random-fu random-source + text unix-compat vector + ]; + executableHaskellDepends = [ + base containers deepseq directory filepath hflags random-fu + random-source text unix-compat vector + ]; + homepage = "https://github.com/mgajda/wordpass"; + description = "Dictionary-based password generator"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "words" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -184666,6 +185245,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod_1_4_3_1" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , conduit, conduit-extra, data-default, directory, fast-logger + , monad-control, monad-logger, resourcet, safe, semigroups + , shakespeare, streaming-commons, template-haskell, text + , transformers, unix, unordered-containers, wai, wai-extra + , wai-logger, warp, yaml, yesod-auth, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.4.3.1"; + sha256 = "8ad23252817780afc10aee5cf1bd862b3cf46e08aabb884477e874caa351ab21"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring conduit conduit-extra + data-default directory fast-logger monad-control monad-logger + resourcet safe semigroups shakespeare streaming-commons + template-haskell text transformers unix unordered-containers wai + wai-extra wai-logger warp yaml yesod-auth yesod-core yesod-form + yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-angular" = callPackage ({ mkDerivation, aeson, base, containers, shakespeare , template-haskell, text, transformers, yesod @@ -185409,6 +186015,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-elements" = callPackage + ({ mkDerivation, base, blaze-html, yesod-core }: + mkDerivation { + pname = "yesod-elements"; + version = "1.0"; + sha256 = "d4a0cf90675bb146acf2e7fa6e743501f20b8efc7b9beac53e6081e9c1851134"; + libraryHaskellDepends = [ base blaze-html yesod-core ]; + description = "Non template haskell markup building function in the spirit of lucid"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-eventsource" = callPackage ({ mkDerivation, base, blaze-builder, conduit, transformers, wai , wai-eventsource, wai-extra, yesod-core @@ -185510,6 +186127,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_4_9" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.4.9"; + sha256 = "bd53f12d97a89e93b15fc6b06e63fbe041301635508f933203596f349a74110d"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare + template-haskell text time transformers wai xss-sanitize yesod-core + yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + homepage = "http://www.yesodweb.com/"; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form From 7daf0b8b6ee364d5c570a9a222445c862b64becd Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 12 Nov 2016 07:41:03 -0500 Subject: [PATCH 272/295] git-annex: update sha256 for new version --- 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 e4ceff8e781..37bc19a2b21 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -43,7 +43,7 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "1np1v2x5n9dl39cbwlqbjap1j5120q4n8p18cm1884vdxidbkc01"; + sha256 = "0bi4ynhjx265yaryx7yd5wmwf44hav8bmhkj0knwynb6kpl92qp8"; rev = drv.version; }; })).overrideScope (self: super: { From 8d5ddd2563c325a2123cf1abf789b9a8d64cd74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 14 Nov 2016 10:09:04 +0100 Subject: [PATCH 273/295] telegraf: 1.0.1 -> 1.1.1 --- pkgs/servers/monitoring/telegraf/default.nix | 4 +- .../{deps-1.0.1.nix => deps-1.1.1.nix} | 76 +++++-------------- 2 files changed, 22 insertions(+), 58 deletions(-) rename pkgs/servers/monitoring/telegraf/{deps-1.0.1.nix => deps-1.1.1.nix} (87%) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 40f580ffddf..51d242d9ee3 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.0.1"; + version = "1.1.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434"; + sha256 = "02sldgbsxifd7s3awjj0a4wf7rrcz2xin02b6ygyqxyhj1kqj8i6"; }; goDeps = ./. + builtins.toPath "/deps-${version}.nix"; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix similarity index 87% rename from pkgs/servers/monitoring/telegraf/deps-1.0.1.nix rename to pkgs/servers/monitoring/telegraf/deps-1.1.1.nix index 29652a200f1..c7c2468f9a1 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.1.1.nix @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/aerospike/aerospike-client-go"; - rev = "45863b7fd8640dc12f7fdd397104d97e1986f25a"; - sha256 = "0cnsq8waah9m8m6y6cjz2sppac38aq8gsykw6d8zps0w4rjgf1aw"; + rev = "7f3a312c3b2a60ac083ec6da296091c52c795c63"; + sha256 = "05ancqplckvni9xp6xd4bv2pgkfa4v23svfcg27m8xinzi4ry219"; }; } { @@ -194,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/golang/snappy"; - rev = "427fb6fc07997f43afa32f35e850833760e489a7"; - sha256 = "1hgk9zhkfdvxrz13k0glqwlz414803zkrzd01mv6fjhpsjmcx53b"; + rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; + sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; }; } { @@ -266,17 +266,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/influxdb"; - rev = "e094138084855d444195b252314dfee9eae34cab"; - sha256 = "0vv243lqwl4rwgg1zaxlw42zfjjad4vcafaiisvvkyamnndzlkla"; - }; - } - { - goPackagePath = "github.com/influxdata/telegraf"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/telegraf"; - rev = "215f1b57d06845708e0867b11b9c853a56b00d81"; - sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434"; + rev = "fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae"; + sha256 = "07cv1gryp4a84a2acgc8k8alr7jw4jwphf12cby8jjy1br35jrbq"; }; } { @@ -289,12 +280,12 @@ }; } { - goPackagePath = "github.com/jmespath/go-jmespath"; + goPackagePath = "github.com/influxdata/wlog"; fetch = { type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d"; - sha256 = "1kgzwiyqn24ba9kgpjxlq1h746gnyby0psbjj9mp2yx0h1i0kc4z"; + url = "https://github.com/influxdata/wlog"; + rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"; + sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; }; } { @@ -374,8 +365,8 @@ fetch = { type = "git"; url = "https://github.com/nats-io/nats"; - rev = "b13fc9d12b0b123ebc374e6b808c6228ae4234a3"; - sha256 = "08cj053v0v7i9k7pn7c54hn3pm1c8g53gjhiv969hf4mk2h75q1i"; + rev = "ea8b4fd12ebb823073c0004b9f09ac8748f4f165"; + sha256 = "0i5f6n9k0d2vzdy20sqygmss5j45y72irxsi80grjsh7qkxa6vn1"; }; } { @@ -383,8 +374,8 @@ fetch = { type = "git"; url = "https://github.com/nats-io/nuid"; - rev = "4f84f5f3b2786224e336af2e13dba0a0a80b76fa"; - sha256 = "18ckzxmlg6ihjqd3r6ds8blgga58zibk52xp3lz5c7kv0hf6xa8y"; + rev = "a5152d67cf63cbfb5d992a395458722a45194715"; + sha256 = "0fphar5bz735wwa7549j31nxnm5a9dyw472gs9zafz0cv7g8np40"; }; } { @@ -405,15 +396,6 @@ sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; }; } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } { goPackagePath = "github.com/prometheus/client_golang"; fetch = { @@ -464,8 +446,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; - sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; + rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8"; + sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv"; }; } { @@ -473,17 +455,8 @@ fetch = { type = "git"; url = "https://github.com/soniah/gosnmp"; - rev = "eb32571c2410868d85849ad67d1e51d01273eb84"; - sha256 = "0f6r3q2lhnjz506blygml6mfnp22fjy586zwiixrzch0jbwl4yf6"; - }; - } - { - goPackagePath = "github.com/sparrc/aerospike-client-go"; - fetch = { - type = "git"; - url = "https://github.com/sparrc/aerospike-client-go"; - rev = "d4bb42d2c2d39dae68e054116f4538af189e05d5"; - sha256 = "0z2d3k1k6qh60aq81dr9g8y2mb19wwlx5isy0nqg0gzx3jb7v7xz"; + rev = "3fe3beb30fa9700988893c56a63b1df8e1b68c26"; + sha256 = "0a0vlxx1plqj9fi863wd8ajbzl705wgma4qk75v949azgn1yx9ib"; }; } { @@ -554,8 +527,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; - sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; + rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; + sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; }; } { @@ -567,15 +540,6 @@ sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; }; } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9"; - sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr"; - }; - } { goPackagePath = "golang.org/x/text"; fetch = { From a6d6a3972f22e47d76a286da5369d79f2e002c87 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Mon, 14 Nov 2016 10:49:40 +1100 Subject: [PATCH 274/295] plink-ng: init at 1.90b3 --- .../science/biology/plink-ng/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/science/biology/plink-ng/default.nix diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix new file mode 100644 index 00000000000..eb4d2714a12 --- /dev/null +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, zlib, openblas, darwin}: + +stdenv.mkDerivation rec { + name = "plink-ng-${version}"; + version = "1.90b3"; + + src = fetchFromGitHub { + owner = "chrchang"; + repo = "plink-ng"; + rev = "v${version}"; + sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; + }; + + buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ openblas ]) ; + + buildPhase = '' + sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h + ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""} + make ZLIB=-lz ${if stdenv.isDarwin then "" else "BLASFLAGS=-lopenblas"} -f Makefile.std + ''; + + installPhase = '' + mkdir -p $out/bin + cp plink $out/bin + ''; + + meta = { + description = "A comprehensive update to the PLINK association analysis toolset"; + homepage = "https://www.cog-genomics.org/plink2"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a881fc9ad..4c2690d1c65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16350,6 +16350,8 @@ in paml = callPackage ../applications/science/biology/paml { }; plink = callPackage ../applications/science/biology/plink/default.nix { }; + + plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; samtools = callPackage ../applications/science/biology/samtools/default.nix { }; From dbee36359179186a62d540b6ad83257d6daa366a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:05:25 +0100 Subject: [PATCH 275/295] pythonPackages.boost: version of boost for specific interpreter Several Python packages require boost. pkgs.boost is built with Python 2.7 and therefore libboost_python.so was compatible only with 2.7. --- pkgs/top-level/python-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4212b0aa56c..999d10c3dc6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2200,6 +2200,10 @@ in { }; }; + # Build boost for this specific Python version + # TODO: use separate output for libboost_python.so + boost = pkgs.boost.override {inherit python;}; + buttersink = buildPythonPackage rec { name = "buttersink-0.6.8"; @@ -19990,7 +19994,7 @@ in { sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; - buildInputs = with self; [ pkgs.boost pkgs.freetype pkgs.ftgl pkgs.mesa ]; + buildInputs = with self; [ boost pkgs.freetype pkgs.ftgl pkgs.mesa ]; meta = { description = "Python bindings for FTGL (FreeType for OpenGL)"; From 6c7d501a7bd8737b72de648344cc473b680fe9a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:08:57 +0100 Subject: [PATCH 276/295] pythonPackages.pyopencl: init at 2016.2 --- .../python-modules/pyopencl/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pyopencl/default.nix diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix new file mode 100644 index 00000000000..d09f38914b5 --- /dev/null +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, Mako +, pytest +, numpy +, cffi +, pytools +, decorator +, appdirs +, six +, opencl-headers +, opencl-icd +}: + +buildPythonPackage rec { + pname = "pyopencl"; + version = "2016.2"; + name = "${pname}-${version}"; + + buildInputs = [ pytest opencl-headers opencl-icd ]; + + propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1b94540cf59ea71a3ef234a8f1d0eb2b4633c112f0f554fb69e52b4a0337d82b"; + }; + + # gcc: error: pygpu_language_opencl.cpp: No such file or directory + doCheck = false; + + meta = { + description = "Python wrapper for OpenCL"; + homepage = https://github.com/pyopencl/pyopencl; + license = stdenv.lib.licenses.mit; + maintainer = stdenv.lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 999d10c3dc6..883b2df3fb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20128,6 +20128,8 @@ in { }; }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyrr = buildPythonPackage rec { name = "pyrr-${version}"; version = "0.7.2"; From 450edd4b7276153231f6939686155fb3013bbe9f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:16:18 +0100 Subject: [PATCH 277/295] python-packages.nix: make pythonAtLeast and pythonOlder available --- 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 883b2df3fb1..7f119a1edff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29,7 +29,7 @@ let in { - inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; # helpers From dc1b2ed11fd6e2627369f7c903d7a2f528b17d73 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:18:54 +0100 Subject: [PATCH 278/295] pythonPackages.llvmlite: 0.13.0 -> 0.14.0 and move expression in separate file. --- .../python-modules/llvmlite/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 40 +-------------- 2 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 pkgs/development/python-modules/llvmlite/default.nix diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix new file mode 100644 index 00000000000..65d5c95114d --- /dev/null +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, python +, llvm +, pythonOlder +, isPyPy +, enum34 +}: + +buildPythonPackage rec { + pname = "llvmlite"; + name = "${pname}-${version}"; + version = "0.14.0"; + + disabled = isPyPy; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1ybgsmvamj0i51dvrn268ziczpm63y2h4sgagf6fkgkpydrr01g8"; + }; + + propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + + # Disable static linking + # https://github.com/numba/llvmlite/issues/93 + patchPhase = '' + substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" + + substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" + ''; + # Set directory containing llvm-config binary + preConfigure = '' + export LLVM_CONFIG=${llvm}/bin/llvm-config + ''; + checkPhase = '' + ${python.executable} runtests.py + ''; + + __impureHostDeps = stdenv.lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + + passthru.llvm = llvm; + + meta = { + description = "A lightweight LLVM python binding for writing JIT compilers"; + homepage = "http://llvmlite.pydata.org/"; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f119a1edff..4a579ecda32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13661,45 +13661,7 @@ in { }; }; - llvmlite = let - llvm = pkgs.llvm_38; - in buildPythonPackage rec { - name = "llvmlite-${version}"; - version = "0.13.0"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/llvmlite/${name}.tar.gz"; - sha256 = "f852be3391acb2e77ef484c5d0ff90e7cf2821dcf9575e358a1f08c274c582eb"; - }; - - propagatedBuildInputs = with self; [ llvm ] ++ optional (pythonOlder "3.4") enum34; - - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - patchPhase = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${llvm}/bin/llvm-config - ''; - checkPhase = '' - ${self.python.executable} runtests.py - ''; - - __impureHostDeps = optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - - meta = { - description = "A lightweight LLVM python binding for writing JIT compilers"; - homepage = "http://llvmlite.pydata.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; - }; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_38;}; lockfile = buildPythonPackage rec { name = "lockfile-${version}"; From 6435a85c3fdc61f798c42076ffafaafabb98d724 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:20:13 +0100 Subject: [PATCH 279/295] pythonPackages.numba: 0.27.0 -> 0.29.0 and move expression in a separate file. --- .../python-modules/numba/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 36 +--------------- 2 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/python-modules/numba/default.nix diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix new file mode 100644 index 00000000000..1feb9e009e2 --- /dev/null +++ b/pkgs/development/python-modules/numba/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchurl +, python +, buildPythonPackage +, isPy27 +, isPy33 +, isPy3k +, numpy +, llvmlite +, argparse +, funcsigs +, singledispatch +, libcxx +}: + +buildPythonPackage rec { + version = "0.29.0"; + name = "numba-${version}"; + + src = fetchurl { + url = "mirror://pypi/n/numba/${name}.tar.gz"; + sha256 = "00ae294f3fb3a99e8f0a9f568213cebed26675bacc9c6f8d2e025b6d564e460d"; + }; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + + propagatedBuildInputs = [numpy llvmlite argparse] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + + # Copy test script into $out and run the test suite. + checkPhase = '' + cp runtests.py $out/${python.sitePackages}/numba/runtests.py + ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py + ''; + # ImportError: cannot import name '_typeconv' + doCheck = false; + + meta = { + homepage = http://numba.pydata.org/; + license = stdenv.lib.licenses.bsd2; + description = "Compiling Python code using LLVM"; + maintainers = with stdenv.lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a579ecda32..dde6ea28672 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15734,41 +15734,7 @@ in { }; }; - numba = buildPythonPackage rec { - version = "0.27.0"; - name = "numba-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "5fc8069cdc839b8b44ac6c54260902f60cbd77bd027b20999970a81cce7008ba"; - }; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - - propagatedBuildInputs = with self; [numpy llvmlite argparse] ++ optional (!isPy3k) funcsigs ++ optional (isPy27 || isPy33) singledispatch; - # Future work: add Cuda support. - #propagatedBuildInputs = with self; [numpy llvmlite argparse pkgs.cudatoolkit6]; - #buildPhase = '' - # export NUMBAPRO_CUDA_DRIVER= - # export NUMBAPRO_NVVM=${pkgs.cudatoolkit6} - # export NUMBAPRO_LIBDEVICE= - #''; - - # Copy test script into $out and run the test suite. - checkPhase = '' - cp runtests.py $out/${python.sitePackages}/numba/runtests.py - ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py - ''; - # ImportError: cannot import name '_typeconv' - doCheck = false; - - meta = { - homepage = http://numba.pydata.org/; - license = licenses.bsd2; - description = "Compiling Python code using LLVM"; - maintainers = with maintainers; [ fridh ]; - }; - }; + numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { version = "2.5.2"; From 5cfcbd89e91c1a43a9556ad065222e4f02155eb2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:21:28 +0100 Subject: [PATCH 280/295] pythonPackages.pytools: fix tests --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dde6ea28672..c772e34b379 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8973,15 +8973,18 @@ in { sha256 = "0g5w1cira1bl9f2ji11cbr9daj947nrfydydymjp4bbxbpl2jnaq"; }; - doCheck = pythonOlder "3.5"; - buildInputs = with self; [ decorator appdirs six numpy + pytest ]; + checkPhase = '' + py.test -k 'not test_persistent_dict' + ''; + meta = { homepage = https://github.com/inducer/pytools/; description = "Miscellaneous Python lifesavers."; From 05ca19c679d29749e7dbdc2fe6d2af005872102f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:22:21 +0100 Subject: [PATCH 281/295] pythonPackages.pycuda: 2016.1 -> 2016.1.2 and disable tests because they require an available cuda device. --- .../python-modules/pycuda/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index d97a23746fd..471ffbe6c35 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, fetchurl , fetchFromGitHub , boost , numpy @@ -12,6 +13,7 @@ , mkDerivation , stdenv , pythonOlder +, isPy35 }: let compyte = import ./compyte.nix { @@ -19,22 +21,21 @@ let }; in buildPythonPackage rec { - name = "pycuda-${version}"; - version = "2016.1"; + pname = "pycuda"; + version = "2016.1.2"; + name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "inducer"; - repo = "pycuda"; - rev = "609817e22c038249f5e9ddd720b3ca5a9d58ca11"; - sha256 = "0kg6ayxsw2gja9rqspy6z8ihacf9jnxr8hzywjwmj1izkv24cff7"; - }; + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "0dvf1cnrlvmrc7i100n2ndrnd7fjm7aq3wpmk2nx5h7hwb3xmnx7"; + }; preConfigure = '' findInputs ${boost.dev} boost_dirs propagated-native-build-inputs export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib - + ${python.interpreter} configure.py --boost-inc-dir=$BOOST_INCLUDEDIR \ --boost-lib-dir=$BOOST_LIBRARYDIR \ --no-use-shipped-boost \ @@ -45,7 +46,12 @@ buildPythonPackage rec { ln -s ${compyte} $out/${python.sitePackages}/pycuda/compyte ''; - doCheck = pythonOlder "3.5"; + # Requires access to libcuda.so.1 which is provided by the driver + doCheck = false; + + checkPhase = '' + py.test + ''; propagatedBuildInputs = [ numpy From e23724dc96b7f42b4e44dd7632503db1bb0e80b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 12:23:53 +0100 Subject: [PATCH 282/295] pythonPackages.reikna: init at 0.6.7 --- .../python-modules/reikna/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/reikna/default.nix diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix new file mode 100644 index 00000000000..14ebe52eae9 --- /dev/null +++ b/pkgs/development/python-modules/reikna/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchurl +, buildPythonPackage +, sphinx +, pytestcov +, pytest +, Mako +, numpy +, funcsigs +, withCuda ? false, pycuda +, withOpenCL ? true, pyopencl +}: + +buildPythonPackage rec { + pname = "reikna"; + name = "${pname}-${version}"; + version = "0.6.7"; + + src = fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "810b349eb9339aa0d13bca99a3d8a380972708474b8c0990d188ec6074358d62"; + }; + + buildInputs = [ sphinx pytestcov pytest ]; + + propagatedBuildInputs = [ Mako numpy funcsigs ] + ++ stdenv.lib.optional withCuda pycuda + ++ stdenv.lib.optional withOpenCL pyopencl; + + checkPhase = '' + py.test + ''; + + # Requires device + doCheck = false; + + meta = { + description = "GPGPU algorithms for PyCUDA and PyOpenCL"; + homepage = http://github.com/fjarri/reikna; + license = stdenv.lib.licenses.mit; + maintainer = stdenv.lib.maintainers.fridh; + + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c772e34b379..7f4d4594ca4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21852,6 +21852,8 @@ in { }; }; + reikna = callPackage ../development/python-modules/reikna { }; + repocheck = buildPythonPackage rec { name = "repocheck-2015-08-05"; disabled = isPy26 || isPy27; From 26abed22223d7e882ddd091a943787cbab37c771 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 3 Nov 2016 18:31:57 +0100 Subject: [PATCH 283/295] ecasound: init at 2.9.1 --- pkgs/applications/audio/ecasound/default.nix | 32 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/audio/ecasound/default.nix diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix new file mode 100644 index 00000000000..36ce4049022 --- /dev/null +++ b/pkgs/applications/audio/ecasound/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, alsaLib +, audiofile +, libjack2 +, liblo +, liboil +, libsamplerate +, libsndfile +, lilv +, lv2 +}: + +# TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log. + +stdenv.mkDerivation rec { + name = "ecasound-${version}"; + version = "2.9.1"; + + src = fetchurl { + url = "http://ecasound.seul.org/download/ecasound-${version}.tar.gz"; + sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r"; + }; + + buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ]; + + meta = { + description = "Ecasound is a software package designed for multitrack audio processing"; + license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; + homepage = http://nosignal.fi/ecasound/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f56..10a13b31f28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -824,6 +824,8 @@ in dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; + ecasound = callPackage ../applications/audio/ecasound { }; + edac-utils = callPackage ../os-specific/linux/edac-utils { }; eggdrop = callPackage ../tools/networking/eggdrop { }; From 811e59f099e76c9a6ff2ec723096064c66afc4a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 3 Nov 2016 18:32:29 +0100 Subject: [PATCH 284/295] ssr: init at 2016-11-03 --- .../audio/soundscape-renderer/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/audio/soundscape-renderer/default.nix diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix new file mode 100644 index 00000000000..c6609814ea0 --- /dev/null +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchgit +, autoreconfHook +, help2man +, pkgconfig +, libsndfile +, fftwFloat +, libjack2 +, libxml2 +, qt4 +, boost +, ecasound +, glibcLocales +, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +}: + +stdenv.mkDerivation rec { + name = "soundscape-renderer-unstable-${version}"; + + version = "2016-11-03"; + + src = fetchgit { + url = https://github.com/SoundScapeRenderer/ssr; + rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; + sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7"; + }; + + # Without it doesn't find all of the boost libraries. + BOOST_LIB_DIR="${boost}/lib"; + + LC_ALL = "en_US.UTF-8"; + + buildInputs = [ autoreconfHook boost boost.dev ecasound mesa help2man pkgconfig libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; + + # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 + # 2) Make it find ecasound headers + # 3) Fix locale for help2man + prePatch = '' + substituteInPlace configure.ac --replace 'git describe ||' 'git describe 2> /dev/null ||'; + substituteInPlace configure.ac --replace '/{usr,opt}/{,local/}' '${ecasound}/' + substituteInPlace man/Makefile.am --replace '--locale=en' '--locale=en_US.UTF-8' + ''; + + meta = { + homepage = http://spatialaudio.net/ssr/; + description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; + license = stdenv.lib.licenses.gpl3; + maintainer = stdenv.lib.maintainers.fridh; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a13b31f28..02c064fa61e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14601,6 +14601,8 @@ in git = gitMinimal; }; + ssr = callPackage ../applications/audio/soundscape-renderer {}; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; From 215a41355b12d016b0f2553a9560626c79ebb94b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 14 Nov 2016 12:21:10 +0000 Subject: [PATCH 285/295] terraform: 0.7.9 -> 0.7.10 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 6d5c04e601e..1c5f13ad897 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.9"; + version = "0.7.10"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0fqd6k88zhhq0ncnpr3y3k55wrxpd75fizs54cjgjd873b90sm8h"; + sha256 = "187hcnrjdysqzjlkj73fpvhi90zmkfkz1fy7g4fx78i1zxqiabz8"; }; postInstall = '' From f82b7768cd5751a8ee3cff4a1f37cab1d1d62f8a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 14 Nov 2016 13:53:03 +0100 Subject: [PATCH 286/295] libpsl: 0.14.0 -> 0.15.0 --- pkgs/development/libraries/libpsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index e4cb2e61eeb..be77b383cd9 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -11,14 +11,14 @@ let owner = "publicsuffix"; }; - libVersion = "0.14.0"; + libVersion = "0.15.0"; in stdenv.mkDerivation rec { name = "libpsl-${version}"; version = "${libVersion}-list-${listVersion}"; src = fetchFromGitHub { - sha256 = "1nqawm41rxaxddrqnwhxw1cgcpf74q6jw756sh0x8zbsjc73mbfq"; + sha256 = "1n8vg8pslpgin84ygb0s0nqfljml32l5bv5fyc8ysnpbdsj6gxkb"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; From 7981d3437de6a3fecd36f722bc882ceb2cf0eb64 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 14 Nov 2016 14:14:52 +0100 Subject: [PATCH 287/295] aha: 0.4.9 -> 0.4.10.1 --- pkgs/tools/text/aha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index b83f97a4b8d..6bccd16edf7 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.9"; + version = "0.4.10.1"; src = fetchFromGitHub { - sha256 = "0g7awnh7z4cj3kkmldg6kl8dsvdvs46vbf273crmpswk0r4hzj80"; + sha256 = "0j4jn8c0bhvbmpp2ynkw1y0l5dm49s7g5rmsvdxh0g1sjai161ss"; rev = version; repo = "aha"; owner = "theZiz"; From 91ae568ec75d4ac2f483554c0259736aea96230e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Nov 2016 09:36:06 -0500 Subject: [PATCH 288/295] broadcom_sta: Fix hash --- pkgs/os-specific/linux/broadcom-sta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index c3842959883..5814c184e66 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { (fetchpatch { name = "linux-4.8.patch"; url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms"; - sha256 = "0s8apf6l3qm9kln451g4z0pr13f4jdgyval1vfl2abg0dqc5xfhs"; + sha256 = "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax"; }) ]; From a87c8ad05f5399cd6cdfda47348d1673c6cd637f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Nov 2016 09:40:27 -0500 Subject: [PATCH 289/295] linux: 4.9-rc4 -> 4.9-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index bb79494e171..5838d2db1fa 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc4"; - modDirVersion = "4.9.0-rc4"; + version = "4.9-rc5"; + modDirVersion = "4.9.0-rc5"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "09w3milw95916g1mc19phw6w51kma7f1i3dfjar2ijnrcri3hvmx"; + sha256 = "0fpfczs13dwsy6nf0a0838399l34pxwxxljs472scvx9jbarm9j9"; }; features.iwlwifi = true; From 52d4599b5291bec64ed3927aa29e06bb3376e5d9 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 14 Nov 2016 16:21:38 +0100 Subject: [PATCH 290/295] Revert "Update hash for xnu 3248.60.10, the tarball changed upstream, it seems." This reverts commit 328ad178588c8a2bc690f937ef60acef41162ec8. --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index c66096c2fed..8625ac72c10 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -213,7 +213,7 @@ let ppp = applePackage "ppp" "osx-10.11.6" "1dql6r1v0vbcs04958nn2i6p31yfsxyy51jca63bm5mf0gxalk3f" {}; removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; - xnu = applePackage "xnu" "osx-10.11.6" "1vij2q5bpvp1sd2maf154mjk9g5z5hxyzcg5wcd4z7i8j5h36xnv" {}; + xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; From 2c2b6ae45564d27b3297807cedde14bc3314401a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Nov 2016 17:35:35 +0100 Subject: [PATCH 291/295] google-fonts: Add a check to ensure that there are no duplicate font names Issue #20282. --- pkgs/data/fonts/google-fonts/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index ee637f880ad..fd3425e3c7c 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { ofl/mrbedford \ ofl/siamreap \ ofl/terminaldosislight + + if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then + echo "error: duplicate font names" + exit 1 + fi ''; installPhase = '' From 870fc844126d7fec49bfff4f82fcc852248ffd92 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 11 Nov 2016 20:06:22 +0100 Subject: [PATCH 292/295] python: adding (python*Full) aliases for all versions of cpython --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ffd389caa1..6cb32f3ce4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5556,7 +5556,13 @@ in # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override{x11Support=true;}; python2Full = python2.override{x11Support=true;}; + python26Full = python26.override{includeModules=true;self=python26Full;}; + python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; + python33Full = python33.override{x11Support=true;}; + python34Full = python34.override{x11Support=true;}; + python35Full = python35.override{x11Support=true;}; + python36Full = python36.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python2Packages; From 5a0665846ed4f3c742b3ff1c7336b0b387f180b7 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Mon, 14 Nov 2016 20:36:59 +0000 Subject: [PATCH 293/295] plover: move out of python-packages.nix --- pkgs/applications/misc/plover/default.nix | 26 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 27 ----------------------- 3 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 pkgs/applications/misc/plover/default.nix diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix new file mode 100644 index 00000000000..b8fa38268c3 --- /dev/null +++ b/pkgs/applications/misc/plover/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, python27Packages, wmctrl }: + +python27Packages.buildPythonPackage rec { + name = "plover-${version}"; + version = "3.1.0"; + + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; + + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; + }; + + # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 + postPatch = '' + substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" + ''; + + buildInputs = with python27Packages; [ pytest mock ]; + propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi + wxPython xlib wmctrl ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cb32f3ce4d..e16ab3922dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14158,6 +14158,8 @@ in gtksharp = gtk-sharp-2_0; }; + plover = callPackage ../applications/misc/plover { }; + plugin-torture = callPackage ../applications/audio/plugin-torture { }; pmenu = callPackage ../applications/misc/pmenu { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3b95a5f896c..1e84a6a9a39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14878,33 +14878,6 @@ in { }; }; - - plover = buildPythonPackage rec { - name = "plover-${version}"; - version = "3.1.0"; - disabled = !isPy27; - - meta = { - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; - }; - - src = pkgs.fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; - }; - - # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 - postPatch = '' - substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" - ''; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ six setuptools pyserial appdirs hidapi - wxPython xlib pkgs.wmctrl ]; - }; - pygal = buildPythonPackage rec { version = "2.0.10"; name = "pygal-${version}"; From aa23309a39794cd769d473cc8616dc96b872e3f0 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 14 Nov 2016 13:30:28 -0800 Subject: [PATCH 294/295] Add a patch for cctools to work with Xcode 8 --- .../darwin/cctools/ld-tbd-v2.patch | 98 +++++++++++++++++++ pkgs/os-specific/darwin/cctools/port.nix | 1 + 2 files changed, 99 insertions(+) create mode 100644 pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch new file mode 100644 index 00000000000..9aae2be1d03 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch @@ -0,0 +1,98 @@ +diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +index 09c0e12..ac6b085 100644 +--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp ++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +@@ -187,6 +187,7 @@ struct DynamicLibrary { + ld::File::ObjcConstraint _objcConstraint; + Options::Platform _platform; + std::vector _allowedClients; ++ std::vector _allowableClients; + std::vector _reexportedLibraries; + std::vector _symbols; + std::vector _classes; +@@ -246,6 +247,14 @@ class TBDFile { + }); + } + ++ void parseAllowableClients(DynamicLibrary& lib) { ++ if ( !hasOptionalToken("allowable-clients") ) ++ return; ++ parseFlowSequence([&](Token name) { ++ lib._allowableClients.emplace_back(name); ++ }); ++ } ++ + void parseReexportedDylibs(DynamicLibrary& lib) { + if ( !hasOptionalToken("re-exports") ) + return; +@@ -306,6 +315,21 @@ class TBDFile { + return false; + } + ++ void skipUUIDs(DynamicLibrary& lib) { ++ expectToken("uuids"); ++ while ( true ) { ++ auto token = next(); ++ if ( token == "]" ) ++ break; ++ } ++ } ++ ++ void skipParentUmbrella(DynamicLibrary& lib) { ++ if (!hasOptionalToken("parent-umbrella")) ++ return; ++ next(); ++ } ++ + void parsePlatform(DynamicLibrary& lib) { + expectToken("platform"); + +@@ -410,6 +434,7 @@ class TBDFile { + } + + parseAllowedClients(lib); ++ parseAllowableClients(lib); + parseReexportedDylibs(lib); + parseSymbols(lib); + if ( !hasOptionalToken("-") ) +@@ -455,17 +480,21 @@ class TBDFile { + return result.front(); + } + +- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { ++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { + auto selectedArchName = parseAndSelectArchitecture(requestedArchName); + if (selectedArchName.empty()) + throwf("invalid arch"); + ++ if(isTbdV2) ++ skipUUIDs(lib); + parsePlatform(lib); + parseInstallName(lib); + parseCurrentVersion(lib); + parseCompatibilityVersion(lib); + parseSwiftVersion(lib); + parseObjCConstraint(lib); ++ if(isTbdV2) ++ skipParentUmbrella(lib); + parseExportsBlock(lib, selectedArchName); + } + +@@ -476,7 +505,8 @@ public: + _tokenizer.reset(); + DynamicLibrary lib; + expectToken("---"); +- parseDocument(lib, requestedArchName); ++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); ++ parseDocument(lib, requestedArchName, isTbdV2); + expectToken("..."); + return lib; + } +@@ -486,6 +516,7 @@ public: + auto token = next(); + if ( token != "---" ) + return false; ++ hasOptionalToken("!tapi-tbd-v2"); + return !parseAndSelectArchitecture(requestedArchName).empty(); + } + diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 2f13277d70c..41fb090710c 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -25,6 +25,7 @@ let ] ++ stdenv.lib.optionals stdenv.isDarwin [ # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. ./undo-unknown-triple.patch + ./ld-tbd-v2.patch ]; enableParallelBuilding = true; From 04121437bea46a74c71eaca507007a4e9c9ac20a Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Mon, 14 Nov 2016 12:26:59 +1100 Subject: [PATCH 295/295] singularity: init 2.2 --- lib/maintainers.nix | 1 + .../virtualization/singularity/default.nix | 25 +++++ .../singularity-tools/default.nix | 100 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 130 insertions(+) create mode 100644 pkgs/applications/virtualization/singularity/default.nix create mode 100644 pkgs/build-support/singularity-tools/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b15f4542fb5..73e23170d82 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -198,6 +198,7 @@ jagajaga = "Arseniy Seroka "; javaguirre = "Javier Aguirre "; jb55 = "William Casarin "; + jbedo = "Justin Bedő "; jcumming = "Jack Cummings "; jefdaj = "Jeffrey David Johnson "; jfb = "James Felix Black "; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix new file mode 100644 index 00000000000..e318a0b64d7 --- /dev/null +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "singularity-${version}"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "singularityware"; + repo = "singularity"; + rev = version; + sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px"; + }; + + buildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = http://singularity.lbl.gov/; + description = "Designed around the notion of extreme mobility of compute and reproducible science, Singularity enables users to have full control of their operating system environment"; + license = "BSD license with 2 modifications"; + platforms = platforms.linux; + maintainers = [ maintainers.jbedo ]; + }; +} diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix new file mode 100644 index 00000000000..3c27b9fc1ad --- /dev/null +++ b/pkgs/build-support/singularity-tools/default.nix @@ -0,0 +1,100 @@ +{ runCommand +, stdenv +, storeDir ? builtins.storeDir +, writeScript +, singularity +, writeReferencesToFile +, bash +, vmTools +, gawk +, utillinux +, e2fsprogs +, squashfsTools }: + +rec { + shellScript = name: text: + writeScript name '' + #!${stdenv.shell} + set -e + ${text} + ''; + + mkLayer = { + name, + contents ? [], + }: + runCommand "singularity-layer-${name}" { + inherit contents; + } '' + mkdir $out + for f in $contents ; do + cp -ra $f $out/ + done + ''; + + buildImage = { + name, + contents ? [], + diskSize ? 1024, + runScript ? "#!${stdenv.shell}\nexec /bin/sh", + runAsRoot ? null, + extraSpace ? 0 + }: + let layer = mkLayer { + inherit name; + contents = contents ++ [ bash runScriptFile ]; + }; + runAsRootFile = shellScript "run-as-root.sh" runAsRoot; + runScriptFile = shellScript "run-script.sh" runScript; + result = vmTools.runInLinuxVM ( + runCommand "singularity-image-${name}.img" { + buildInputs = [ singularity e2fsprogs utillinux gawk ]; + layerClosure = writeReferencesToFile layer; + preVM = vmTools.createEmptyImage { + size = diskSize; + fullName = "singularity-run-disk"; + }; + } + '' + rm -rf $out + mkdir disk + mkfs -t ext3 -b 4096 /dev/${vmTools.hd} + mount /dev/${vmTools.hd} disk + cd disk + + # Run root script + ${stdenv.lib.optionalString (runAsRoot != null) '' + mkdir -p ./${storeDir} + mount --rbind ${storeDir} ./${storeDir} + unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile} + umount -R ./${storeDir} + ''} + + # Build /bin and copy across closure + mkdir -p bin nix/store + for f in $(cat $layerClosure) ; do + cp -ar $f ./$f + for f in $f/bin/* ; do + if [ ! -e bin/$(basename $f) ] ; then + ln -s $f bin/ + fi + done + done + + # Create runScript + ln -s ${runScriptFile} singularity + + # Size calculation + cd .. + umount disk + size=$(resize2fs -P /dev/${vmTools.hd} | awk '{print $NF}') + mount /dev/${vmTools.hd} disk + cd disk + + export PATH=$PATH:${e2fsprogs}/bin/ + singularity create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out + tar -c . | singularity import $out + ''); + + in result; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a881fc9ad..63c725e2625 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -282,6 +282,8 @@ in pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; + singularity-tools = callPackage ../build-support/singularity-tools { }; + srcOnly = args: callPackage ../build-support/src-only args; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; @@ -13253,6 +13255,8 @@ in slack = callPackage ../applications/networking/instant-messengers/slack { }; + singularity = callPackage ../applications/virtualization/singularity { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; wlc = callPackage ../development/libraries/wlc { };