diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-28 08:32:03 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-28 08:32:03 +0200 |
| commit | 36a6746f2178141465761ce36de888389bc2968a (patch) | |
| tree | 5c04c72e71624722e8f004b407712ff297c73ead | |
| parent | 8809ebe42a6e2ebd4fd8e742efbebb343f422572 (diff) | |
| parent | 2a56ea3593aa0702a61313572c2211ef947f4d1f (diff) | |
| download | nixlib-36a6746f2178141465761ce36de888389bc2968a.tar nixlib-36a6746f2178141465761ce36de888389bc2968a.tar.gz nixlib-36a6746f2178141465761ce36de888389bc2968a.tar.bz2 nixlib-36a6746f2178141465761ce36de888389bc2968a.tar.lz nixlib-36a6746f2178141465761ce36de888389bc2968a.tar.xz nixlib-36a6746f2178141465761ce36de888389bc2968a.tar.zst nixlib-36a6746f2178141465761ce36de888389bc2968a.zip | |
Merge master into staging-next
153 files changed, 3460 insertions, 1011 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc57313c8780..3171681c0dbf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1769,7 +1769,7 @@ name = "Frede Emil"; }; freepotion = { - email = "freepotion@protonmail.com"; + email = "free.potion@yandex.ru"; github = "freepotion"; name = "Free Potion"; }; @@ -2609,6 +2609,15 @@ github = "kisonecat"; name = "Jim Fowler"; }; + kiwi = { + email = "envy1988@gmail.com"; + github = "Kiwi"; + name = "Robert Djubek"; + keys = [{ + longkeyid = "rsa4096/0x156C88A5B0A04B2A"; + fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; + }]; + }; kjuvi = { email = "quentin.vaucher@pm.me"; github = "kjuvi"; @@ -3041,6 +3050,15 @@ github = "martingms"; name = "Martin Gammelsæter"; }; + marzipankaiser = { + email = "nixos@gaisseml.de"; + github = "marzipankaiser"; + name = "Marcial Gaißert"; + keys = [{ + longkeyid = "rsa2048/0xB629036BE399EEE9"; + fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; + }]; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -3398,6 +3416,10 @@ email = "matthew@wellquite.org"; name = "Matthew Sackman"; }; + mschneider = { + email = "markus.schneider.sic+nix@gmail.com"; + name = "Markus Schneider"; + }; mschristiansen = { email = "mikkel@rheosystems.com"; github = "mschristiansen"; @@ -5004,6 +5026,11 @@ github = "the-kenny"; name = "Moritz Ulrich"; }; + thedavidmeister = { + email = "thedavidmeister@gmail.com"; + github = "thedavidmeister"; + name = "David Meister"; + }; thesola10 = { email = "thesola10@bobile.fr"; github = "thesola10"; diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index cd1064630fbc..a5374c2b468d 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -24,7 +24,7 @@ with lib; environment.extraSetup = '' if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then - XDG_DATA_DIRS=$out/share ${pkgs.buildPackages.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null + XDG_DATA_DIRS=$out/share PKGSYSTEM_ENABLE_FSYNC=0 ${pkgs.buildPackages.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null fi if [ -w $out/share/applications ]; then diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 534862a3c9e4..7d75eb286106 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -234,16 +234,19 @@ in Type = "simple"; PIDFile = pidfile; # Believe it or not, Tahoe is very brittle about the order of - # arguments to $(tahoe start). The node directory must come first, + # arguments to $(tahoe run). The node directory must come first, # and arguments which alter Twisted's behavior come afterwards. ExecStart = '' - ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile} + ${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile} ''; }; preStart = '' if [ ! -d ${lib.escapeShellArg nodedir} ]; then mkdir -p /var/db/tahoe-lafs - tahoe create-introducer ${lib.escapeShellArg nodedir} + # See https://github.com/NixOS/nixpkgs/issues/25273 + tahoe create-introducer \ + --hostname="${config.networking.hostName}" \ + ${lib.escapeShellArg nodedir} fi # Tahoe has created a predefined tahoe.cfg which we must now @@ -334,10 +337,10 @@ in Type = "simple"; PIDFile = pidfile; # Believe it or not, Tahoe is very brittle about the order of - # arguments to $(tahoe start). The node directory must come first, + # arguments to $(tahoe run). The node directory must come first, # and arguments which alter Twisted's behavior come afterwards. ExecStart = '' - ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile} + ${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile} ''; }; preStart = '' diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index dd3cb1af2716..3a65f7ff32c7 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -245,7 +245,9 @@ let path = with pkgs; [ kmod iproute wireguard-tools ]; serviceConfig = { - Type = "oneshot"; + Type = "simple"; + Restart = "on-failure"; + RestartSec = "5s"; RemainAfterExit = true; }; @@ -301,8 +303,16 @@ in networking.wireguard = { + enable = mkOption { + description = "Whether to enable WireGuard."; + type = types.bool; + # 2019-05-25: Backwards compatibility. + default = cfg.interfaces != {}; + example = true; + }; + interfaces = mkOption { - description = "Wireguard interfaces."; + description = "WireGuard interfaces."; default = {}; example = { wg0 = { @@ -325,7 +335,7 @@ in ###### implementation - config = mkIf (cfg.interfaces != {}) { + config = mkIf cfg.enable { assertions = (attrValues ( mapAttrs (name: value: { diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix index 8ece1ca19013..5662ebc61d20 100644 --- a/nixos/modules/services/security/fprintd.nix +++ b/nixos/modules/services/security/fprintd.nix @@ -50,6 +50,13 @@ in systemd.packages = [ cfg.package ]; + + # The upstream unit does not use StateDirectory, and will + # fail if the directory it needs is not present. Should be + # fixed when https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/5 + # is merged. + systemd.services.fprintd.serviceConfig.StateDirectory = "fprint"; + }; } diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index 43fed2572b51..957b6ab63bb9 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -26,18 +26,13 @@ in services.xserver.desktopManager.session = singleton { name = "lumina"; start = '' - exec ${pkgs.lumina}/bin/start-lumina-desktop + exec ${pkgs.lumina.lumina}/bin/start-lumina-desktop ''; }; - environment.systemPackages = [ - pkgs.fluxbox - pkgs.libsForQt5.kwindowsystem - pkgs.lumina - pkgs.numlockx - pkgs.qt5.qtsvg - pkgs.xscreensaver - ]; + environment.systemPackages = + pkgs.lumina.preRequisitePackages ++ + pkgs.lumina.corePackages; # Link some extra directories in /run/current-system/software/share environment.pathsToLink = [ diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 06c59342b45a..2a1f22fa9a4c 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -19,6 +19,7 @@ in ./herbstluftwm.nix ./i3.nix ./jwm.nix + ./leftwm.nix ./metacity.nix ./mwm.nix ./openbox.nix diff --git a/nixos/modules/services/x11/window-managers/leftwm.nix b/nixos/modules/services/x11/window-managers/leftwm.nix new file mode 100644 index 000000000000..3ef40df95df2 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/leftwm.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.leftwm; +in +{ + ###### interface + options = { + services.xserver.windowManager.leftwm.enable = mkEnableOption "leftwm"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "leftwm"; + start = '' + ${pkgs.leftwm}/bin/leftwm & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.leftwm ]; + }; +} diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index 8c7331fe4d2b..2ee22b80f2f5 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -12,6 +12,7 @@ in fileSystems."/" = { + fsType = "ext4"; device = "/dev/disk/by-label/nixos"; autoResize = true; }; diff --git a/pkgs/applications/altcoins/exodus/default.nix b/pkgs/applications/altcoins/exodus/default.nix new file mode 100644 index 000000000000..6531640d93f7 --- /dev/null +++ b/pkgs/applications/altcoins/exodus/default.nix @@ -0,0 +1,78 @@ +{ stdenv, lib, makeWrapper, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2, +atk, cairo, gdk_pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk, +cups, vivaldi-ffmpeg-codecs, libpulseaudio }: + +stdenv.mkDerivation rec { + pname = "exodus"; + version = "19.5.24"; + + src = fetchurl { + url = "https://exodusbin.azureedge.net/releases/${pname}-linux-x64-${version}.zip"; + sha256 = "1yx296i525qmpqh8f2vax7igffg826nr8cyq1l0if35374bdsqdw"; + }; + + sourceRoot = "."; + unpackCmd = '' + ${unzip}/bin/unzip "$src" -x "Exodus*/lib*so" + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/applications + cd Exodus-linux-x64 + cp -r . $out + ln -s $out/Exodus $out/bin/Exodus + ln -s $out/exodus.desktop $out/share/applications + substituteInPlace $out/share/applications/exodus.desktop \ + --replace 'Exec=bash -c "cd `dirname %k` && ./Exodus"' "Exec=Exodus" + ''; + + dontPatchELF = true; + dontBuild = true; + + preFixup = let + libPath = lib.makeLibraryPath [ + glib + nss + nspr + gtk3-x11 + gnome2.pango + atk + cairo + gdk_pixbuf + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + xorg_sys_opengl + utillinux + xorg.libXrandr + xorg.libXScrnSaver + alsaLib + dbus.lib + at-spi2-atk + cups.lib + libpulseaudio + systemd + vivaldi-ffmpeg-codecs + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + $out/Exodus + ''; + + meta = with stdenv.lib; { + homepage = "https://www.exodus.io/"; + description = "Top-rated cryptocurrency wallet with Trezor integration and built-in Exchange"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = [ maintainers.mmahut ]; + }; +} diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 10d066357886..50a752b3eb96 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -55,7 +55,7 @@ let cp -r . $out wrapProgram $out/bin/studio.sh \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --set PATH "${stdenv.lib.makeBinPath [ + --prefix PATH : "${stdenv.lib.makeBinPath [ # Checked in studio.sh coreutils diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index af5adca20ed8..880b5443f8bf 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -12,12 +12,16 @@ let build = "183.5522156"; sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30"; }; - betaVersion = latestVersion; - latestVersion = { # canary & dev + betaVersion = { version = "3.5.0.14"; # "Android Studio 3.5 Beta 2" build = "191.5549111"; sha256Hash = "1zy2x0m1nsx3yy64cp1jvgb9aqkribwm64mv50g9355sdz7qjhcf"; }; + latestVersion = { # canary & dev + version = "3.6.0.1"; # "Android Studio 3.6 Canary 1" + build = "191.5595896"; + sha256Hash = "1nd0xmq1aplznxbsnmzgszbblj6vdyhir708mks5ss6achn21xxc"; + }; in rec { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 335a62bb1704..7bc25ceed7fc 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0x4fmbarckw60issrwk3cd65x5xjkxwrw4xq1qgfzmxfqhzbzvz8"; /* updated by script */ + sha256 = "04ykwylg2h5l28h7wb7v41nslb82fvcm6p4d6f9k8aw3zhkaalv4"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0157ccc94pwk4a8r1pvvjzd0g4liqqns6b0cmimfjhxsh6bnarww"; /* updated by script */ + sha256 = "0syp0y4j40j72gql67g6r02n6kndsrz4nmh55ac5g9xs7s4rd5vq"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0b8msq0raczm657rhbyqi702zv4zs66yd6dcm7s0l54hnas5ia9r"; /* updated by script */ + sha256 = "162mkjmbznxwn7z1zv3x4kik8wx0fvavcdfdmnn9pads5zg2s4b3"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0xbdn1q0a2ksb7z26n2l889m6z0lh3b45clya7rdfl4jv2gkiaaq"; /* updated by script */ + sha256 = "01mlnjs7ak7xv9zk3v9r99chrcnw10qkv49gsydsm6a0wqac29xg"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1pglvklbj4w6pmc7ffbjwwfqh7fad54yfx87m9plqk80rmpjzxfi"; /* updated by script */ + sha256 = "09c8135rm45k7yyqadnf715i8k2jllqc1p5jdh6cnb29fwmyk5m5"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "100whawwj1kiq870dsmkx33qv5ygjpr9977jkbavhqjnc1zhwl1r"; /* updated by script */ + sha256 = "1mc7xma1ybp0h1654p10vgp84fnsgvwsvprm86pnmfgks8307860"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1zz579kmskvgsjv2lriglxkdlx33mmfv2liw1b9iilspga59izld"; /* updated by script */ + sha256 = "05axjd2b2648sxs93d84va90373i8nma541c619xvb967kx1gzdh"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0hcij77j4zb1y1vls5nvxq3lmqrbppm3ml0p9nagbjipy2rmp838"; /* updated by script */ + sha256 = "1s9llgjxdg99fql62kx6skpd545xqmrxwpbg19mjrjlz6pm71z3r"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0asg0x8xcjyydy0p1fdlhpcwfckdf9719460pv5zwc7yfd8z61yd"; /* updated by script */ + sha256 = "1zhci8nkywv66bwc6hbyh4h3x61qhv2fbmfb5gkw9znkk1qa0q6v"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.1.1"; /* updated by script */ + version = "2019.1.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "05lrsjk45l4xqjyinsqlnfr36qnv1nrgg2sskgi0bfjbdrfv9xrv"; /* updated by script */ + sha256 = "198rbvhqjaix6qw36rlfafbv5aj0i6zr93adzgkilrn2l9v1jf07"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 7d201cc0e593..6e7fb375eab9 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,12 +10,12 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in stdenv.mkDerivation rec { - version = "3.4.7"; + version = "3.4.8"; name = "qgis-unwrapped-${version}"; src = fetchurl { url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; - sha256 = "15w2cb5ac0n3g3jbnbk6qyqs7kx3y64zbyvcsw09p0dn9rnw4hdr"; + sha256 = "13dy9y7ipv25x3k31njhjljdav36xay6s82g6ywaqf1xxh3s567w"; }; passthru = { diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index a1ea88da84be..4e1e7138e775 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +17,9 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool + wrapGAppsHook + ]; buildInputs = [ gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida ]; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index be70efba5ad7..1eee203373af 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.13.3"; + version = "0.14.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1y0vd75j8g61jdj8miml79w5ri3pqli5rv9iq6zdrxvzfa4b2rmb"; + sha256 = "122573l7xirs9dsi5p8gra47qpgxb3vahqp2r0c043pgz4i22v5z"; }; buildInputs = [ @@ -67,18 +67,6 @@ buildPythonApplication rec { libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ - (fetchpatch { - name = "macos-symlink-1"; - url = https://github.com/kovidgoyal/kitty/commit/bdeec612667f6976109247fe1750b10dda9c24c0.patch; - sha256 = "1d18x260w059qag80kgb2cgi2h4rricvqhwpbrw79s8yxzs7jhxk"; - }) - (fetchpatch { - # fixup of previous patch - name = "macos-symlink-2"; - url = https://github.com/kovidgoyal/kitty/commit/af2c9a49b1ad31e94242295d88598591623fbf11.patch; - sha256 = "0k3dmgbvmh66j8k3h8dw6la6ma6f20fng6jjypy982kxvracsnl5"; - }) - ./macos-10.11.patch ./no-lto.patch ./no-werror.patch ./png2icns.patch diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/pkgs/applications/misc/kitty/fix-paths.patch index d6e52adc4452..704605813071 100644 --- a/pkgs/applications/misc/kitty/fix-paths.patch +++ b/pkgs/applications/misc/kitty/fix-paths.patch @@ -12,15 +12,15 @@ --- a/docs/Makefile +++ b/docs/Makefile @@ -3,7 +3,7 @@ -# Patching is needed here for the following reasons: -# * `sphinx-build` in nixpkgs is not a Python file but a wrapper shell script +# Patching is needed here for the following reason: # * importing the `constants` package from Kitty has a side effect that it # creates the user configuration directory. This package gets imported # while sphinx scans the code for documentation strings. # + # You can set these variables from the command line. - SPHINXOPTS = -T $(FAIL_WARN) --SPHINXBUILD = python3 .. +launch :sphinx-build + SPHINXOPTS = -j auto -T $(FAIL_WARN) +-SPHINXBUILD = sphinx-build +SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build SPHINXPROJ = kitty SOURCEDIR = . diff --git a/pkgs/applications/misc/kitty/macos-10.11.patch b/pkgs/applications/misc/kitty/macos-10.11.patch deleted file mode 100644 index c8bf46839e8a..000000000000 --- a/pkgs/applications/misc/kitty/macos-10.11.patch +++ /dev/null @@ -1,116 +0,0 @@ -commit 749772b8b8179eb3b71e542fd9ed5621feb578f5 -Author: Matthew Glazar <strager.nds@gmail.com> -Date: Thu Feb 28 22:01:32 2019 -0800 - - Support macOS 10.11 - - Allow Kitty to run on macOS 10.11 El Capitan. - -diff --git a/glfw/cocoa_init.m b/glfw/cocoa_init.m -index 1e719d2e..05a680e4 100644 ---- a/glfw/cocoa_init.m -+++ b/glfw/cocoa_init.m -@@ -30,6 +30,10 @@ - #define NSEventMaskKeyUp NSKeyUpMask - #define NSEventMaskKeyDown NSKeyDownMask - #define NSEventModifierFlagCommand NSCommandKeyMask -+ #define NSEventModifierFlagControl NSControlKeyMask -+ #define NSEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask -+ #define NSEventModifierFlagShift NSShiftKeyMask -+ #define NSEventTypeApplicationDefined NSApplicationDefined - #endif - - // Change to our application bundle's resources directory, if present -diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m -index 1ce79b56..fd2255fc 100644 ---- a/glfw/cocoa_window.m -+++ b/glfw/cocoa_window.m -@@ -41,6 +41,7 @@ - #define NSWindowStyleMaskTitled NSTitledWindowMask - #define NSEventModifierFlagCommand NSCommandKeyMask - #define NSEventModifierFlagControl NSControlKeyMask -+ #define NSEventModifierFlagNumericPad NSNumericPadKeyMask - #define NSEventModifierFlagOption NSAlternateKeyMask - #define NSEventModifierFlagShift NSShiftKeyMask - #define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask -diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m -index 5e9252ba..99eb3352 100644 ---- a/kitty/cocoa_window.m -+++ b/kitty/cocoa_window.m -@@ -15,6 +15,9 @@ - #include <objc/runtime.h> - - #if (MAC_OS_X_VERSION_MAX_ALLOWED < 101200) -+typedef NSUInteger NSWindowStyleMask; -+#define NSWindowStyleMaskBorderless NSBorderlessWindowMask -+#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask - #define NSWindowStyleMaskResizable NSResizableWindowMask - #define NSEventModifierFlagOption NSAlternateKeyMask - #define NSEventModifierFlagCommand NSCommandKeyMask -diff --git a/kitty/logging.c b/kitty/logging.c -index 45c88174..1ec9f1b0 100644 ---- a/kitty/logging.c -+++ b/kitty/logging.c -@@ -5,12 +5,21 @@ - * Distributed under terms of the GPL3 license. - */ - -+#ifdef __APPLE__ -+#include <AvailabilityMacros.h> -+#endif -+#if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 -+#define USE_APPLE_OS_LOG 1 -+#else -+#define USE_APPLE_OS_LOG 0 -+#endif -+ - #include "data-types.h" - #include <stdlib.h> - #include <stdarg.h> - #include <time.h> - #include <sys/time.h> --#ifdef __APPLE__ -+#if USE_APPLE_OS_LOG - #include <os/log.h> - #endif - -@@ -21,7 +30,7 @@ void - log_error(const char *fmt, ...) { - va_list ar; - struct timeval tv; --#ifdef __APPLE__ -+#if USE_APPLE_OS_LOG - // Apple does not provide a varargs style os_logv - char logbuf[16 * 1024] = {0}; - #else -@@ -44,7 +53,7 @@ log_error(const char *fmt, ...) { - if (use_os_log) { bufprint(vsnprintf, fmt, ar); } - else vfprintf(stderr, fmt, ar); - va_end(ar); --#ifdef __APPLE__ -+#if USE_APPLE_OS_LOG - if (use_os_log) os_log(OS_LOG_DEFAULT, "%{public}s", logbuf); - #endif - if (!use_os_log) fprintf(stderr, "\n"); -@@ -66,7 +75,7 @@ static PyMethodDef module_methods[] = { - bool - init_logging(PyObject *module) { - if (PyModule_AddFunctions(module, module_methods) != 0) return false; --#ifdef __APPLE__ -+#if USE_APPLE_OS_LOG - if (getenv("KITTY_LAUNCHED_BY_LAUNCH_SERVICES") != NULL) use_os_log = true; - #endif - return true; -diff --git a/setup.py b/setup.py -index f8643fce..55a96e73 100755 ---- a/setup.py -+++ b/setup.py -@@ -711,7 +711,7 @@ Categories=System;TerminalEmulator; - CFBundlePackageType='APPL', - CFBundleSignature='????', - CFBundleExecutable=appname, -- LSMinimumSystemVersion='10.12.0', -+ LSMinimumSystemVersion='10.11.0', - LSRequiresNativeExecution=True, - NSAppleScriptEnabled=False, - # Needed for dark mode in Mojave when linking against older SDKs diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch index c5fdeb7ddc03..44d231cb07f9 100644 --- a/pkgs/applications/misc/kitty/no-lto.patch +++ b/pkgs/applications/misc/kitty/no-lto.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -223,9 +223,6 @@ def init_env( +@@ -233,9 +233,6 @@ def init_env( cppflags += shlex.split(os.environ.get('CPPFLAGS', '')) cflags += shlex.split(os.environ.get('CFLAGS', '')) ldflags += shlex.split(os.environ.get('LDFLAGS', '')) diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch index c9b6dcd6b694..8217b5ef51a6 100644 --- a/pkgs/applications/misc/kitty/no-werror.patch +++ b/pkgs/applications/misc/kitty/no-werror.patch @@ -1,9 +1,9 @@ --- a/setup.py +++ b/setup.py -@@ -202,7 +202,7 @@ def init_env( +@@ -212,7 +212,7 @@ cflags = os.environ.get( 'OVERRIDE_CFLAGS', ( - '-Wextra -Wno-missing-field-initializers -Wall -std=c11' + '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' - ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' + ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ).format( diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix new file mode 100644 index 000000000000..e659ed2322ed --- /dev/null +++ b/pkgs/applications/misc/lutris/default.nix @@ -0,0 +1,178 @@ +{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub, fetchpatch +, wrapGAppsHook, python2Packages, python3Packages }: + +let + qt5Deps = with pkgs; with qt5; [ qtbase qtmultimedia ]; + gnome3Deps = with pkgs; with gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; + + python3Deps = with pkgs; with python3Packages; [ + evdev pyyaml pyxdg pygobject3 pyqt5 dbus-python requests pillow + ]; + + xorgDeps = with pkgs; with xorg; [ + libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp + libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite + xrandr xdg_utils + ]; + + gstDeps = with pkgs; with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly + gst-libav + ]; + + deps = with pkgs; [ + # Common + stdenv.cc.cc libGL libGLU_combined libsndfile libtheora libogg libvorbis + libopus libGLU libpcap libpulseaudio libao libusb libevdev libudev libgcrypt + libxml2 libusb libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio + libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2 + libxslt libtxc_dxtn libsndfile giflib zlib glib alsaLib zziplib bash dbus + keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl + graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader + + # Lutris + gobjectIntrospection gdk_pixbuf pango openssl sqlite xterm libnotify procps + + # Adventure Game Studio + allegro dumb + + # Desmume + lua agg soundtouch openal desktop-file-utils pangox_compat atk + + # DGen // TODO: libarchive is broken + + # Dolphin + bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm + wavpack gnutls-kdh orc nettle gmp pcre vulkan-loader + + # DOSBox + SDL_net SDL_sound + + # GOG + glib-networking + + # Higan // TODO: "higan is not available for the x86_64 architecture" + + # Libretro + fluidsynth hidapi mesa_noglu libdrm + + # MAME + qt48 fontconfig SDL2_ttf + + # Mednafen + freeglut mesa_glu + + # MESS + expat + + # Minecraft + nss + + # Mupen64Plus + boost dash + + # Osmose + qt4 + + # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" + + # PPSSPP + glew snappy + + # Redream // "redream is not available for the x86_64 architecture" + + # ResidualVM + flac + + # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..." + llvm_4 + + # ScummVM + nasm sndio + + # Snes9x + epoxy minizip + + # Steam + steam + + # Vice + bison flex + + # WINE + perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC + samba4 sane-backends openldap opencl-headers ocl-icd utillinux + + (wine.override { wineBuild = "wineWow"; }) + + # ZDOOM + soundfont-fluid bzip2 game-music-emu + ] ++ qt5Deps + ++ gnome3Deps + ++ python3Deps + ++ xorgDeps + ++ gstDeps; + + lutris = python3Packages.buildPythonApplication rec { + name = "lutris-original-${version}"; + version = "0.5.2.1"; + + src = fetchFromGitHub { + owner = "lutris"; + repo = "lutris"; + rev = "v${version}"; + sha256 = "023yqnzmnkfpq21r6ky6jzwbjxjcw1a5zqrrdl6fwwlr78fdhgpv"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = deps; + fullPath = stdenv.lib.makeLibraryPath deps; + preConfigure = "export HOME=$PWD"; + + makeWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib" + "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" + "--prefix XDG_DATA_DIRS : $out/share" + "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ]; + + postInstall = '' + mkdir -p $out/lib + ln -sf ${pkgs.gsm}/lib/libgsm.so $out/lib/libgsm.so.1 + mv $out/bin/lutris $out/bin/lutris-${version} + ''; + + meta = with stdenv.lib; { + homepage = "https://lutris.net"; + description = "Open Source gaming platform for GNU/Linux"; + license = licenses.gpl3; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.linux; + }; + }; + + desktopItem = makeDesktopItem { + name = "Lutris"; + exec = "lutris"; + icon = "lutris"; + comment = lutris.meta.description; + desktopName = "Lutris"; + genericName = "Gaming Platform"; + categories = "Network;Game;Emulator;"; + startupNotify = "false"; + }; + +in buildFHSUserEnv rec { + name = "lutris"; + + runScript = "lutris-${lutris.version}"; + targetPkgs = pkgs: [ lutris pkgs.glxinfo pkgs.pciutils ]; + passthru.lutris = lutris; + + extraInstallCommands = '' + mkdir -p $out/share + cp -r ${desktopItem}/share/applications $out/share + ln -sf ${lutris}/share/icons $out/share + ''; +} diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/applications/misc/tmatrix/default.nix new file mode 100644 index 000000000000..3ef0eac2417a --- /dev/null +++ b/pkgs/applications/misc/tmatrix/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, cmake, ncurses }: + +stdenv.mkDerivation rec { + pname = "tmatrix"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "M4444"; + repo = "TMatrix"; + rev = "v${version}"; + sha256 = "1g0gn4p02vjc6l8lc78wlx4xkd74ha7ybx9fvvdr6mizk0cyjili"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses ]; + + postInstall = '' + mkdir -p $out/share/man/man6 + install -m 0644 ../tmatrix.6 $out/share/man/man6 + ''; + + meta = with lib; { + description = "Terminal based replica of the digital rain from The Matrix"; + longDescription = '' + TMatrix is a program that simulates the digital rain form The Matrix. + It's focused on being the most accurate replica of the digital rain effect + achievable on a typical terminal, while also being customizable and + performant. + ''; + homepage = "https://github.com/M4444/TMatrix"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index cdd78866cdcb..4857a7458e21 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja -, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt +, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, spdlog , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1k3ynx5ssq7ji0nlx0n7zrgrshxv5abj8fa8c5lcyxr2wxffna9z"; + sha256 = "0wxd03lkgssz0vsib9qc040vfg1i6nrg7ac2c6qwficx62j2zlm1"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ ]; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt ] + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index a01cef9227bf..78ae194f32df 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -1,21 +1,21 @@ -{ buildGoPackage +{ buildGoModule , fetchFromGitHub , lib }: -buildGoPackage rec { - name = "wtf-${version}"; - version = "0.4.0"; - - goPackagePath = "github.com/senorprogrammer/wtf"; +buildGoModule rec { + pname = "wtf"; + version = "0.10.3"; src = fetchFromGitHub { - owner = "senorprogrammer"; - repo = "wtf"; - rev = "${version}"; - sha256 = "1vgjqmw27baiq9brmnafic3w3hw11p5qc6ahbdxi5n5n4bx7j6vn"; + owner = "wtfutil"; + repo = pname; + rev = "v${version}"; + sha256 = "0ffpydxlc2c9rpr6rnlqk3ca8xc4hjl2107wzcxzx9id1hw8fb40"; }; + modSha256 = "0as736nnx7ci4w9gdp27g55g6dny9bh1fryz3g89gxm2sa2nlb9l"; + buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index aec4ec1284e9..8bdb33ed5d22 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -38,6 +38,25 @@ mkChromiumDerivation (base: rec { mkdir -vp "$logo_output_path" cp -v "$icon_file" "$logo_output_path/$packageName.png" done + + # Install Desktop Entry + install -D chrome/installer/linux/common/desktop.template \ + $out/share/applications/chromium-browser.desktop + + substituteInPlace $out/share/applications/chromium-browser.desktop \ + --replace "@@MENUNAME@@" "Chromium" \ + --replace "@@PACKAGE@@" "chromium" \ + --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium" + + # Append more mime types to the end + sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \ + $out/share/applications/chromium-browser.desktop + + # See https://github.com/NixOS/nixpkgs/issues/12433 + sed -i \ + -e '/\[Desktop Entry\]/a\' \ + -e 'StartupWMClass=chromium-browser' \ + $out/share/applications/chromium-browser.desktop ''; passthru = { inherit sandboxExecutableName; }; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 68aee1f98d76..cfc2da2bdd23 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -45,31 +45,6 @@ in let }; }; - desktopItem = makeDesktopItem { - name = "chromium-browser"; - exec = "chromium %U"; - icon = "chromium"; - comment = "An open source web browser from Google"; - desktopName = "Chromium"; - genericName = "Web browser"; - mimeType = stdenv.lib.concatStringsSep ";" [ - "text/html" - "text/xml" - "application/xhtml+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - "x-scheme-handler/ftp" - "x-scheme-handler/mailto" - "x-scheme-handler/webcal" - "x-scheme-handler/about" - "x-scheme-handler/unknown" - ]; - categories = "Network;WebBrowser"; - extraEntries = '' - StartupWMClass=chromium-browser - ''; - }; - suffix = if channel != "stable" then "-" + channel else ""; sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; @@ -131,11 +106,10 @@ in stdenv.mkDerivation { ln -s "$out/bin/chromium" "$out/bin/chromium-browser" - mkdir -p "$out/share/applications" + mkdir -p "$out/share" for f in '${chromium.browser}'/share/*; do # hello emacs */ ln -s -t "$out/share/" "$f" done - cp -v "${desktopItem}/share/applications/"* "$out/share/applications" ''; inherit (chromium.browser) packageName; diff --git a/pkgs/applications/networking/browsers/w3m/no-x11.patch b/pkgs/applications/networking/browsers/w3m/no-x11.patch index 83b3e96821f5..0816c022926d 100644 --- a/pkgs/applications/networking/browsers/w3m/no-x11.patch +++ b/pkgs/applications/networking/browsers/w3m/no-x11.patch @@ -1,14 +1,13 @@ Forget about X11 in fb module. This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb. diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c -index ea36637..d3d7bc3 100644 +index 1a5151c..d3d7bc3 100644 --- a/w3mimg/fb/fb_imlib2.c +++ b/w3mimg/fb/fb_imlib2.c -@@ -3,7 +3,7 @@ +@@ -3,6 +3,7 @@ fb_imlib2.c 0.3 Copyright (C) 2002, hito **************************************************************************/ --#include <X11/Xlib.h> +#define X_DISPLAY_MISSING #include <Imlib2.h> #include "fb.h" diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 0922bd7b8a9f..c542de912f34 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -24,6 +24,7 @@ let }; in { + elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; libvirt = callPackage ./libvirt {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix new file mode 100644 index 000000000000..b9f28cbd6cb0 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: +buildGoPackage rec { + name = "terraform-provider-elasticsearch-${version}"; + version = "0.6.0"; + + goPackagePath = "github.com/phillbaker/terraform-provider-elasticsearch"; + + # ./deps.nix was generated using the work-around described in: + # https://github.com/kamilchm/go2nix/issues/19 + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "phillbaker"; + repo = "terraform-provider-elasticsearch"; + rev = "v${version}"; + sha256 = "04i7jwhm1mg4m8p7y6yg83j76fx0ncallzbza1g1wc5cjjbkvgs2"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-elasticsearch{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform provider for elasticsearch"; + homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch"; + license = licenses.mpl20; + maintainers = with maintainers; [ basvandijk ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix new file mode 100644 index 000000000000..b89e20cd4864 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix @@ -0,0 +1,75 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "512bdaf8bec30abd545b440447cebb57b53d3af9"; + sha256 = "1j7kjk6i8vg4nwlsxjypqz3gc9j1a9x8r3bg99w1x2ap3vrh7sl8"; + }; + } + { + goPackagePath = "github.com/deoxxa/aws_signing_client"; + fetch = { + type = "git"; + url = "https://github.com/deoxxa/aws_signing_client"; + rev = "c20ee106809eacdffcc81ac7cb984261f8e3067e"; + sha256 = "01cw1f6hzgx1df730vdwd7vhbn7yl6zv3sr42iz4sd1dcdqwzlkq"; + }; + } + { + goPackagePath = "github.com/hashicorp/terraform"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/terraform"; + rev = "dbce85d85ff0beebc660b3d1805b4ef15361af00"; + sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + }; + } + { + goPackagePath = "github.com/olivere/elastic"; + fetch = { + type = "git"; + url = "https://github.com/olivere/elastic"; + rev = "2a5234d20b058173aaea6835e671fc83eee777b0"; + sha256 = "08r62d29m6f7d5hwb9zm5b612wbvzd9sn97nb48q174gbk8685yw"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; + sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; + }; + } + { + goPackagePath = "gopkg.in/olivere/elastic.v5"; + fetch = { + type = "git"; + url = "https://gopkg.in/olivere/elastic.v5"; + rev = "b708306d715bea9b983685e94ab4602cdc9f988b"; + sha256 = "0ks0h0ik0aqjm8dm2imbyd1z7rfmqiwilf3bc9nnplp9hc07471y"; + }; + } + { + goPackagePath = "gopkg.in/olivere/elastic.v6"; + fetch = { + type = "git"; + url = "https://gopkg.in/olivere/elastic.v6"; + rev = "e6cae211ee802eab70248a68fe2cb03b616744c9"; + sha256 = "0nbf4mr31gxm4zn5w362y22mh98ckl3d0bxli4f3rwx6zw12arfg"; + }; + } +] diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 48f85c80e0eb..5d9a658972c3 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,14 +1,16 @@ -{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }: +{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb +, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli +}: stdenv.mkDerivation rec { - name = "compactor-${version}"; - version = "0.11.1"; + pname = "compactor"; + version = "0.12.2"; src = fetchFromGitHub { owner = "dns-stats"; - repo = "compactor"; - rev = "${version}"; - sha256 = "0bd82956nkpdmfj8f05z37hy7f33cd2nfdxr7s9fgz1xi5flnzjc"; + repo = pname; + rev = version; + sha256 = "17p9wsslsh6ifnadvyygr0cgir4q4iirxfz9zpkpbhh76cx2qnay"; }; # cbor-diag, cddl and wireshark-cli are only used for tests. @@ -19,14 +21,16 @@ stdenv.mkDerivation rec { openssl libtins lzma + libctemplate + libmaxminddb ]; - patchPhase = '' + prePatch = '' patchShebangs test-scripts/ ''; preConfigure = '' - sh autogen.sh + ${stdenv.shell} autogen.sh substituteInPlace configure \ --replace "/usr/bin/file" "${file}/bin/file" ''; @@ -35,16 +39,19 @@ stdenv.mkDerivation rec { "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" ]; + enableParallelBuilding = true; doCheck = true; preCheck = '' substituteInPlace test-scripts/check-live-pcap.sh \ --replace "/usr/sbin/tcpdump" "${tcpdump}/bin/tcpdump" - ''; + rm test-scripts/same-tshark-output.sh + ''; # TODO: https://github.com/dns-stats/compactor/issues/49 (failing test) meta = with stdenv.lib; { description = "Tools to capture DNS traffic and record it in C-DNS files"; - homepage = http://dns-stats.org/; + homepage = "http://dns-stats.org/"; + changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; license = [ licenses.boost licenses.mpl20 licenses.openssl ]; maintainers = with maintainers; [ fdns ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index ce3141f0ef3a..47ae6307ce7e 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "63.4.107"; + version = "73.4.118"; arch = { "x86_64-linux" = "x86_64"; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8c1af783602a..26dc45144d96 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -20,11 +20,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; majorVersion = "1.1"; - version = "${majorVersion}.2"; + version = "${majorVersion}.3"; src = fetchurl { url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "1lx03cgi58z54xb7mhs6bc715lc00w5mpysf9n3q8zgn759fm0rj"; + sha256 = "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index de8794135fe8..76b9a8b24407 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,11 +1,11 @@ { darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf, libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg, -at-spi2-atk }: +at-spi2-atk, libuuid }: let - version = "3.4.0"; + version = "3.4.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -30,6 +30,7 @@ let nss stdenv.cc.cc systemd + libuuid xorg.libxkbfile xorg.libX11 @@ -49,7 +50,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0ld53gg0dbfpi79lz2sx5br29mlhwkfcypzf3iya4cm75a33hyw5"; + sha256 = "0qbj41ymckz8w1p2pazyxg7pimgn9gmpvxz4ygcm0nyivfmw2crq"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix new file mode 100644 index 000000000000..bd38855109a1 --- /dev/null +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub +, qtbase, qtmultimedia, qtsvg, qtx11extras +, pkgconfig, cmake, gettext +}: + +stdenv.mkDerivation rec { + pname = "kvirc"; + version = "5.0.0"; + + src = fetchFromGitHub { + owner = "kvirc"; + repo = "KVIrc"; + rev = version; + sha256 = "1dq7v6djw0gz56rvghs4r5gfhzx4sfg60rnv6b9zprw0vlvcxbn4"; + }; + + buildInputs = [ + qtbase qtmultimedia qtsvg qtx11extras + ]; + + nativeBuildInputs = [ + pkgconfig cmake gettext + ]; + + meta = with stdenv.lib; { + description = "Advanced IRC Client"; + homepage = "http://www.kvirc.net/"; + license = licenses.gpl2; + maintainers = [ maintainers.suhr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 4e7be2be4732..8bdba1893e2d 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.11.4"; + version = "1.12.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "0098pr4anmq2a0id8wfi2vci3cgcfwf9k4q411w22xn8lrz3aldn"; + sha256 = "13zr2fpql33sdbsjsiaa952js5bvphc1x4lqsj36qyzdhj3l84na"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix new file mode 100644 index 000000000000..c8b8b5ef333c --- /dev/null +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -0,0 +1,46 @@ +{ + stdenv, + appimage-run, + fetchurl, + runtimeShell, + gsettings-desktop-schemas, + gtk3, + gobject-introspection, + wrapGAppsHook, +}: + +stdenv.mkDerivation rec { + # latest version that runs without errors + # https://github.com/ssbc/patchwork/issues/972 + version = "3.11.4"; + pname = "patchwork"; + + src = fetchurl { + url = "https://github.com/ssbc/patchwork/releases/download/v${version}/Patchwork-${version}-linux-x86_64.AppImage"; + sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ appimage-run gtk3 gsettings-desktop-schemas gobject-introspection ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir -p $out/{bin,share} + cp $src $out/share/${pname} + echo "#!${runtimeShell}" > $out/bin/${pname} + echo "${appimage-run}/bin/appimage-run $out/share/${pname}" >> $out/bin/${pname} + chmod +x $out/bin/${pname} $out/share/${pname} + ''; + + meta = with stdenv.lib; { + description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)."; + longDescription = '' + sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. + ''; + homepage = https://www.scuttlebutt.nz/; + license = licenses.agpl3; + maintainers = with maintainers; [ thedavidmeister ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 42d2093ee3a0..fce885a25941 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -57,6 +57,26 @@ in rec { }; }; + clientaway = zncDerivation rec { + name = "znc-clientaway-${version}"; + version = "git-2017-04-28"; + module_name = "clientaway"; + + src = fetchFromGitHub { + owner = "kylef"; + repo = "znc-contrib"; + rev = "f6724a4a3b16b050088adde0cbeed74f189e5044"; + sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8"; + }; + + meta = with stdenv.lib; { + description = "ZNC clientaway module"; + homepage = https://github.com/kylef/znc-contrib; + license = licenses.gpl2; + maintainers = with maintainers; [ kiwi ]; + }; + }; + fish = zncDerivation rec { name = "znc-fish-${version}"; version = "git-2014-10-10"; @@ -77,6 +97,46 @@ in rec { }; }; + ignore = zncDerivation rec { + name = "znc-ignore-${version}"; + version = "git-2017-04-28"; + module_name = "ignore"; + + src = fetchFromGitHub { + owner = "kylef"; + repo = "znc-contrib"; + rev = "f6724a4a3b16b050088adde0cbeed74f189e5044"; + sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8"; + }; + + meta = with stdenv.lib; { + description = "ZNC ignore module"; + homepage = https://github.com/kylef/znc-contrib; + license = licenses.gpl2; + maintainers = with maintainers; [ kiwi ]; + }; + }; + + palaver = zncDerivation rec { + name = "znc-palaver-${version}"; + version = "2018-09-18"; + module_name = "palaver"; + + src = fetchFromGitHub { + owner = "cocodelabs"; + repo = "znc-palaver"; + rev = "c70e8112686f917d39197d582db36c3ea37a4cb6"; + sha256 = "1gjr8yqgpkpcc18rf0zfgil3rcd1ihqk0q9f8rwbfvs5381h3c58"; + }; + + meta = with stdenv.lib; { + description = "Palaver ZNC module"; + homepage = "https://github.com/cocodelabs/znc-palaver"; + license = licenses.mit; + maintainers = with maintainers; [ kiwi ]; + }; + }; + playback = zncDerivation rec { name = "znc-playback-${version}"; version = "git-2015-08-04"; diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index dfb8415219c7..7c6db61b5291 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, cppunit, gnuradio-osmosdr +, makeWrapper, cppunit, gr-osmosdr , pythonSupport ? true, python, swig }: assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-ais-${version}"; + name = "gr-ais-${version}"; version = "2015-12-20"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr + cmake boost gnuradio makeWrapper cppunit gr-osmosdr ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index dcb50df70520..119b7f7600f9 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, cppunit, libosmocore, gnuradio-osmosdr +, makeWrapper, cppunit, libosmocore, gr-osmosdr , pythonSupport ? true, python, swig }: assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-gsm-${version}"; + name = "gr-gsm-${version}"; version = "2016-08-25"; src = fetchFromGitHub { @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr + cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gnuradio-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gr-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") done ''; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index 839cac32dd6d..af3cabac9ef7 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -8,7 +8,7 @@ let version = "2.0.0"; in stdenv.mkDerivation rec { - name = "gnuradio-limesdr-${version}"; + name = "gr-limesdr-${version}"; src = fetchFromGitHub { owner = "myriadrf"; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index 2f4b0e4e3eb6..c3c8721be258 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -6,7 +6,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-nacl-${version}"; + name = "gr-nacl-${version}"; version = "2017-04-10"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 846afe0e95d4..df2a88033c46 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -13,7 +13,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-osmosdr-${version}"; + name = "gr-osmosdr-${version}"; version = "2018-08-15"; src = fetchgit { diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 2e5443227fda..b56e0d226871 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gnuradio-rds-${version}"; + name = "gr-rds-${version}"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index f7c7ca5472e0..1258dd32b9f5 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gnuradio-osmosdr +{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr # drivers (optional): , rtl-sdr, hackrf , pulseaudioSupport ? true, libpulseaudio @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - qtbase qtsvg gnuradio boost gnuradio-osmosdr rtl-sdr hackrf + qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; enableParallelBuilding = true; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 63906d996ba6..40a168675f67 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, alsaLib, boost , qt4, libpulseaudio, codec2, libconfig -, gnuradio, gnuradio-osmosdr, gsm +, gnuradio, gr-osmosdr, gsm , libopus, libjpeg, protobuf, qwt, speex } : @@ -39,7 +39,7 @@ in stdenv.mkDerivation { libconfig gsm gnuradio - gnuradio-osmosdr + gr-osmosdr libopus libjpeg protobuf diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 5c6510e8cab8..a8c2dda8ea8b 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,8 +21,8 @@ let buildType = "release"; # Remember to change the extpackRev and version in extpack.nix and # guest-additions/default.nix as well. - main = "0lp584a350ya1zn03lhgmdbi91yp8yfja9hlg2jz1xyfj2dc869l"; - version = "6.0.6"; + main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv"; + version = "6.0.8"; in stdenv.mkDerivation { name = "virtualbox-${version}"; @@ -76,12 +76,6 @@ in stdenv.mkDerivation { optional enableHardening ./hardened.patch ++ [ ./qtx11extras.patch - # https://www.virtualbox.org/ticket/18620 - ./fix_kbuild.patch - # https://www.virtualbox.org/ticket/18621 - ./fix_module_makefile_sed.patch - # https://forums.virtualbox.org/viewtopic.php?f=7&t=92815 - ./fix_printk_test.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index d26909ad79aa..a748a0adbba0 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -2,7 +2,7 @@ with lib; -let version = "6.0.6"; +let version = "6.0.8"; in fetchurl rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; @@ -10,7 +10,7 @@ fetchurl rec { sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. - let value = "794f023a186bd217c29c3d30bd1434b6e9de3b242c7bf740d06d10f2d3d981c6"; + let value = "6d89127c7f043fa96592da96ca87ac5ee9a7afd347d788380f91b695b67d7954"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch b/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch deleted file mode 100644 index 7cafeada7d9e..000000000000 --- a/pkgs/applications/virtualization/virtualbox/fix_kbuild.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile ---- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile -+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile -@@ -58,7 +58,7 @@ - RT_WITH_VBOX \ - VBOX_WITH_HARDENING \ - VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk! --VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement -+VBOXMOD_CFLAGS = -include $(VBOXNETADPT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement - - include $(obj)/Makefile-footer.gmk - diff --git a/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch b/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch deleted file mode 100644 index 6bfa5a4404be..000000000000 --- a/pkgs/applications/virtualization/virtualbox/fix_module_makefile_sed.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk ---- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2019-04-16 12:16:38.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk 2019-05-04 15:19:14.545497602 +0200 -@@ -175,7 +175,7 @@ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk ---- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2019-04-16 12:16:39.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2019-05-04 15:19:13.809493324 +0200 -@@ -525,7 +525,7 @@ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxPci/Makefile.kmk VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxPci/Makefile.kmk ---- VirtualBox-6.0.6/src/VBox/HostDrivers/VBoxPci/Makefile.kmk 2019-04-16 12:16:40.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/VBoxPci/Makefile.kmk 2019-05-04 15:42:12.029664987 +0200 -@@ -67,7 +67,7 @@ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif diff --git a/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch b/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch deleted file mode 100644 index eceaff2dc61f..000000000000 --- a/pkgs/applications/virtualization/virtualbox/fix_printk_test.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN VirtualBox-6.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c VirtualBox-6.0.6.new/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ---- VirtualBox-6.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2019-04-16 12:16:37.000000000 +0200 -+++ VirtualBox-6.0.6.new/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2019-05-04 15:59:44.439905223 +0200 -@@ -426,10 +426,8 @@ - int rc; - PSUPDRVSESSION pSession; - Log(("VBoxDrvLinuxCreate: pFilp=%p pid=%d/%d %s\n", pFilp, RTProcSelf(), current->pid, current->comm)); -- printk("test1\n"); - - #ifdef VBOX_WITH_HARDENING -- printk("test2\n"); - /* - * Only root is allowed to access the unrestricted device, enforce it! - */ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 1a5c6c670c85..5ff8a1650bab 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1srcsf9264l5yxbq2x83z66j38blbfrywq5lkzwb5kih6sv548c3"; + sha256 = "1njgxb18r8a1m8fk2b32mmnbwciip3wcxwyhza5k73bx4q2sifac"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -107,11 +107,17 @@ stdenv.mkDerivation { wrapProgram $out/bin/VBoxClient-all \ --prefix PATH : "${which}/bin" - # Install OpenGL libraries - mkdir -p $out/lib - cp -v lib/VBoxOGL*.so $out/lib - mkdir -p $out/lib/dri - ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so + # Don't install VBoxOGL for now + # It seems to be broken upstream too, and fixing it is far down the priority list: + # https://www.virtualbox.org/pipermail/vbox-dev/2017-June/014561.html + # Additionally, 3d support seems to rely on VBoxOGL.so being symlinked from + # libGL.so (which we can't), and Oracle doesn't plan on supporting libglvnd + # either. (#18457) + ## Install OpenGL libraries + #mkdir -p $out/lib + #cp -v lib/VBoxOGL*.so $out/lib + #mkdir -p $out/lib/dri + #ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so # Install desktop file mkdir -p $out/share/autostart diff --git a/pkgs/applications/window-managers/leftwm/cargo-lock.patch b/pkgs/applications/window-managers/leftwm/cargo-lock.patch new file mode 100644 index 000000000000..92588eb2fdb9 --- /dev/null +++ b/pkgs/applications/window-managers/leftwm/cargo-lock.patch @@ -0,0 +1,1483 @@ +--- /dev/null 2019-05-17 17:44:26.875442706 +0200 ++++ b/Cargo.lock 2019-05-17 18:30:29.490608288 +0200 +@@ -0,0 +1,1480 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "anymap" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "argon2rs" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2-rfc" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "block-buffer" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "block-padding" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "byte-tools" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bytes" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-queue" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "deunicode" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "digest" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "env_logger" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fake-simd" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fnv" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "futures" ++version = "0.1.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "generic-array" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "leftwm" ++version = "0.1.9" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "liquid" ++version = "0.18.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-compiler 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "liquid-compiler" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "liquid-error" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "liquid-interpreter" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "liquid-value" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "maplit" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memoffset" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "mio" ++version = "0.6.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mio-uds" ++version = "0.6.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num-integer" ++version = "0.1.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num_cpus" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "numtoa" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "owning_ref" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pest" ++version = "2.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pest_derive" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pest_generator" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pest_meta" ++version = "2.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quote" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_termios" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_users" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scoped_threadpool" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.91" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.91" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "sha-1" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "0.15.34" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termion" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio" ++version = "0.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-codec" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-current-thread" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-executor" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-fs" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-io" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-reactor" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-sync" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-tcp" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-threadpool" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-timer" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-trace-core" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-udp" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-uds" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ucd-trie" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "url" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wincolor" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "x11-dl" ++version = "2.18.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "xdg" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" ++"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" ++"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" ++"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" ++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum backtrace 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "f92d5d536fa03dc3d93711d97bac1fae2eb59aba467ca4c6600c0119da614f51" ++"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" ++"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" ++"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" ++"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" ++"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" ++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" ++"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" ++"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" ++"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4" ++"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" ++"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" ++"checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560" ++"checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" ++"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" ++"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" ++"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++"checksum futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "a2037ec1c6c1c4f79557762eab1f7eae1f64f6cb418ace90fae88f0942b60139" ++"checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592" ++"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" ++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" ++"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" ++"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" ++"checksum libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "42914d39aad277d9e176efbdad68acb1d5443ab65afe0e0e4f0d49352a950880" ++"checksum liquid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e1d91078b50038dba2539ec474656192a0c83b4802e999e5ee334bf198a8120c" ++"checksum liquid-compiler 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6b581cfb0437adeb4628cceafed44441d0a4a5c858ab169ec932ba4b4fda815" ++"checksum liquid-error 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76119f2171687b188d7b953627ae924ca0556499b0bd20099ee5f2dea8e8969b" ++"checksum liquid-interpreter 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cc07e0e8d8b87a34579e42644ac63e290989d4e0539b79993979163bb43ea7b" ++"checksum liquid-value 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21caa8903eae7cd9f5918d85d99a06e2a21528fcf6e3da33a7b319d03b81d87c" ++"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" ++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" ++"checksum mio 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "049ba5ca2b63e837adeee724aa9e36b408ed593529dcc802aa96ca14bd329bdf" ++"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" ++"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" ++"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" ++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" ++"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" ++"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" ++"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" ++"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" ++"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" ++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++"checksum pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" ++"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" ++"checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646" ++"checksum pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d" ++"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" ++"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" ++"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828" ++"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58" ++"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" ++"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" ++"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" ++"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "a72e9b96fa45ce22a4bc23da3858dfccfd60acd28a25bcd328a98fdd6bea43fd" ++"checksum serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "101b495b109a3e3ca8c4cbe44cf62391527cdfb6ba15821c5ce80bcd5ea23f9f" ++"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" ++"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" ++"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" ++"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" ++"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" ++"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" ++"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "94a1f9396aec29d31bb16c24d155cfa144d1af91c40740125db3131bdaf76da8" ++"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" ++"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" ++"checksum tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e" ++"checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af" ++"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" ++"checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce" ++"checksum tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2f843ffdf8d6e1f90bddd48da43f99ab071660cd92b7ec560ef3cdfd7a409a" ++"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" ++"checksum tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2" ++"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" ++"checksum tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3" ++"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" ++"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" ++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" ++"checksum ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77" ++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" ++"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" ++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" ++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" ++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++"checksum x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)" = "940586acb859ea05c53971ac231685799a7ec1dee66ac0bccc0e6ad96e06b4e3" ++"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix new file mode 100644 index 000000000000..574e42cc8481 --- /dev/null +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: + +let + rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; +in + +rustPlatform.buildRustPackage rec { + pname = "leftwm"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "leftwm"; + repo = "leftwm"; + rev = "${version}"; + sha256 = "0ji7m2npkdg27gm33b19rxr50km0gm1h9czi1f425vxq65mlkl4y"; + }; + + buildInputs = [ makeWrapper libX11 libXinerama ]; + + postInstall = '' + wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" + wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}" + wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" + ''; + + cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6"; + + # https://github.com/leftwm/leftwm/pull/37 + cargoPatches = [ ./cargo-lock.patch ]; + + meta = { + description = "Leftwm - A tiling window manager for the adventurer"; + homepage = https://github.com/leftwm/leftwm; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ mschneider ]; + }; +} diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c index 0e9e36bc3014..34e050dde4fb 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -19,6 +19,10 @@ #include <sys/types.h> #include <sys/wait.h> +int min(int a, int b) { + return a > b ? b : a; +} + const gchar *bind_blacklist[] = {"bin", "etc", "host", "usr", "lib", "lib64", "lib32", "sbin", NULL}; void bind_mount(const gchar *source, const gchar *target) { @@ -126,7 +130,9 @@ int main(gint argc, gchar **argv) { int status; fail_if(waitpid(cpid, &status, 0) != cpid); - fail_if(nftw(prefix, nftw_remove, getdtablesize(), + // glibc 2.27 (and possibly other versions) can't handle + // an nopenfd value larger than 2^19 + fail_if(nftw(prefix, nftw_remove, min(getdtablesize(), 1<<19), FTW_DEPTH | FTW_MOUNT | FTW_PHYS)); if (WIFEXITED(status)) diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index be83c9da2108..295b17eec67c 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -52,8 +52,8 @@ let etcProfile = writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' - export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32' - export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin' + export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32:$LD_LIBRARY_PATH" + export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' # Force compilers and other tools to look in default search paths diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 5c8aba4d882f..a2cd8ee192d0 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }: stdenv.mkDerivation rec { - name = "terminology-${version}"; - version = "1.4.0"; + pname = "terminology"; + version = "1.4.1"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; - sha256 = "0q1y7fadj42n23aspx9y8hm4w4xlc316wc3415wnf75ibsx08ngd"; + url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0mm9v5a94369is3kaarnr3a28wy42wslzi1mcisaidlcldgv7f6p"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 4b0ae91d78f5..6e7f0716eefb 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,5 +1,6 @@ { fetchFromGitLab , stdenv +, fetchpatch , meson , ninja , pkgconfig @@ -50,6 +51,15 @@ stdenv.mkDerivation rec { sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r"; }; + + patches = [ + (fetchpatch { + name = "CVE-2019-11459.patch"; + url = "https://gitlab.gnome.org/GNOME/evince/commit/3e38d5ad724a042eebadcba8c2d57b0f48b7a8c7.patch"; + sha256 = "1ds6iwr2r9i86nwrly8cx7p1kbvf1gljjplcffa67znxqmwx4n74"; + }) + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 00ebfd8a7253..10e75eea38f0 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,84 +1,26 @@ -{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, - numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, - qttools, poppler, wrapGAppsHook -}: +{ pkgs, libsForQt5 }: -stdenv.mkDerivation rec { - name = "lumina-${version}"; - version = "1.4.0-p1"; +let + packages = self: with self; { - src = fetchFromGitHub { - owner = "trueos"; - repo = "lumina"; - rev = "v${version}"; - sha256 = "0jin0a2s6pjbpw7w1bz67dgqp0xlpw1a7nh8zv0qwdf954zczanp"; - }; - - nativeBuildInputs = [ - qmake - qttools - wrapGAppsHook - ]; - - buildInputs = [ - xorg.libxcb - xorg.libXdamage - xorg.xcbutilwm - xorg.xcbutilimage - qtbase - qtsvg - qtmultimedia - qtx11extras - poppler - 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 - ''; + lumina = callPackage ./lumina { }; + lumina-calculator = callPackage ./lumina-calculator { }; + lumina-pdf = callPackage ./lumina-pdf { }; - postPatch = '' - # Fix location of poppler-qt5.h - substituteInPlace src-qt5/desktop-utils/lumina-pdf/mainUI.h \ - --replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>' + preRequisitePackages = [ + pkgs.fluxbox + pkgs.libsForQt5.kwindowsystem + pkgs.numlockx + pkgs.qt5.qtsvg + pkgs.xscreensaver + ]; - # Fix plugin dir - substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \ - --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + corePackages = [ + lumina + lumina-calculator + lumina-pdf + ]; - # 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" - "CONFIG+=WITH_I18N" - "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" - ]; - - 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 ]; }; -} + +in pkgs.lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix new file mode 100644 index 000000000000..70e0f2e3511c --- /dev/null +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }: + +stdenv.mkDerivation rec { + pname = "lumina-calculator"; + version = "2019-04-27"; + + src = fetchFromGitHub { + owner = "lumina-desktop"; + repo = pname; + rev = "ccb792fc713aa7163fffd37fc20c83ffe9ca7523"; + sha256 = "0cdyz94znycsc3qxg5bmg51bwms7586d4ja1bsmj8cb9pd3lv980"; + }; + + sourceRoot = "source/src-qt5"; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtbase ]; + + qmakeFlags = [ + "CONFIG+=WITH_I18N" + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + ]; + + meta = with stdenv.lib; { + description = "Scientific calculator for the Lumina Desktop"; + homepage = https://github.com/lumina-desktop/lumina-calculator; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix new file mode 100644 index 000000000000..62d59d18cc55 --- /dev/null +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, poppler }: + +stdenv.mkDerivation rec { + pname = "lumina-pdf"; + version = "2019-04-27"; + + src = fetchFromGitHub { + owner = "lumina-desktop"; + repo = pname; + rev = "645ed591ef91c3607d3ab87dd86f7acfd08b05c9"; + sha256 = "0gl943jb9c9rcgb5wksx3946hwlifghfd27r97skm9is8ih6k0vn"; + }; + + sourceRoot = "source/src-qt5"; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtbase poppler ]; + + postPatch = '' + sed -i '1i\#include <memory>\' Renderer-poppler.cpp + ''; + + qmakeFlags = [ + "CONFIG+=WITH_I18N" + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + ]; + + enableParallelBuilding = false; + + meta = with stdenv.lib; { + description = "PDF viewer for the Lumina Desktop"; + homepage = https://github.com/lumina-desktop/lumina-pdf; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch b/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch index 6ddd9c76591b..6ddd9c76591b 100644 --- a/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch +++ b/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch diff --git a/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch b/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch index f5ef6cba41f6..f5ef6cba41f6 100644 --- a/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch +++ b/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix new file mode 100644 index 000000000000..c758fc38a1b9 --- /dev/null +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -0,0 +1,89 @@ +{ stdenv, + fetchFromGitHub, + desktop-file-utils, + fluxbox, + numlockx, + qmake, + qtbase, + qtmultimedia, + qtsvg, + qttools, + qtx11extras, + xorg, + xscreensaver, + wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "lumina"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "lumina-desktop"; + repo = pname; + rev = "v${version}"; + sha256 = "0rj2gzifr98db7i82cg3hg7l5yfik810pjpawg6n54qbzq987z25"; + }; + + nativeBuildInputs = [ + qmake + qttools + wrapGAppsHook + ]; + + buildInputs = [ + xorg.libxcb + xorg.libXcursor + xorg.libXdamage + xorg.xcbutilwm + xorg.xcbutilimage + qtbase + qtsvg + qtmultimedia + qtx11extras + 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 plugin dir + substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + + # 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" + "CONFIG+=WITH_I18N" + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + ]; + + 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/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 61b24a851941..888750efdf97 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "colm-${version}"; - version = "0.13.0.6"; + version = "0.13.0.7"; src = fetchurl { url = "https://www.colm.net/files/colm/${name}.tar.gz"; - sha256 = "0jd3qmqdm8yszy0yysbp3syk7pcbxvwzv9mibdwz7v9bv1nrai26"; + sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; }; nativeBuildInputs = [ makeWrapper asciidoc ]; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index fc3a8d64a473..197911be0d41 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "heimdal-${version}"; - version = "7.5.0"; + version = "7.6.0"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; rev = "heimdal-${version}"; - sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d"; + sha256 = "1i70xas6wddkw2840lk0ah9w6ddx0dzrslby1ggxlwfmcax8rcgp"; }; outputs = [ "out" "dev" "man" "info" ]; diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix new file mode 100644 index 000000000000..374d9c398eff --- /dev/null +++ b/pkgs/development/libraries/l-smash/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, which }: + +stdenv.mkDerivation rec { + pname = "l-smash"; + version = "2.14.5"; + + src = fetchFromGitHub { + owner = "l-smash"; + repo = pname; + rev = "v${version}"; + sha256 = "0rcq9727im6kd8da8b7kzzbzxdldvmh5nsljj9pvr4m3lj484b02"; + }; + + nativeBuildInputs = [ which ]; + + meta = with stdenv.lib; { + homepage = http://l-smash.github.io/l-smash/; + description = "MP4 container utilities"; + license = licenses.isc; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch b/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch new file mode 100644 index 000000000000..e4b4e592b7a5 --- /dev/null +++ b/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch @@ -0,0 +1,72 @@ +From 77a34d31695e02bc3d06b68c7ca3ff9c3cb67844 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 26 May 2019 19:46:27 +0200 +Subject: [PATCH] Don't detect package version with Git + +This will build in a Nix-based build environment. Instead we ismply +replace `@version@` using `substituteAll`. +--- + dwarf/Makefile | 19 +++++++++---------- + elf/Makefile | 15 +++++++-------- + 2 files changed, 16 insertions(+), 18 deletions(-) + +diff --git a/dwarf/Makefile b/dwarf/Makefile +index 71456bd..f871227 100644 +--- a/dwarf/Makefile ++++ b/dwarf/Makefile +@@ -43,16 +43,15 @@ CLEAN += libdwarf++.so + # Create pkg-config for local library and headers. This will be + # transformed in to the correct global pkg-config by install. + libdwarf++.pc: always +- @(VER=$$(git describe --match 'v*' | sed -e s/^v//); \ +- echo "libdir=$$PWD"; \ +- echo "includedir=$$PWD"; \ +- echo ""; \ +- echo "Name: libdwarf++"; \ +- echo "Description: C++11 DWARF library"; \ +- echo "Version: $$VER"; \ +- echo "Requires: libelf++ = $$VER"; \ +- echo "Libs: -L\$${libdir} -ldwarf++"; \ +- echo "Cflags: -I\$${includedir}") > $@ ++ @(echo "libdir=$$PWD"; \ ++ echo "includedir=$$PWD"; \ ++ echo ""; \ ++ echo "Name: libdwarf++"; \ ++ echo "Description: C++11 DWARF library"; \ ++ echo "Version: @version@"; \ ++ echo "Requires: libelf++ = @version@"; \ ++ echo "Libs: -L\$${libdir} -ldwarf++"; \ ++ echo "Cflags: -I\$${includedir}") > $@ + CLEAN += libdwarf++.pc + + .PHONY: always +diff --git a/elf/Makefile b/elf/Makefile +index 9c7c224..50630a7 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -42,15 +42,14 @@ CLEAN += libelf++.so + # Create pkg-config for local library and headers. This will be + # transformed in to the correct global pkg-config by install. + libelf++.pc: always +- @(VER=$$(git describe --match 'v*' | sed -e s/^v//); \ +- echo "libdir=$$PWD"; \ ++ @(echo "libdir=$$PWD"; \ + echo "includedir=$$PWD"; \ +- echo ""; \ +- echo "Name: libelf++"; \ +- echo "Description: C++11 ELF library"; \ +- echo "Version: $$VER"; \ +- echo "Libs: -L\$${libdir} -lelf++"; \ +- echo "Cflags: -I\$${includedir}") > $@ ++ echo ""; \ ++ echo "Name: libelf++"; \ ++ echo "Description: C++11 ELF library"; \ ++ echo "Version: @version@"; \ ++ echo "Libs: -L\$${libdir} -lelf++"; \ ++ echo "Cflags: -I\$${includedir}") > $@ + CLEAN += libelf++.pc + + .PHONY: always +-- +2.19.2 + diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix new file mode 100644 index 000000000000..2eb1bd0e4fc4 --- /dev/null +++ b/pkgs/development/libraries/libelfin/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, python3, substituteAll }: + +stdenv.mkDerivation rec { + pname = "libelfin"; + version = "unstable-2018-08-25"; + + src = fetchFromGitHub { + owner = "aclements"; + repo = pname; + rev = "ac45a094fadba77ad840063fb7aab82571546be0"; + sha256 = "143x680c6hsy51kngs04ypg4ql3lp498llcwj4lh1v0qp5qvjhyz"; + }; + + patches = [ + (substituteAll { + src = ./0001-Don-t-detect-package-version-with-Git.patch; + inherit version; + }) + ]; + + nativeBuildInputs = [ python3 ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/aclements/libelfin/; + license = licenses.mit; + description = "C++11 ELF/DWARF parser"; + maintainers = with maintainers; [ ma27 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 567be6e55244..737c0dc4a0ab 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "6.4.3"; + version = "6.4.4"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "1h2gwns9mcdsrl8v203pq3r6jcydg3r5nihsl8s17lkfysizrqw8"; + sha256 = "0l62qlln5q1qhapbnm8n1k0hbzf3287gld1jpcbwr0yj79l9j579"; }; nativeBuildInputs = [ gnused python2 ]; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index 483fb56f43b2..c90cff31677b 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -1,14 +1,14 @@ { boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }: stdenv.mkDerivation rec { - name = "libtins-${version}"; - version = "4.0"; - + pname = "libtins"; + version = "4.2"; + src = fetchFromGitHub { owner = "mfontanini"; - repo = "libtins"; + repo = pname; rev = "v${version}"; - sha256 = "13sdqad976j7gq2k1il6g51yxwr8rlqdkzf1kj9mzhihjq8541qs"; + sha256 = "0gv661gdf018zk1sr6fnvcmd5akqjihs4h6zzxv6881v6yhhglrz"; }; postPatch = '' @@ -32,14 +32,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD${placeholder "out"}/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD${placeholder "out"}/lib ''; checkTarget = "tests test"; meta = with stdenv.lib; { description = "High-level, multiplatform C++ network packet sniffing and crafting library"; - homepage = https://libtins.github.io/; + homepage = "https://libtins.github.io/"; + changelog = "https://raw.githubusercontent.com/mfontanini/${pname}/v${version}/CHANGES.md"; license = stdenv.lib.licenses.bsd2; maintainers = with maintainers; [ fdns ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index cde422906dac..11f975187b0b 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "linbox"; - version = "1.6.1"; + version = "1.6.2"; + src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; - sha256 = "11mgj7pkppvzmhx5g6wfnzisk36z00gqzzq9p14hzh5dbdhk3693"; + sha256 = "038br15hhc8dc1hq0pkv6vb1qx9hjr7hjv3w9fq9qwkd870h2v1q"; }; nativeBuildInputs = [ @@ -61,7 +62,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; platforms = stdenv.lib.platforms.unix; - broken = stdenv.isDarwin || stdenv.isAarch64; # https://trac.sagemath.org/ticket/26932#comment:21 homepage = http://linalg.org/; }; } diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix index 73ed932afb63..f74030a02df8 100644 --- a/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/pkgs/development/libraries/nv-codec-headers/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "nv-codec-headers-${version}"; - version = "8.2.15.6"; + pname = "nv-codec-headers"; + version = "9.0.18.1"; src = fetchgit { url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; rev = "n${version}"; - sha256 = "0216ww8byjxz639kagyw0mr9vxxwj89xdnj448d579vjr54jychv"; + sha256 = "0354fivb92ix341jds7a7qn3mgwimrnxbganhlhr4vayj25c3hw5"; }; makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "FFmpeg version of headers for NVENC"; - homepage = http://ffmpeg.org/; + homepage = "https://ffmpeg.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.MP2E ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index cc9353af4dda..a6de278a7a7f 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "ogre-${version}"; - version = "1.11.5"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/OGRECave/ogre/archive/v${version}.zip"; - sha256 = "0hs7b81nr7i4wgsb603kkqw33m6cafjrj2zw4yhibwn8k7zzwddp"; + sha256 = "1hkkg5prixppiq1p5jz7wz1npm5s7kwm1s86079280waccvr2v6x"; }; cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index cd60e0edca1c..1a0e589373ca 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -9,24 +9,16 @@ }: let - version = "4.0.0"; + version = "4.0.1"; in stdenv.mkDerivation rec { name = "openmpi-${version}"; src = with stdenv.lib.versions; fetchurl { url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; - sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"; + sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc"; }; - patches = [ (fetchpatch { - # Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch). - # This bug breaks the test from libs, such as scalapack, - # on machines with less than 4 cores. - url = https://github.com/open-mpi/ompi/commit/98c8492057e6222af6404b352430d0dd7553d253.patch; - sha256 = "1mpd8sxxprgfws96qqlzvqf58pn2vv2d0qa8g8cpv773sgw3b3gj"; - }) ]; - postPatch = '' patchShebangs ./ ''; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 53f9af7a98ac..b4c6574d13a6 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { ) ''; + # Increase individual test timeout from 1500s to 10000s because hydra's builds + # sometimes fail due to this + checkFlagsArray = [ "ARGS=--timeout 10000" ]; + preCheck = '' # make sure the test starts even if we have less than 4 cores export OMPI_MCA_rmaps_base_oversubscribe=1 diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 198c61d37b5a..c746925150bb 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -15,7 +15,7 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" ]; + cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" "-DSPDLOG_BUILD_BENCH=OFF" ]; outputs = [ "out" "doc" ]; @@ -35,8 +35,8 @@ let in { spdlog_1 = generic { - version = "1.2.1"; - sha256 = "0gdj8arfz4r9419zbcxk9y9nv47qr7kyjjzw9m3ijgmn2pmxk88n"; + version = "1.3.1"; + sha256 = "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd"; }; spdlog_0 = generic { diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 10b8bc7cd717..6e4640fabb7b 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation { ln -s $out/bin/wish* $out/bin/wish cp ../{unix,generic}/*.h $out/include ln -s $out/lib/libtk${tcl.release}.so $out/lib/libtk.so + '' + + stdenv.lib.optionalString (stdenv.isDarwin) '' + cp ../macosx/*.h $out/include ''; configureFlags = [ diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix new file mode 100644 index 000000000000..ce7d9940bf2f --- /dev/null +++ b/pkgs/development/python-modules/annoy/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + version = "1.15.2"; + pname = "annoy"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i5bkf8mwd1pyrbhfwncir2r8yq8s9qz5j13vv2qz92n9g57sr3m"; + }; + + checkInputs = [ + nose + ]; + + meta = with stdenv.lib; { + description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk"; + homepage = https://github.com/spotify/annoy; + license = licenses.asl20; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index d23d5bef0e49..2b38f4a9e36e 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,16 +1,16 @@ { stdenv, buildPythonPackage -, fetchPypi, isPy3k, linuxPackages, gcc5 +, fetchPypi, isPy3k, linuxPackages , fastrlock, numpy, six, wheel, pytest, mock , cudatoolkit, cudnn, nccl }: buildPythonPackage rec { pname = "cupy"; - version = "5.2.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "664acff0e1094f0135acca8899318d300258b704e049b1ef0c59154912da53b2"; + sha256 = "1qms1kmzr543hz30jmcmx20cf9xbgzl97a9k44xizsk785dwakbn"; }; checkInputs = [ @@ -18,10 +18,6 @@ buildPythonPackage rec { mock ]; - nativeBuildInputs = [ - gcc5 - ]; - propagatedBuildInputs = [ cudatoolkit cudnn diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 4664e095d26c..c8eca2ac60cb 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , pytest , numpy , nbconvert @@ -8,21 +9,22 @@ , mock , jinja2 , branca -, six , requests }: buildPythonPackage rec { pname = "folium"; - version = "0.8.3"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "b7a1e907caac6ddaf0614555f58ba9af2ed65356ccc77f6ba6fc3df202d8f146"; + sha256 = "66901483808839ed895a685ca7bc4731379f4a627d73a83b77f0df1847b14892"; }; + disabled = pythonOlder "3.5"; + checkInputs = [ pytest nbconvert pandas mock ]; - propagatedBuildInputs = [ jinja2 branca six requests numpy ]; + propagatedBuildInputs = [ jinja2 branca requests numpy ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix index ccf4e1a5ba7f..2909d2c2a6c5 100644 --- a/pkgs/development/python-modules/hetzner/default.nix +++ b/pkgs/development/python-modules/hetzner/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "hetzner"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { repo = "hetzner"; owner = "aszlig"; rev = "v${version}"; - sha256 = "1xd1klvjskv0pg8ginih597jkk491a55b8dq80dsm61m5sbsx3vq"; + sha256 = "152fklxff08s71v0b78yp5ajwpqyszm3sd7j0qsrwa2x9ik4968h"; }; meta = with stdenv.lib; { @@ -20,5 +20,4 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ aszlig ]; }; - } diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 10d57d7264b6..319bf7f24a2f 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.6"; + version = "3.9.8"; src = fetchPypi { inherit pname version; - sha256 = "d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b"; + sha256 = "ca27dc15763759d038a22f4e05d849acc121ffcb8ffe008768f09a0d844f7172"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 5984f2bcb7cf..f003a04e55ea 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -13,6 +13,12 @@ buildPythonPackage rec { inherit mpi; }; + patches = [ ( fetchpatch { + # Upstream patch to ensure compatibility with openmpi-4.0.1 + url = "https://github.com/mpi4py/mpi4py/commit/42f5e35a6a90454516c11131549a08cd766edbb0.patch"; + sha256 = "1dm0i3amwj1cddzz1m9ssd7qp655c8rv1wzjs9ww3kzd90fm4w72"; + })]; + postPatch = '' substituteInPlace test/test_spawn.py --replace \ "unittest.skipMPI('openmpi(<3.0.0)')" \ diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 83796da5f96b..c2fb9612e9c5 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.58"; + version = "0.1.59"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b390400169a4d57b3ddc3bf2123d71f2c9ef9042a50906e13253aa67311f5183"; + sha256 = "4406d9bf49d570ef0ba80be9cf8eb4bd75c08a2909369ebd90b8e94ff07f116e"; }; # PyPI tarball does not include tests/ directory diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 8c4936532994..55a0a355a9e6 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-axolotl"; - version = "0.2.2"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "1had4dq4n26c3hp62rbmhvs1dj3j3z2jhcbddnbsmqmiky8dqs39"; + sha256 = "1bwdp24fmriffwx91aigs9k162albb51iskp23nc939z893q23py"; }; propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ]; diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index f4704c30b5dd..93c051064049 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to implement a well-behaved Unix daemon process"; - homepage = https://alioth.debian.org/projects/python-daemon/; + homepage = "https://pagure.io/python-daemon/"; license = [ licenses.gpl3Plus licenses.asl20 ]; }; } diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix new file mode 100644 index 000000000000..0dd5d58fc8cb --- /dev/null +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -0,0 +1,98 @@ +{ stdenv +, lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, tensorflow +, annoy +, pillow +, matplotlib +, numpy +, pandas +, pygame +, pyopengl +, scipy +, scikitimage +, gym +, bokeh +, kubernetes +, redis +, minio +, pytest +, psutil +}: + +buildPythonPackage rec { + version = "0.12.0"; + pname = "rl-coach"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kfm699rsy63726hpz3fyppl7zbl0fzf0vk2kkfgg718mcjxmdnh"; + }; + + propagatedBuildInputs = [ + tensorflow + annoy + pillow + matplotlib + numpy + pandas + pygame + pyopengl + scipy + scikitimage + gym + bokeh + kubernetes + redis + minio + psutil + ]; + + checkInputs = [ + pytest + ]; + + # run only some tests that do not need any optional dependencies + # available tests: https://github.com/NervanaSystems/coach/tree/master/rl_coach/tests + testsToRun = [ + # test only the tensorflow backend (not mxnet) + "architectures/tensorflow_components" + "agents" + "exploration_policies" + "filters" + "memories" + "utils" + ]; + checkPhase = let + fullTestPaths = map (testfile: "rl_coach/tests/${testfile}") testsToRun; + escapedPaths = map lib.escapeShellArg fullTestPaths; + pytestArgs = builtins.concatStringsSep " " escapedPaths; + in + '' + pytest ${pytestArgs} + ''; + + postPatch = '' + # pinned to 8.0.1 for unknown reason, at least basic functionallity seems to work without it + # https://github.com/NervanaSystems/coach/pull/149#issuecomment-495915804 + sed -i '/kubernetes/d' requirements.txt + + # this is just an "intel-optimized" version of tensorflow, e.g. an implementation detail + sed -i 's/intel-tensorflow/tensorflow/g' setup.py + + # backports of python3 features not needed + # https://github.com/NervanaSystems/coach/issues/324 + sed -i '/futures/d' requirements.txt + ''; + + disabled = pythonOlder "3.5"; # minimum required version + + meta = with stdenv.lib; { + description = "Enables easy experimentation with state of the art Reinforcement Learning algorithms"; + homepage = "https://nervanasystems.github.io/coach/"; + license = licenses.asl20; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index 7c89d9d1f8d9..c6795f172064 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -1,24 +1,13 @@ { lib -, python +, buildPythonPackage +, fetchPypi +, pytest +, boto3 +, six +, pyyaml +, mock }: -let - py = python.override { - packageOverrides = self: super: { - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "3.12"; - src = oldAttrs.src.override { - inherit version; - sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"; - }; - }); - }; - }; - -in - -with py.pkgs; - buildPythonPackage rec { pname = "serverlessrepo"; version = "0.1.8"; @@ -40,6 +29,10 @@ buildPythonPackage rec { pytest tests/unit ''; + postPatch = '' + substituteInPlace setup.py --replace "pyyaml~=3.12" "pyyaml~=5.1" + ''; + meta = with lib; { homepage = https://github.com/awslabs/aws-serverlessrepo-python; description = "Helpers for working with the AWS Serverless Application Repository"; diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index 3aea75e3de82..e45638edd101 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - pname = "python-setproctitle"; - version = "1.1.9"; + pname = "setproctitle"; + version = "1.1.10"; src = fetchPypi { inherit pname version; - sha256 = "1mqadassxcm0m9r1l02m5vr4bbandn48xz8gifvxmb4wiz8i8d0w"; + sha256 = "6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 87de719025dc..5360b951de26 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -31,7 +31,8 @@ buildPythonPackage rec { # Disable test_tcp_async because fails on sandbox build checkPhase = '' - pytest --deselect=streamz/tests/test_sources.py::test_tcp_async + pytest --deselect=streamz/tests/test_sources.py::test_tcp_async \ + --deselect=streamz/tests/test_sources.py::test_tcp ''; meta = with lib; { diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index e5597e7aea89..7dc09d58aad6 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "45"; + version = "47"; disabled = !isPy3k; # ignore failing pytest @@ -55,7 +55,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "WeasyPrint"; - sha256 = "04bf2p2x619g4q4scg8v6v57c24vwn7qckvz81rckj8clzifyr82"; + sha256 = "0hd1zwrkfnj7g0jaaf6jvarlj6l5imar6ar78zxdgv17a3s3k3dg"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix new file mode 100644 index 000000000000..d5a666856464 --- /dev/null +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pillow +, html5lib +, pypdf2 +, reportlab +, six +}: + +buildPythonPackage rec { + pname = "xhtml2pdf"; + version = "0.2.3"; + + propagatedBuildInputs = [pillow html5lib pypdf2 reportlab six]; + + src = fetchPypi { + inherit pname version; + sha256 = "10kg8cmn7zgql2lb6cfmqj94sa0jkraksv3lc4kvpn58sxw7x8w6"; + }; + + meta = with stdenv.lib; { + description = "A PDF generator using HTML and CSS"; + homepage = https://github.com/xhtml2pdf/xhtml2pdf; + license = licenses.asl20; + }; + +} diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 70fb86559d90..c4095a6f9b3c 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -59,6 +59,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.21.0" substituteInPlace requirements/base.txt --replace "six~=1.11.0" "six~=1.12.0" + substituteInPlace requirements/base.txt --replace "PyYAML~=3.12" "PyYAML~=5.1" ''; meta = with lib; { diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 7e599ed8de71..ee61a745f10b 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoPackage rec { name = "go-tools-${version}"; - version = "2017.2.2"; + version = "2019.1.1"; goPackagePath = "honnef.co/go/tools"; - excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|unused\)/testdata''; + excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata''; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = "${version}"; - sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7"; + sha256 = "1zwh64x3i32p6f6808q609n63xda3bq888n43wl4alpx1b08spha"; }; goDeps = ./deps.nix; @@ -23,7 +23,7 @@ buildGoPackage rec { description = "A collection of tools and libraries for working with Go code, including linters and static analysis."; homepage = https://staticcheck.io; license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ rvolosatovs kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/go-tools/deps.nix b/pkgs/development/tools/go-tools/deps.nix index afe5e50e47bd..469d4b9d1530 100644 --- a/pkgs/development/tools/go-tools/deps.nix +++ b/pkgs/development/tools/go-tools/deps.nix @@ -1,4 +1,13 @@ [ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } { goPackagePath = "github.com/kisielk/gotool"; fetch = { @@ -13,8 +22,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "96e9e165b75e735822645eff82850b08c377be36"; - sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg"; + rev = "2c0ae70061356820330c96810d9483beb9a6da8e"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; }; } ] diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 162ac045a9de..24a6404dc039 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.4.0"; + version = "1.4.1"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56"; + sha256 = "13pj48pbhl47rwyi6gd6dhq9wq0z2h8kzjkahhqhf62dfssv35db"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index f418229f893b..d08df8265b0a 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -43,8 +43,8 @@ in }; ragelDev = generic { - version = "7.0.0.11"; - sha256 = "0h2k9bfz9i7x9mvr9rbsrzz8fk17756zwwrkf3fppvm9ivzwdfh8"; + version = "7.0.0.12"; + sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 056ecd0ca680..0a8810881f85 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.19.1"; + version = "0.19.2"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "1bv5gv5zd9h0yw7wb28r0c4z9wqa6n7ac4ipd855apwz1v7sm9n3"; + sha256 = "175cflcm9k81fpp2pxz4hcaf8v3i7jqc9gcr4flnsqxjrh22vymp"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/8a12a07cafeff4ef4a01983f5243dd8c95d10c48/cargo-make-0.19.1-Cargo.lock"; - sha256 = "0v2hygkpsyjcpzrgyzl5mah0y8gmprfbnz7kn4hh6zfhz2lhqqwm"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/f1e6360acfbe5ae573f8f31a82a5c881a6f0ed68/cargo-make-Cargo.lock"; + sha256 = "004dx4gyby5smpvawqv946mambcg59zq6n8h89hz61mxkh7frmh4"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0j7gyg6l428gypjpfgdz082vz8m86cx1wy2r47az3sc3skl6dhkq"; + cargoSha256 = "1hmfg3x9p5a2vz2r3v8m5wgyabbybl5lcjvi930b9wi5cnfm756g"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 126ece257801..032865be7f5f 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -135,6 +135,6 @@ in stdenv.mkDerivation rec { ''; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jb55 tesq0 ]; + maintainers = with maintainers; [ tesq0 ]; }; } diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index b39eb987e00d..3a7b410a04bd 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, lua, ncurses +{ stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, CoreFoundation , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa , debug, runtimeShell }: let - inherit (stdenv.lib) optionals; + inherit (stdenv.lib) optionals optionalString; - cursesDeps = [ gettext lua ncurses ]; + cursesDeps = [ gettext ncurses ] + ++ optionals stdenv.isDarwin [ CoreFoundation ]; tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ] ++ optionals stdenv.isDarwin [ Cocoa ]; @@ -21,7 +22,7 @@ let ''; makeFlags = [ - "PREFIX=$(out)" "LUA=1" "USE_HOME_DIR=1" "LANGUAGES=all" + "PREFIX=$(out)" "USE_HOME_DIR=1" "LANGUAGES=all" ] ++ optionals (!debug) [ "RELEASE=1" ] ++ optionals tiles [ @@ -30,8 +31,19 @@ let "NATIVE=osx" "CLANG=1" ]; + postInstall = optionalString tiles + ( if !stdenv.isDarwin + then utils.installXDGAppLauncher + else utils.installMacOSAppLauncher + ); + dontStrip = debug; + # https://hydra.nixos.org/build/65193254 + # src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory + # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "A free, post apocalyptic, zombie infested rogue-like"; longDescription = '' diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index 3ddac8f3fc7a..84a70c275a2f 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -1,50 +1,33 @@ -{ stdenv, callPackage, ncurses -, tiles ? true, Cocoa, libicns +{ stdenv, callPackage, lua, CoreFoundation +, tiles ? true, Cocoa , debug ? false }: let - inherit (stdenv.lib) optionals optionalString; - inherit (callPackage ./common.nix { inherit tiles Cocoa debug; }) common utils; - inherit (utils) fetchFromCleverRaven installMacOSAppLauncher; + inherit (callPackage ./common.nix { inherit tiles CoreFoundation Cocoa debug; }) common utils; + inherit (utils) fetchFromCleverRaven; in stdenv.mkDerivation (common // rec { - version = "0.C"; + version = "0.D"; name = "cataclysm-dda-${version}"; src = fetchFromCleverRaven { rev = "${version}"; - sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv"; + sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc"; }; - nativeBuildInputs = common.nativeBuildInputs - ++ optionals (tiles && stdenv.isDarwin) [ libicns ]; + buildInputs = common.buildInputs ++ [ lua ]; patches = [ ./patches/fix_locale_dir.patch ]; - makeFlags = common.makeFlags - ++ optionals stdenv.isDarwin [ - "OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above - ] ++ optionals stdenv.cc.isGNU [ - "WARNINGS+=-Wno-deprecated-declarations" - "WARNINGS+=-Wno-ignored-attributes" - ] ++ optionals stdenv.cc.isClang [ - "WARNINGS+=-Wno-inconsistent-missing-override" - ]; - - NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang "-Wno-user-defined-warnings"; - - postBuild = optionalString (tiles && stdenv.isDarwin) '' - # iconutil on macOS is not available in nixpkgs - png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/* + postPatch = common.postPatch + '' + substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" ''; - postInstall = optionalString (tiles && stdenv.isDarwin) - installMacOSAppLauncher; - - # Disable, possible problems with hydra - #enableParallelBuilding = true; + makeFlags = common.makeFlags ++ [ + "LUA=1" + ]; meta = with stdenv.lib.maintainers; common.meta // { maintainers = common.meta.maintainers ++ [ skeidel ]; diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index c8f031d31942..b872e95d5896 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,43 +1,29 @@ -{ stdenv, callPackage -, tiles ? true, Cocoa, CoreFoundation +{ stdenv, callPackage, CoreFoundation +, tiles ? true, Cocoa , debug ? false }: let - inherit (stdenv.lib) optionals optionalString substring; - inherit (callPackage ./common.nix { inherit tiles Cocoa debug; }) common utils; - inherit (utils) fetchFromCleverRaven installXDGAppLauncher installMacOSAppLauncher; + inherit (stdenv.lib) substring; + inherit (callPackage ./common.nix { inherit tiles CoreFoundation Cocoa debug; }) common utils; + inherit (utils) fetchFromCleverRaven; in stdenv.mkDerivation (common // rec { - version = "2018-07-15"; + version = "2019-05-03"; name = "cataclysm-dda-git-${version}"; src = fetchFromCleverRaven { - rev = "e1e5d81"; - sha256 = "198wfj8l1p8xlwicj92cq237pzv2ha9pcf240y7ijhjpmlc9jkr1"; + rev = "65a05026e7306b5d1228dc6ed885c43447f128b5"; + sha256 = "18yn0h6b4j9lx67sq1d886la3l6l7bqsnwj6mw2khidssiy18y0n"; }; - buildInputs = common.buildInputs - ++ optionals stdenv.isDarwin [ CoreFoundation ]; - patches = [ ./patches/fix_locale_dir_git.patch ]; makeFlags = common.makeFlags ++ [ "VERSION=git-${version}-${substring 0 8 src.rev}" ]; - postInstall = optionalString tiles - ( if !stdenv.isDarwin - then installXDGAppLauncher - else installMacOSAppLauncher - ); - - # https://hydra.nixos.org/build/65193254 - # src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory - # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 - enableParallelBuilding = false; - meta = with stdenv.lib.maintainers; common.meta // { maintainers = common.meta.maintainers ++ [ rardiol ]; }; diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch index 775a8ec6007d..60a3dc457453 100644 --- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch @@ -1,20 +1,20 @@ diff --git a/src/translations.cpp b/src/translations.cpp -index 6520cfe..49f7b2c 100644 +index 2585b7ec56..7bb005823c 100644 --- a/src/translations.cpp +++ b/src/translations.cpp -@@ -72,15 +72,11 @@ void set_language(bool reload_options) - - // Step 2. Bind to gettext domain. - const char *locale_dir; --#ifdef __linux__ - if (!FILENAMES["base_path"].empty()) { - locale_dir = std::string(FILENAMES["base_path"] + "share/locale").c_str(); +@@ -195,14 +195,12 @@ void set_language() + auto env = getenv( "LANGUAGE" ); + locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) + + "/LC_MESSAGES/cataclysm-dda.mo" ); +-#elif (defined __linux__ || (defined MACOSX && !defined TILES)) ++#else + if( !FILENAMES["base_path"].empty() ) { + locale_dir = FILENAMES["base_path"] + "share/locale"; } else { locale_dir = "lang/mo"; } -#else - locale_dir = "lang/mo"; --#endif // __linux__ + #endif - bindtextdomain("cataclysm-dda", locale_dir); - bind_textdomain_codeset("cataclysm-dda", "UTF-8"); + const char *locale_dir_char = locale_dir.c_str(); diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch b/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch index c3140af03c8b..1b92c8816614 100644 --- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch @@ -1,12 +1,13 @@ diff --git a/src/translations.cpp b/src/translations.cpp -index 3a86291..e6c5f84 100644 +index 0068a35785..c8034cbeac 100644 --- a/src/translations.cpp +++ b/src/translations.cpp -@@ -176,15 +176,11 @@ void set_language() - - // Step 2. Bind to gettext domain. - std::string locale_dir; --#if (defined __linux__ || (defined MACOSX && !defined TILES)) +@@ -202,14 +202,12 @@ void set_language() + auto env = getenv( "LANGUAGE" ); + locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) + + "/LC_MESSAGES/cataclysm-dda.mo" ); +-#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES))) ++#else if( !FILENAMES["base_path"].empty() ) { locale_dir = FILENAMES["base_path"] + "share/locale"; } else { @@ -14,7 +15,6 @@ index 3a86291..e6c5f84 100644 } -#else - locale_dir = "lang/mo"; --#endif // __linux__ + #endif const char *locale_dir_char = locale_dir.c_str(); - bindtextdomain( "cataclysm-dda", locale_dir_char ); diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix new file mode 100644 index 000000000000..36f6ca5b8c0c --- /dev/null +++ b/pkgs/misc/dumb/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, allegro, SDL2 }: + +stdenv.mkDerivation rec { + name = "dumb-${version}"; + version = "2.0.3"; + enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ allegro SDL2 ]; + + src = fetchFromGitHub { + owner = "kode54"; + repo = "dumb"; + rev = version; + sha256 = "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6"; + }; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE='Release'" + "-DBUILD_EXAMPLES='OFF'" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/kode54/dumb"; + description = "Module/tracker based music format parser and player library"; + license = licenses.free; # Derivative of GPL + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix index 5eb6e3b160ef..3806d25e5d00 100644 --- a/pkgs/misc/emulators/xcpc/default.nix +++ b/pkgs/misc/emulators/xcpc/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, libdsk, pkgconfig, glib, libXaw, libX11, libXext, lesstif }: +{ stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext + , libDSKSupport ? true, libdsk + , motifSupport ? false, lesstif +}: +with stdenv.lib; stdenv.mkDerivation rec { version = "20070122"; - name = "xcpc-${version}"; + pname = "xcpc"; src = fetchurl { - url = "mirror://sourceforge/xcpc/${name}.tar.gz"; + url = "mirror://sourceforge/xcpc/${pname}-${version}.tar.gz"; sha256 = "0hxsbhmyzyyrlidgg0q8izw55q0z40xrynw5a1c3frdnihj9jf7n"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libdsk libXaw libX11 libXext lesstif ]; - meta = with stdenv.lib; { + buildInputs = [ glib libdsk libXaw libX11 libXext ] + ++ optional libDSKSupport libdsk + ++ optional motifSupport lesstif; + + meta = { description = "A portable Amstrad CPC 464/664/6128 emulator written in C"; - homepage = https://www.xcpc-emulator.net; + homepage = "https://www.xcpc-emulator.net"; license = licenses.gpl2Plus; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index a12d7d7d5acd..446aac629829 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -51,6 +51,16 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=d3537a54740d78c5895ec83694a07b3e4f616f61"; sha256 = "1hr8bpi87bbg1kvv28kflmfh1dhzxw66p9q0ddvbrj72qd86p3kx"; }) + (fetchpatch { + name = "CVE-2019-3839-part-1"; + url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=4ec9ca74bed49f2a82acb4bf430eae0d8b3b75c9"; + sha256 = "0gn1n9fq5msrxxzspidcnmykp1iv3yvx5485fddmgrslr52ngcf9"; + }) + (fetchpatch { + name = "CVE-2019-3839-part-2"; + url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=db24f253409d5d085c2760c814c3e1d3fa2dac59"; + sha256 = "1h6kpwc6ryr6jlxjr6bfnvmmf8x0kqmyjlx3hggqjs23n0wsr9p9"; + }) ]; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix new file mode 100644 index 000000000000..957acbaa4068 --- /dev/null +++ b/pkgs/misc/sndio/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, alsaLib }: + +stdenv.mkDerivation rec { + name = "sndio-${version}"; + version = "1.2.0"; + enableParallelBuilding = true; + buildInputs = [ alsaLib ]; + + src = fetchurl { + url = "http://www.sndio.org/sndio-${version}.tar.gz"; + sha256 = "1p3cw7s6ylmvafbf9a5w5bkh3cy4s1d73hdh0i24m441jhc8x05r"; + }; + + meta = with stdenv.lib; { + homepage = "http://www.sndio.org"; + description = "Small audio and MIDI framework part of the OpenBSD project"; + license = licenses.isc; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index fb7e163dbe7f..ec513c5a7b92 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -16,8 +16,8 @@ rec { mktplcRef = { name = "vscode-hie-server"; publisher = "alanz"; - version = "0.0.25"; # see the note above - sha256 = "0m21w03v94qxm0i54ki5slh6rg7610zfxinfpngr0hfpgw2nnxvc"; + version = "0.0.27"; # see the note above + sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h"; }; meta = { license = stdenv.lib.licenses.mit; @@ -52,8 +52,8 @@ rec { mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "2.5.0"; # see the note above - sha256 = "10jqj8qw5x6da9l8zhjbra3xcbrwb4cpwc3ygsy29mam5pd8g6b3"; + version = "2.6.0"; # see the note above + sha256 = "1891pg4x5qkh151pylvn93c4plqw6vgasa4g40jbma5xzq8pygr4"; }; meta = { license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 6d8e59ba095c..7a8a097b8d42 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "2.1.1"; - sha256 = "14qy073dfw0b4mk76l17il65r44jrz7pn1hvlj84562qp48b8skz"; + version = "2.1.2"; + sha256 = "1cdxmqdz8h9snx25cm3phipxdhjbcn38yfab09in661nr768vrkv"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index d604c9ef6b79..38069981723d 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "5.0-63503"; src = fetchzip { - url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip"; sha256 = "0qbp63l74s0i80ysh9ya8x7r79xkddbbz4378nms9i7a0kprg9p2"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ef6c3d1da8b0..614466bde322 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.121"; + version = "4.14.122"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1118vcfw2p29h85rzs5cpfax3w79fv6x8v38vnvci609ba1ddv1f"; + sha256 = "1xb87zwnw0sv9v53c61jlw9d1dl15m7rbq4h50yqpqbpz07g98y8"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5cf19ed57c4f..d5474cc9f6b5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.45"; + version = "4.19.46"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0awx9d8i73naz5b27vzjpv5l4vblr65dvv1ci7dyxaihpcpyccgb"; + sha256 = "0yp6azpw1phnng39jlyykhyqdfgpxar739fvlgs5j8l7ibz54yq9"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index ea88cba5b89d..5339c43006e6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.178"; + version = "4.9.179"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ri50wiwqxnrl26b48czqvblkc20ys779x17x7wyk72xfaqdizqk"; + sha256 = "1qqy2ysd61gq9zlh1yg71354wn8rbp8hkz94j6nnv00305xlnbjk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index c0d407cd8f70..28a1501cb1bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.18"; + version = "5.0.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1n5hdn9wkdx0483lc86h3ys14p1309n00gqy7w0qm8m7j0yhpgbz"; + sha256 = "1v6r2jifm3r56rj7d9w1x3g8va3snzmz7lmgk971ihdg9p3dbw0b"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index b8e29ed54afa..496d119a2beb 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.4"; + version = "5.1.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1yg7s6mcfi4kvlf0ykfj5j54flwdx0xjzjygnhx2nralpbx6avaw"; + sha256 = "1nvdrzrqqx5whj8sfqrxn1xmxx64595j0iz2wkzgpglprbsr17yp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 6488f98565a9..14996fd76be5 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd, liburcu }: stdenv.mkDerivation rec { - name = "multipath-tools-0.6.2"; + name = "multipath-tools-${version}"; + version = "0.6.2"; src = fetchurl { name = "${name}.tar.gz"; - url = "https://git.opensvc.com/"; + url = "https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${version};sf=tgz"; sha256 = "159hxvbk9kh1qay9x04w0gsqzg0hkl5yghfc1wi9kv2n5pcwbkpm"; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ff0416b4efcc..934a7a100335 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -41,7 +41,15 @@ rec { settingsSha256 = "0n4pj8dzkr7ccwrn5p46mn59cnijdhg8zmn3idjzrk56pq0hbgjr"; persistencedSha256 = "0bnjr0smhlwlqpyg9m6lca3b7brl2mw8aypc6p7525dn9d9kv6kb"; - patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; + patches = [ + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-4.16.patch?h=2ad07241ea525a6b6b555b6cb96a97634a4b2cb0"; + sha256 = "11b3dp0na496rn13v5q4k66bf61174800g36rcwj42r0xj9cfak2"; + }) + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-5.1.patch?h=42d50ef8d6048608d18bdf2c296dd335260c5a1a"; + sha256 = "03v46ym2bcckg9q2xrilkg21hfiwypr6gl4jmly2q3m4yza9ja6r"; + })]; }; legacy_340 = generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch b/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch deleted file mode 100644 index 58cf06fae45f..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ura a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c ---- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:38:31.807453997 -0400 -+++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:39:22.446185824 -0400 -@@ -226,7 +226,7 @@ - - - if (nv_connector->edid != NULL) { -- drm_mode_connector_update_edid_property( -+ drm_connector_update_edid_property( - connector, nv_connector->edid); - } - -diff -ura a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c ---- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:38:31.807453997 -0400 -+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:39:35.083798484 -0400 -@@ -216,7 +216,7 @@ - - /* Attach encoder and connector */ - -- ret = drm_mode_connector_attach_encoder(connector, encoder); -+ ret = drm_connector_attach_encoder(connector, encoder); - - if (ret != 0) { - NV_DRM_DEV_LOG_ERR( diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index d5bbe91979ff..ecaa4e89d49d 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "roccat-tools-${version}"; - version = "5.8.0"; + version = "5.9.0"; src = fetchurl { url = "mirror://sourceforge/roccat/${name}.tar.bz2"; - sha256 = "0fr1ibgsyx756fz43hxq0cik51rkq1ymgimw8mz2d0jy63d7h48q"; + sha256 = "12j02rzbz3iqxprz8cj4kcfcdgnqlva142ci177axqmckcq6crvg"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 52542aabfded..57544659e868 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "rtl8192eu-${kernel.version}-${version}"; - version = "4.4.1"; + version = "4.4.1.20190319"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "4094004"; - sha256 = "0rgcsp8bd5i5ik9b35qipdhq0xd8pva8kdijixxfaxm4vw6kbrvr"; + rev = "0a7199b"; + sha256 = "0xxb8z7fd997ny53bgmf95hyqsmwjplbj6fry0rf65k9x9nggx71"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 9cb28d5dc8dc..ca63c5c6a8df 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8821au-${kernel.version}-${version}"; - version = "5.1.5"; + version = "5.1.5+41"; src = fetchFromGitHub { owner = "zebulon2"; repo = "rtl8812au"; - rev = "61d0cd95afc01eae64da0c446515803910de1a00"; - sha256 = "0dlzyiaa3hmb2qj3lik52px88n4mgrx7nblbm4s0hn36g19ylssw"; + rev = "ecd3494c327c54110d21346ca335ef9e351cb0be"; + sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q"; }; nativeBuildInputs = [ bc ]; diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index f2fd4d4a61a8..f795d36207a8 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -11,13 +11,8 @@ stdenv.mkDerivation { KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - makeFlags = [ - "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "INSTALL_MOD_PATH=$(out)" - ]; - preBuild = "makeFlagsArray+=(\"M=$(pwd)\")"; - buildFlags = [ "modules" ]; - installTargets = [ "modules_install" ]; + makeFlags = [ "INSTALL_MOD_PATH=$(out)" ]; + installTargets = [ "install" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 3272065efbef..61476a892d64 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,43 +1,35 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, libtool , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka -, readline, sparsehash, unixODBC, zstd, ninja, jemalloc +, readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash }: stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "18.16.1"; + version = "19.6.2.11"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "02slllcan7w3ln4c9yvxc8w0h2vszd7n0wshbn4bra2hb6mrzyp8"; + sha256 = "0bs38a8dm5x43klx4nc5dwkkxpab12lp2chyvc2y47c75j7rn5d7"; }; nativeBuildInputs = [ cmake libtool ninja ]; buildInputs = [ boost capnproto cctz clang-unwrapped double-conversion gperftools icu libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka - readline sparsehash unixODBC zstd jemalloc + readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash ]; cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" - "-DUSE_INTERNAL_SSL_LIBRARY=False" - ]; - - patches = [ - (fetchpatch { - url = "https://github.com/yandex/ClickHouse/commit/afbcdf2f00a04e747c5279414cf4691f29bb5cc2.patch"; - sha256 = "17y891q0dp179w3jv32h74pbfwyzgnz4dxxwv73vzdwvys4i8c8z"; - }) ]; postPatch = '' - patchShebangs copy_headers.sh + patchShebangs dbms/programs/clang/copy_headers.sh ''; postInstall = '' diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index a578b7e0e538..4ae96e95269c 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -41,7 +41,7 @@ let cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - (lib.optionalString officialRelease "FDB_RELEASE=1") + (lib.optionalString officialRelease "-DFDB_RELEASE=TRUE") # FIXME: why can't libressl be found automatically? "-DLIBRESSL_USE_STATIC_LIBS=FALSE" diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 713cc135d294..ec28986f2e20 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -69,11 +69,9 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild rec { - version = "6.1.7pre4928_${substring 0 7 rev}"; + version = "6.1.8"; branch = "release-6.1"; - rev = "a990458e81612632159bbf75167a36f64ef228d1"; - sha256 = "1b8ij78xjy30q93hvnrw8llw16q5zlmlq3l6dvnnf8w6ws88y1k0"; - officialRelease = false; + sha256 = "1qd9yf3a7a99nfx7vky0jy8r74yrxjwp9imc6792awn66256pxiv"; patches = [ ./patches/clang-libcxx.patch diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index 92ec5d97dcd5..7fc80ed75407 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -1,12 +1,12 @@ -{ lib, python3, glibcLocales }: +{ lib, python3 }: python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.6.0"; + version = "0.7.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0yjqjfqr1gc4c9k5z5i7ngcpcwmyp3lzs4xv7allgqvglmw26ji4"; + sha256 = "a38d4669201ac2afa71b6578a220bf4d6d59131263b278d51ebd1479677f6baf"; }; postPatch = '' @@ -14,16 +14,10 @@ python3.pkgs.buildPythonApplication rec { sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" setup.py ''; - nativeBuildInputs = [ - glibcLocales - ]; - propagatedBuildInputs = with python3.pkgs; [ requests netdisco click click-log tabulate jsonpath_rw jinja2 dateparser regex ruamel_yaml aiohttp ]; - LC_ALL = "en_US.UTF-8"; - postInstall = '' mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" $out/bin/hass-cli completion bash > "$out/share/bash-completion/completions/hass-cli" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c7f1bb475c1b..223e2ff8f5ec 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.92.2"; + version = "0.93.2"; components = { "abode" = ps: with ps; [ ]; "acer_projector" = ps: with ps; [ pyserial ]; @@ -19,6 +19,7 @@ "alexa" = ps: with ps; [ aiohttp-cors ]; "alpha_vantage" = ps: with ps; [ ]; "amazon_polly" = ps: with ps; [ boto3 ]; + "ambiclimate" = ps: with ps; [ ]; "ambient_station" = ps: with ps; [ ]; "amcrest" = ps: with ps; [ ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; @@ -56,6 +57,7 @@ "bh1750" = ps: with ps; [ ]; "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ ]; + "bizkaibus" = ps: with ps; [ ]; "blackbird" = ps: with ps; [ ]; "blink" = ps: with ps; [ ]; "blinksticklight" = ps: with ps; [ BlinkStick ]; @@ -188,6 +190,7 @@ "epsonworkforce" = ps: with ps; [ ]; "eq3btsmart" = ps: with ps; [ construct ]; "esphome" = ps: with ps; [ aioesphomeapi ]; + "essent" = ps: with ps; [ ]; "etherscan" = ps: with ps; [ ]; "eufy" = ps: with ps; [ ]; "everlights" = ps: with ps; [ ]; @@ -319,6 +322,7 @@ "image_processing" = ps: with ps; [ aiohttp-cors ]; "imap" = ps: with ps; [ ]; "imap_email_content" = ps: with ps; [ ]; + "incomfort" = ps: with ps; [ ]; "influxdb" = ps: with ps; [ influxdb ]; "input_boolean" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; @@ -332,6 +336,7 @@ "iota" = ps: with ps; [ ]; "iperf3" = ps: with ps; [ ]; "ipma" = ps: with ps; [ ]; + "iqvia" = ps: with ps; [ numpy ]; "irish_rail_transport" = ps: with ps; [ ]; "islamic_prayer_times" = ps: with ps; [ ]; "iss" = ps: with ps; [ ]; @@ -411,6 +416,7 @@ "message_bird" = ps: with ps; [ ]; "met" = ps: with ps; [ ]; "meteo_france" = ps: with ps; [ ]; + "meteoalarm" = ps: with ps; [ ]; "metoffice" = ps: with ps; [ ]; "mfi" = ps: with ps; [ ]; "mhz19" = ps: with ps; [ ]; @@ -456,12 +462,12 @@ "ness_alarm" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; "netatmo" = ps: with ps; [ aiohttp-cors pyatmo ]; - "netatmo_public" = ps: with ps; [ aiohttp-cors pyatmo ]; "netdata" = ps: with ps; [ ]; "netgear" = ps: with ps; [ ]; "netgear_lte" = ps: with ps; [ ]; "netio" = ps: with ps; [ aiohttp-cors ]; "neurio_energy" = ps: with ps; [ ]; + "nextbus" = ps: with ps; [ ]; "nfandroidtv" = ps: with ps; [ ]; "niko_home_control" = ps: with ps; [ ]; "nilu" = ps: with ps; [ ]; @@ -502,6 +508,7 @@ "openuv" = ps: with ps; [ ]; "openweathermap" = ps: with ps; [ pyowm ]; "opple" = ps: with ps; [ ]; + "orangepi_gpio" = ps: with ps; [ ]; "orvibo" = ps: with ps; [ ]; "osramlightify" = ps: with ps; [ ]; "otp" = ps: with ps; [ pyotp ]; @@ -528,7 +535,6 @@ "plum_lightpad" = ps: with ps; [ ]; "pocketcasts" = ps: with ps; [ ]; "point" = ps: with ps; [ aiohttp-cors ]; - "pollen" = ps: with ps; [ numpy ]; "postnl" = ps: with ps; [ ]; "prezzibenzina" = ps: with ps; [ ]; "proliphix" = ps: with ps; [ ]; @@ -537,6 +543,7 @@ "proximity" = ps: with ps; [ ]; "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; + "ptvsd" = ps: with ps; [ ]; "pulseaudio_loopback" = ps: with ps; [ ]; "push" = ps: with ps; [ aiohttp-cors ]; "pushbullet" = ps: with ps; [ pushbullet ]; @@ -666,6 +673,7 @@ "swisscom" = ps: with ps; [ ]; "switch" = ps: with ps; [ ]; "switchbot" = ps: with ps; [ ]; + "switcher_kis" = ps: with ps; [ ]; "switchmate" = ps: with ps; [ ]; "syncthru" = ps: with ps; [ ]; "synology" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6de571b1e0f1..408f4ecb1e05 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -24,8 +24,8 @@ let "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") (mkOverride "async-timeout" "3.0.1" "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") - (mkOverride "attrs" "18.2.0" - "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") + (mkOverride "attrs" "19.1.0" + "f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399") (mkOverride "bcrypt" "3.1.6" "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea") (mkOverride "pyjwt" "1.7.1" @@ -40,35 +40,22 @@ let "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf") (mkOverride "requests" "2.21.0" "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") - (mkOverride "ruamel_yaml" "0.15.91" - "692f03ed24c8c1d9fa9fd4c045f7ba1c26f1e96edb8bfb4d54854ba26bc02319") + (mkOverride "ruamel_yaml" "0.15.94" + "0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.1.0" "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f") # used by auth.mfa_modules.totp - (mkOverride "pyotp" "2.2.6" - "dd9130dd91a0340d89a0f06f887dbd76dd07fb95a8886dc4bc401239f2eebd69") + (mkOverride "pyotp" "2.2.7" + "be0ffeabddaa5ee53e7204e7740da842d070cf69168247a3d0c08541b84de602") # used by check_config script # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved (mkOverride "colorlog" "4.0.2" "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42") - # required by home-assistant-frontend - (self: super: { - user-agents = super.user-agents.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0"; - src = fetchFromGitHub { - owner = "selwin"; - repo = "python-user-agents"; - rev = "v${version}"; - sha256 = "0ix2yajqdnfj433j50dls90mkmqz8m4fiywxg097zwkkc95wm8s4"; - }; - }); - }) - # required by aioesphomeapi (self: super: { protobuf = super.protobuf.override { @@ -109,7 +96,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.92.2"; + hassVersion = "0.93.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -124,7 +111,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "10kqfj7gi8w0d9jalb4i2w4ifla8jkllymjav74abc4b30y08vmw"; + sha256 = "01zdg6yfj6qal8jpr9bskmq25crrvz7w3vifrfxmlqws6hv35gc8"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 9919270a8d02..c65d3b6de82a 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -1,16 +1,14 @@ -{ lib, fetchPypi, buildPythonPackage, user-agents }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20190427.0"; + version = "20190514.0"; src = fetchPypi { inherit pname version; - sha256 = "eb14e7be0ad591ad4623c67db752bc4eb4f4e43ce60bb0f6d1909e9ad9399d91"; + sha256 = "ba8cfa01b00ff2ee94a91cd83197b4d213e9b9df151daaef11dd0a56d34c5414"; }; - propagatedBuildInputs = [ user-agents ]; - # no Python tests implemented doCheck = false; diff --git a/pkgs/servers/http/tengine/check-resolv-conf.patch b/pkgs/servers/http/tengine/check-resolv-conf.patch new file mode 100644 index 000000000000..c46482b30149 --- /dev/null +++ b/pkgs/servers/http/tengine/check-resolv-conf.patch @@ -0,0 +1,14 @@ +diff --git a/auto/unix b/auto/unix +index a38c12dc..025a4899 100644 +--- a/auto/unix ++++ b/auto/unix +@@ -1072,9 +1072,7 @@ ngx_feature_test='int fd; + + + # Auto read nameserver from /etc/resolv.conf. +- if [ -f "/etc/resolv.conf" ]; then + have=NGX_RESOLVER_FILE + value=\"/etc/resolv.conf\" + . auto/define +-fi + diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index fb343d1a05c4..12dc207002df 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt -, gd, geoip +, gd, geoip, gperftools, jemalloc , withDebug ? false , withMail ? false -, withIPv6 ? true +, withStream ? false , modules ? [] , ... }: @@ -10,18 +10,22 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.3.0"; name = "tengine-${version}"; src = fetchurl { url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz"; - sha256 = "0x12mfs0q7lihpl335ad222a1a2sdkqzj5q8zbybzr20frixjs42"; + sha256 = "09165sdzad8bjxhnwphbags6yvxnz2rkf14p0w3vgvzssj017kqp"; }; buildInputs = - [ openssl zlib pcre libxml2 libxslt gd geoip ] + [ openssl zlib pcre libxml2 libxslt gd geoip gperftools jemalloc ] ++ concatMap (mod: mod.inputs or []) modules; + patches = [ + ./check-resolv-conf.patch + ]; + configureFlags = [ "--with-http_ssl_module" "--with-http_v2_module" @@ -36,33 +40,50 @@ stdenv.mkDerivation rec { "--with-http_gunzip_module" "--with-http_gzip_static_module" "--with-http_auth_request_module" - "--with-http_concat_module" "--with-http_random_index_module" "--with-http_secure_link_module" "--with-http_degradation_module" "--with-http_stub_status_module" - "--with-http_sysguard_module" "--with-threads" "--with-pcre-jit" "--with-http_slice_module" + "--with-select_module" + "--with-poll_module" + "--with-google_perftools_module" + "--with-jemalloc" ] ++ optional withDebug [ "--with-debug" ] ++ optional withMail [ "--with-mail" "--with-mail_ssl_module" - ] ++ optional (withMail != true) [ + ] ++ optional (!withMail) [ "--without-mail_pop3_module" "--without-mail_imap_module" "--without-mail_smtp_module" - ] ++ optional withIPv6 [ - "--with-ipv6" + ] ++ optional withStream [ + "--with-stream" + "--with-stream_ssl_module" + "--with-stream_realip_module" + "--with-stream_geoip_module" + "--with-stream_ssl_preread_module" + "--with-stream_sni" + ] ++ optional (!withStream) [ + "--without-stream_limit_conn_module" + "--without-stream_access_module" + "--without-stream_geo_module" + "--without-stream_map_module" + "--without-stream_split_clients_module" + "--without-stream_return_module" + "--without-stream_upstream_hash_module" + "--without-stream_upstream_least_conn_module" + "--without-stream_upstream_random_module" + "--without-stream_upstream_zone_module" ] ++ optional (gd != null) "--with-http_image_filter_module" ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" - "-Wno-error=implicit-fallthrough" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 6eb4a3dfe9af..3f7ef9493668 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; - sha256 = "0lc3qmwb33jjw2g64j8inqpr7krjmpjwfdmypdssvjy84acpkyal"; + sha256 = "0vq7yr048sqy8dgs9l3kn1q6s3hhlhs5551hj445cng8z6n4bc4v"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index c6a893da5eb7..5de273098915 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-21"; + version = "2019-05-26"; name = "oh-my-zsh-${version}"; - rev = "60736c9f37ccf886291a5995dfc6f7215b0d8b56"; + rev = "1343ab67edd8a81b75aceca77ddb526be87a20c1"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1bkv6fh2x0mc0bkv8rkfvj1qpwqai5aj9nxvmmhgyig4n2g853m3"; + sha256 = "1932vwzbxd0i76hsjxn6ww3ydpwyk0w1k51xsps5m1q86m19jn5b"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix new file mode 100644 index 000000000000..8792818164ff --- /dev/null +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -0,0 +1,34 @@ +{ gdk_pixbuf, glib, gobject-introspection, gtk3, lib, libnotify, pkgs, + pythonPackages, wrapGAppsHook +}: + +pythonPackages.buildPythonApplication rec { + pname = "caffeine-ng"; + version = "3.4.2"; + + src = pythonPackages.fetchPypi{ + inherit pname version; + sha256="05k8smjlfjcccgmp8qi04l7106k46fs4p8fl5bdqqjwv6pwl7y4w"; + }; + + nativeBuildInputs = [ wrapGAppsHook glib ]; + buildInputs = [ gdk_pixbuf gobject-introspection libnotify gtk3 ]; + pythonPath = with pythonPackages; [ + dbus-python docopt ewmh pygobject3 pyxdg + setproctitle setuptools setuptools_scm wheel + ]; + + postBuild = '' + mkdir -p $out/share + cp -r share $out/ + glib-compile-schemas --strict $out/share/glib-2.0/schemas + ''; + + meta = with lib; { + maintainers = with maintainers; [ marzipankaiser ]; + description = "Status bar application to temporarily inhibit screensaver and sleep mode"; + homepage = "https://github.com/caffeine-ng/caffeine-ng"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/archivers/ndstool/default.nix b/pkgs/tools/archivers/ndstool/default.nix new file mode 100644 index 000000000000..7af30e313f45 --- /dev/null +++ b/pkgs/tools/archivers/ndstool/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoconf, automake }: + +stdenv.mkDerivation rec { + pname = "ndstool"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "devkitPro"; + repo = "ndstool"; + rev = "v${version}"; + sha256 = "0isnm0is5k6dgi2n2c3mysyr5hpwikp5g0s3ix7ms928z04l8ccm"; + }; + + nativeBuildInputs = [ autoconf automake ]; + + preConfigure = "./autogen.sh"; + + meta = { + homepage = https://github.com/devkitPro/ndstool; + description = "A tool to unpack and repack nds rom"; + maintainers = [ stdenv.lib.maintainers.marius851000 ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 550b0ad90674..423fc9d85350 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -53,7 +53,7 @@ in meta = { homepage = https://github.com/phillipberndt/autorandr/; - description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr"; + description = "Automatically select a display configuration based on connected devices"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.coroa ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 96f2d9896019..7663da094196 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20190422"; + name = "parallel-20190522"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0xdl5fnh1vpjp3zpmqsrbbgjixazlhl4d9awk42nz4snzynysjxl"; + sha256 = "0y3z9wybs3gak3zwgsby8r5gg6dwd3qlrkch0q4fn0i1j1jhmijv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 68dfb0898657..fa435b6c66ad 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Console downloading program with some features for parallel connections for faster downloading"; - homepage = http://axel.alioth.debian.org/; + homepage = "https://github.com/axel-download-accelerator/axel"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; license = licenses.gpl2; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 0a44adbbec2d..20a22723c7fa 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, iproute }: +{ stdenv, fetchurl, perlPackages, iproute, perl }: perlPackages.buildPerlPackage rec { name = "ddclient-${version}"; @@ -20,7 +20,9 @@ perlPackages.buildPerlPackage rec { substituteInPlace ddclient \ --replace 'in the output of ifconfig' 'in the output of ip addr show' \ --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \ - --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' + --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' \ + # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually + --replace '/usr/bin/perl' '${perl}/bin/perl' ''; installPhase = '' diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 28be00099b8b..f72d004c291b 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -7,13 +7,13 @@ with rustPlatform; buildRustPackage rec { name = "tox-node-${version}"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "tox-rs"; repo = "tox-node"; rev = "v${version}"; - sha256 = "0p1k4glqm3xasck66fywkyg42lbccad9rc6biyvi24rn76qip4jm"; + sha256 = "0vnjbhz74d4s6701xsd46ygx0kq8wd8xwpajvkhdivc042mw9078"; }; buildInputs = [ libsodium openssl ]; @@ -31,7 +31,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "18w1ycvj2q4q8lj81wn5lfljh5wa7b230ahqdz30w20pv1cazsv2"; + cargoSha256 = "1nv0630yb8k857n7km4bbgf41j747xdxv7xnc6a9746qpggmdbkh"; meta = with stdenv.lib; { description = "A server application to run tox node written in pure Rust"; diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix new file mode 100644 index 000000000000..137a9216df00 --- /dev/null +++ b/pkgs/tools/networking/ytcc/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub, gettext }: + +python3Packages.buildPythonApplication rec { + pname = "ytcc"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "woefe"; + repo = "ytcc"; + rev = "v${version}"; + sha256 = "080p145j5pg8db88kb0y3x1pfc3v4aj3w68pdihlmi68dhjdr7i7"; + }; + + doCheck = false; # try to access /homeless-shelter + propagatedBuildInputs = with python3Packages; [ feedparser lxml sqlalchemy youtube-dl ]; + + nativeBuildInputs = [ gettext ]; + + meta = { + description = "Command Line tool to keep track of your favourite YouTube channels without signing up for a Google account"; + homepage = "https://github.com/woefe/ytcc"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marius851000 ]; + }; +} diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index b43be1a69240..84727f55b933 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; - configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ]; + configureFlags = [ + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--localstatedir=/var" + "--sysconfdir=${placeholder "out"}/etc" + ]; meta = with stdenv.lib; { homepage = https://fprint.freedesktop.org/; diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/tools/security/hashcat-utils/default.nix new file mode 100644 index 000000000000..50508cfc4941 --- /dev/null +++ b/pkgs/tools/security/hashcat-utils/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "hashcat-utils"; + version = "1.9"; + + src = fetchFromGitHub { + owner = "hashcat"; + repo = pname; + rev = "v${version}"; + sha256 = "0wgc6wv7i6cs95rgzzx3zqm14xxbjyajvcqylz8w97d8kk4x4wjr"; + }; + + sourceRoot = "source/src"; + + installPhase = '' + runHook preInstall + install -Dm0555 *.bin -t $out/bin + install -Dm0555 *.pl -t $out/bin + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Small utilities that are useful in advanced password cracking"; + homepage = https://github.com/hashcat/hashcat-utils; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ fadenb ]; + }; +} diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index a3e6468c4fee..a1844668af65 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.41"; + version = "0.42"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0byjp7ph7g9di9xlg1fvspgq995a3b2yajq7sc8qap46ywvqr899"; + sha256 = "0pppf844i7b72hqnmfvq72w5y7b6dxd16y29l6j84maf22zxbjni"; }; prePatch = '' diff --git a/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch b/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch new file mode 100644 index 000000000000..b90752f8dc5b --- /dev/null +++ b/pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch @@ -0,0 +1,41 @@ +From 511400b8ec0794588df88e2bb1c45cc6a4a51b1e Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 26 May 2019 23:10:02 +0200 +Subject: [PATCH] Fix CMake configuration for Nix + +* -fno-limit-debug-info: CLang specific, patch away to support both + CLang and GCC. +* Dropped unnecessary `lvm-internal` and `daemonclient` references. +--- + CMakeLists.txt | 1 - + osquery/tables/CMakeLists.txt | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f545d6c9..cfe68ddb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -328,7 +328,6 @@ if (POSIX) + # To be safe, only include them when building 'release' outputs. + add_compile_options( + "$<$<CONFIG:RELEASE>:-g>" +- "$<$<CONFIG:RELEASE>:-fno-limit-debug-info>" + "$<$<CONFIG:RELEASE>:-fPIE>" + "$<$<CONFIG:RELEASE>:-fpie>" + "$<$<CONFIG:RELEASE>:-fPIC>" +diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt +index 470bdf1d..caa6ab6f 100644 +--- a/osquery/tables/CMakeLists.txt ++++ b/osquery/tables/CMakeLists.txt +@@ -68,7 +68,7 @@ if(LINUX) + set(TABLE_PLATFORM "linux") + + ADD_OSQUERY_LINK_ADDITIONAL("libresolv.so") +- ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app lvm-internal daemonclient") ++ ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app") + ADD_OSQUERY_LINK_ADDITIONAL("gcrypt gpg-error") + ADD_OSQUERY_LINK_ADDITIONAL("blkid") + ADD_OSQUERY_LINK_ADDITIONAL("ip4tc") +-- +2.19.2 + diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 1c1da724676d..84860df979c6 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -1,58 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, pythonPackages +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, python , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive , libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen -, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl +, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin +, smartmontools, which, git, cscope, ctags, ssdeep }: let - - thirdparty = fetchFromGitHub { - owner = "osquery"; - repo = "third-party"; - rev = "32e01462fbea75d3b1904693f937dfd62eaced15"; - sha256 = "0va24gmgk43a1lyjs63q9qrhvpv8gmqjzpjr5595vhr16idv8wyf"; - }; - -in - -stdenv.mkDerivation rec { - name = "osquery-${version}"; - version = "3.2.9"; - - # this is what `osquery --help` will show as the version. - OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "NixOS;"; - - src = fetchFromGitHub { - owner = "facebook"; - repo = "osquery"; - rev = version; - sha256 = "1fac0yj1701469qhbsp38ab2fmavm3jw6x278bf78yvxdi99ivai"; - }; - - patches = [ ./misc.patch ]; - - nativeBuildInputs = [ - pkgconfig cmake pythonPackages.python pythonPackages.jinja2 doxygen fpm - ]; - - NIX_LDFLAGS = [ - "-lcrypto" - ]; - - buildInputs = let - gflags' = google-gflags.overrideAttrs (old: { - cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; - }); - + overrides = { # use older `lvm2` source for osquery, the 2.03 sourcetree # will break osquery due to the lacking header `lvm2app.h`. # # https://github.com/NixOS/nixpkgs/pull/51756#issuecomment-446035295 - lvm2' = lvm2.overrideAttrs (old: rec { + lvm2 = lvm2.overrideAttrs (old: rec { name = "lvm2-${version}"; version = "2.02.183"; src = fetchgit { @@ -62,8 +24,25 @@ stdenv.mkDerivation rec { }; }); + # use smartmontools fork to programatically retrieve SMART information. + # https://github.com/facebook/osquery/pull/4133 + smartmontools = smartmontools.overrideAttrs (old: rec { + name = "smartmontools-${version}"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "allanliu"; + repo = "smartmontools"; + rev = "v${version}"; + sha256 = "1i72fk2ranrky02h7nh9l3va4kjzj0lx1gr477zkxd44wf3w0pjf"; + }; + + # Apple build fix doesn't apply here and isn't needed as we + # only support `osquery` on Linux. + patches = []; + }); + # dpkg 1.19.2 dropped api in `<dpkg/dpkg-db.h>` which breaks compilation. - dpkg' = dpkg.overrideAttrs (old: rec { + dpkg = dpkg.overrideAttrs (old: rec { name = "dpkg-${version}"; version = "1.19.0.5"; src = fetchurl { @@ -71,33 +50,92 @@ stdenv.mkDerivation rec { sha256 = "1dc5kp3fqy1k66fly6jfxkkg7w6d0jy8szddpfyc2xvzga94d041"; }; }); - in [ - udev audit + # filter out static linking configuration to avoid that the library will + # be linked both statically and dynamically. + gflags = google-gflags.overrideAttrs (old: { + cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; + }); + }; +in + +stdenv.mkDerivation rec { + pname = "osquery"; + version = "3.3.2"; + + # this is what `osquery --help` will show as the version. + OSQUERY_BUILD_VERSION = version; + OSQUERY_PLATFORM = "NixOS;"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = version; + sha256 = "0nrwmzmbziacs3y0nljyc73bibr3w68myjpfwkicg9zgkq4qihij"; + }; + + patches = [ ./0001-Fix-CMake-configuration-for-Nix.patch ]; + + NIX_CFLAGS_COMPILE = [ + "-I${libxml2.dev}/include/libxml2" + ]; + + nativeBuildInputs = [ python which git cscope ctags cmake pkgconfig doxygen fpm ] + ++ (with python.pkgs; [ jinja2 ]); + + buildInputs = [ + udev + audit (aws-sdk-cpp.override { apis = [ "firehose" "kinesis" "sts" "ec2" ]; customMemoryManagement = false; }) - - lvm2' libgcrypt libarchive libgpgerror libuuid iptables dpkg' - lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit - yara lldpd gflags' thrift boost - glog gbenchmark snappy openssl - file cryptsetup - gtest sqlite zstd rdkafka rapidjson rocksdb_lite + overrides.lvm2 + libgcrypt + libarchive + libgpgerror + libuuid + iptables + overrides.dpkg + lzma + bzip2 + rpm + beecrypt + augeas + libxml2 + sleuthkit + yara + lldpd + overrides.gflags + thrift + boost + glog + gbenchmark + snappy + openssl + file + cryptsetup + gtest + zstd + rdkafka + rapidjson + rocksdb_lite + libelfin + ssdeep + overrides.smartmontools ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2 $NIX_CFLAGS_COMPILE" + cmakeFlags = [ "-DSKIP_TESTS=1" ]; - cmakeFlagsArray+=( - -DCMAKE_LIBRARY_PATH=${cryptsetup}/lib - -DCMAKE_VERBOSE_MAKEFILE=OFF - ) + preConfigure = '' + cp -r ${fetchFromGitHub { + owner = "osquery"; + repo = "third-party"; + rev = "32e01462fbea75d3b1904693f937dfd62eaced15"; + sha256 = "0va24gmgk43a1lyjs63q9qrhvpv8gmqjzpjr5595vhr16idv8wyf"; + }}/* third-party - cp -r ${thirdparty}/* third-party chmod +w -R third-party - rm -r third-party/{googletest,sqlite3} ''; meta = with lib; { diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch deleted file mode 100644 index 129c524521de..000000000000 --- a/pkgs/tools/system/osquery/misc.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0242fb71..5007aace 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -304,7 +304,6 @@ else() - # To be safe, only include them when building 'release' outputs. - add_compile_options( - -g -- -fno-limit-debug-info - -fPIE - -fpie - -fPIC -@@ -449,12 +448,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=thin") - endif() - --if(NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/third-party/sqlite3") -- WARNING_LOG("Cannot find git submodule third-party/sqlite3 directory") -- WARNING_LOG("Please run: make deps or git submodule update --init") -- message(FATAL_ERROR "No sqlite3 directory") --endif() -- - # Make sure deps were built before compiling (else show warning). - execute_process( - COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}" -@@ -521,6 +514,8 @@ endif() - - if(APPLE) - LOG_PLATFORM("OS X") -+elseif(OSQUERY_BUILD_PLATFORM STREQUAL "nixos") -+ LOG_PLATFORM("NixOS") - elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian") - LOG_PLATFORM("Debian") - elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu") -@@ -570,7 +565,6 @@ if(POSIX AND DEPS) - endif() - endif() - --include_directories("${CMAKE_SOURCE_DIR}/third-party/sqlite3") - include_directories("${CMAKE_SOURCE_DIR}/include") - include_directories("${CMAKE_SOURCE_DIR}") - -@@ -661,18 +655,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "") - add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0) - endif() - --set(GTEST_FLAGS -- "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googletest/include" -- "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googlemock/include" --) --join("${GTEST_FLAGS}" " " GTEST_FLAGS) -- --if(NOT SKIP_TESTS) -- add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest") --endif() -- --add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/sqlite3") -- - if(NOT FREEBSD) - add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/linenoise-ng") - endif() -diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt -index e3842962..f405503d 100644 ---- a/osquery/CMakeLists.txt -+++ b/osquery/CMakeLists.txt -@@ -33,8 +33,6 @@ if(CLANG AND POSIX) - -Wextra - -pedantic - -Wuseless-cast -- -Wno-c99-extensions -- -Wno-zero-length-array - -Wno-unused-parameter - -Wno-gnu-case-range - -Weffc++ -@@ -63,14 +61,7 @@ endif() - - # Construct a set of all object files, starting with third-party and all - # of the osquery core objects (sources from ADD_CORE_LIBRARY macros). --if(FREEBSD) -- set(OSQUERY_OBJECTS $<TARGET_OBJECTS:osquery_sqlite>) --else() -- set(OSQUERY_OBJECTS -- $<TARGET_OBJECTS:osquery_sqlite> -- $<TARGET_OBJECTS:linenoise-ng> -- ) --endif() -+set(OSQUERY_OBJECTS $<TARGET_OBJECTS:linenoise-ng>) - - # Add subdirectories - add_subdirectory(config) -@@ -151,10 +142,11 @@ if(APPLE OR LINUX) - ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite") - elseif(FREEBSD) - ADD_OSQUERY_LINK_CORE("icuuc") -- ADD_OSQUERY_LINK_CORE("linenoise") - ADD_OSQUERY_LINK_ADDITIONAL("rocksdb-lite") - endif() - -+ADD_OSQUERY_LINK_CORE("sqlite3") -+ - if(POSIX) - ADD_OSQUERY_LINK_CORE("boost_system") - ADD_OSQUERY_LINK_CORE("boost_filesystem") -@@ -172,10 +164,10 @@ endif() - ADD_OSQUERY_LINK_CORE("glog${WO_KEY}") - - if(POSIX) -- # Hashing methods in core use libcrypto. -- ADD_OSQUERY_LINK_CORE("crypto") -- -+ ADD_OSQUERY_LINK_ADDITIONAL("benchmark") -+ ADD_OSQUERY_LINK_ADDITIONAL("snappy") - ADD_OSQUERY_LINK_ADDITIONAL("ssl") -+ ADD_OSQUERY_LINK_ADDITIONAL("crypto") - ADD_OSQUERY_LINK_ADDITIONAL("libpthread") - ADD_OSQUERY_LINK_ADDITIONAL("magic") - endif() -diff --git a/osquery/extensions/CMakeLists.txt b/osquery/extensions/CMakeLists.txt -index 52f3bf80..066ed1c0 100644 ---- a/osquery/extensions/CMakeLists.txt -+++ b/osquery/extensions/CMakeLists.txt -@@ -60,12 +60,6 @@ else() - ) - endif() - --if(NOT WINDOWS) -- add_compile_options( -- -Wno-macro-redefined -- ) --endif() -- - ADD_OSQUERY_LIBRARY(TRUE osquery_extensions - ${THRIFT_GENERATED_FILES} - ${THRIFT_IMPL_FILE} -diff --git a/osquery/logger/CMakeLists.txt b/osquery/logger/CMakeLists.txt -index ab91bd24..d8364991 100644 ---- a/osquery/logger/CMakeLists.txt -+++ b/osquery/logger/CMakeLists.txt -@@ -55,9 +55,9 @@ if(NOT SKIP_KAFKA AND NOT WINDOWS AND NOT FREEBSD) - - ADD_OSQUERY_LINK_ADDITIONAL("rdkafka") - -- set(OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS -- "logger/plugins/tests/kafka_producer_tests.cpp" -- ) -+ #set(OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS -+ # "logger/plugins/tests/kafka_producer_tests.cpp" -+ #) - - ADD_OSQUERY_TEST_ADDITIONAL(${OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS}) - endif() -diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt -index 3ecbb711..af7220d3 100644 ---- a/osquery/tables/CMakeLists.txt -+++ b/osquery/tables/CMakeLists.txt -@@ -68,7 +68,7 @@ if(LINUX) - set(TABLE_PLATFORM "linux") - - ADD_OSQUERY_LINK_ADDITIONAL("libresolv.so") -- ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app lvm-internal daemonclient") -+ ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app") - ADD_OSQUERY_LINK_ADDITIONAL("gcrypt gpg-error") - ADD_OSQUERY_LINK_ADDITIONAL("blkid") - ADD_OSQUERY_LINK_ADDITIONAL("ip4tc") -diff --git a/specs/windows/services.table b/specs/windows/services.table -index 4ac24ee9..657d8b99 100644 ---- a/specs/windows/services.table -+++ b/specs/windows/services.table -@@ -12,7 +12,7 @@ schema([ - Column("path", TEXT, "Path to Service Executable"), - Column("module_path", TEXT, "Path to ServiceDll"), - Column("description", TEXT, "Service Description"), -- Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\UserName. If the account belongs to the built-in domain, the name can be of the form .\UserName."), -+ Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\\UserName. If the account belongs to the built-in domain, the name can be of the form .\\UserName."), - ]) - implementation("system/windows/services@genServices") - examples([ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 628e19ce82b5..992f8a4d4c30 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -108,6 +108,12 @@ mapAliases ({ gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnuradio-nacl = gr-nacl; # added 2019-05-27 + gnuradio-gsm = gr-gsm; # added 2019-05-27 + gnuradio-ais = gr-ais; # added 2019-05-27 + gnuradio-limesdr = gr-limesdr; # added 2019-05-27 + gnuradio-rds = gr-rds; # added 2019-05-27 + gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 gnustep-make = gnustep.make; # added 2016-7-6 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0968fe0db118..b489b872fce6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -808,9 +808,7 @@ in asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; - gopass = callPackage ../tools/security/gopass { - buildGoPackage = buildGo110Package; - }; + gopass = callPackage ../tools/security/gopass { }; browserpass = callPackage ../tools/security/browserpass { }; @@ -2785,6 +2783,8 @@ in exiftool = perlPackages.ImageExifTool; + exodus = callPackage ../applications/altcoins/exodus { }; + ext4magic = callPackage ../tools/filesystems/ext4magic { }; extract_url = callPackage ../applications/misc/extract_url { }; @@ -3503,6 +3503,8 @@ in hashcat = callPackage ../tools/security/hashcat { }; + hashcat-utils = callPackage ../tools/security/hashcat-utils { }; + hash_extender = callPackage ../tools/security/hash_extender { }; hash-slinger = callPackage ../tools/security/hash-slinger { }; @@ -4764,6 +4766,8 @@ in nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; + ndstool = callPackage ../tools/archivers/ndstool { }; + ngrep = callPackage ../tools/networking/ngrep { }; ngrok = ngrok-2; @@ -11029,6 +11033,8 @@ in libkrb5 = krb5.override { type = "lib"; }; kerberos = libkrb5; # TODO: move to aliases.nix + l-smash = callPackage ../development/libraries/l-smash { }; + languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); lasem = callPackage ../development/libraries/lasem { }; @@ -11324,6 +11330,8 @@ in then callPackage ../development/libraries/libelf-freebsd { } else callPackage ../development/libraries/libelf { }; + libelfin = callPackage ../development/libraries/libelfin { }; + libetpan = callPackage ../development/libraries/libetpan { }; libexecinfo = callPackage ../development/libraries/libexecinfo { }; @@ -12951,6 +12959,8 @@ in lvtk = callPackage ../development/libraries/audio/lvtk { }; + patchwork = callPackage ../applications/networking/ssb/patchwork { }; + qradiolink = callPackage ../applications/radio/qradiolink { }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -14075,7 +14085,8 @@ in clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - inherit (llvmPackages_latest) clang-unwrapped lld llvm; + # clickhouse doesn't build on llvm8. + inherit (llvmPackages_7) clang-unwrapped lld llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -17749,21 +17760,21 @@ in gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix { inherit (python2Packages) python; - extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-ais gnuradio-rds ] - ++ lib.optionals stdenv.isLinux [ gnuradio-gsm gnuradio-limesdr ]; + extraPackages = [ gr-nacl gr-osmosdr gr-ais gr-rds ] + ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ]; }; - gnuradio-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; + gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; - gnuradio-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; + gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; - gnuradio-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; + gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; - gnuradio-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; + gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; - gnuradio-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; + gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; - gnuradio-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; + gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; @@ -18282,6 +18293,8 @@ in jackline = callPackage ../applications/networking/instant-messengers/jackline { }; + leftwm = callPackage ../applications/window-managers/leftwm { }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-dark = pkgs.slack.override { darkMode = true; }; @@ -18660,6 +18673,8 @@ in python3Packages = python36Packages; }; + kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -18817,6 +18832,8 @@ in luppp = callPackage ../applications/audio/luppp { }; + lutris = callPackage ../applications/misc/lutris { }; + lv2bm = callPackage ../applications/audio/lv2bm { }; lynx = callPackage ../applications/networking/browsers/lynx { }; @@ -20355,6 +20372,8 @@ in inherit (linuxPackages) x86_energy_perf_policy; }; + tmatrix = callPackage ../applications/misc/tmatrix { }; + tnef = callPackage ../applications/misc/tnef { }; todiff = callPackage ../applications/misc/todiff { }; @@ -21113,6 +21132,8 @@ in youtube-viewer = perlPackages.WWWYoutubeViewer; + ytcc = callPackage ../tools/networking/ytcc { }; + zam-plugins = callPackage ../applications/audio/zam-plugins { }; zanshin = libsForQt5.callPackage ../applications/office/zanshin { @@ -21243,8 +21264,7 @@ in }; cataclysm-dda = callPackage ../games/cataclysm-dda { - inherit (darwin.apple_sdk.frameworks) Cocoa; - ncurses = ncurses5; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; }; cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix { @@ -21259,6 +21279,8 @@ in crispyDoom = callPackage ../games/crispy-doom { }; + cri-o = callPackage ../applications/virtualization/cri-o {}; + ckan = callPackage ../games/ckan { }; cockatrice = libsForQt5.callPackage ../games/cockatrice { }; @@ -22040,7 +22062,7 @@ in kakasi = callPackage ../tools/text/kakasi { }; - lumina = libsForQt5.callPackage ../desktops/lumina { }; + lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { inherit pkgs libsForQt5; @@ -22760,6 +22782,8 @@ in opencv3 = opencv3WithoutCuda; # Used only for image loading. }); + caffeine-ng = callPackage ../tools/X11/caffeine-ng {}; + cntk = callPackage ../applications/science/math/cntk { inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. @@ -23084,6 +23108,8 @@ in ekiga = callPackage ../applications/networking/instant-messengers/ekiga { }; + dumb = callPackage ../misc/dumb { }; + emulationstation = callPackage ../misc/emulators/emulationstation { stdenv = overrideCC stdenv gcc5; }; @@ -23489,6 +23515,8 @@ in sam-ba = callPackage ../tools/misc/sam-ba { }; + sndio = callPackage ../misc/sndio { }; + opkg = callPackage ../tools/package-management/opkg { }; opkg-utils = callPackage ../tools/package-management/opkg-utils { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3991ae89db4c..6f91af6fc14b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12638,32 +12638,36 @@ let }; Po4a = buildPerlPackage rec { - name = "po4a-0.47"; + name = "po4a-${version}"; + version = "0.55"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz"; - sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507"; + url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz"; + sha256 = "1qss4q5df3nsydsbggb7gg50bn0kdxq5wn8riqm9zwkiq6a4bifg"; }; - nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl pkgs.docbook_xsl_ns ]; - propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ]; - buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ]; - LC_ALL="en_US.UTF-8"; + nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl_ns ModuleBuild ]; + propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; + buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.opensp ]; + LC_ALL = "en_US.UTF-8"; SGML_CATALOG_FILES = "${pkgs.docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"; preConfigure = '' touch Makefile.PL export PERL_MB_OPT="--install_base=$out --prefix=$out" - substituteInPlace Po4aBuilder.pm --replace "\$self->install_sets(\$self->installdirs)->{'bindoc'}" "'$out/share/man/man1'" ''; - buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build"; - installPhase = "./Build install"; checkPhase = '' export SGML_CATALOG_FILES=${pkgs.docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat ./Build test ''; + installPhase = '' + ./Build install + for f in $out/bin/*; do + substituteInPlace $f --replace "#! /usr/bin/env perl" "#!${perl}/bin/perl" + done + ''; meta = { - homepage = https://po4a.alioth.debian.org/; - description = "tools for helping translation of documentation"; - license = with stdenv.lib.licenses; [ gpl2 ]; + homepage = "https://po4a.org/"; + description = "Tools for helping translation of documentation"; + license = stdenv.lib.licenses.gpl2; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce5f76ecce49..8e7c1a54799b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1285,9 +1285,9 @@ in { cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { - cudatoolkit = pkgs.cudatoolkit_8; - cudnn = pkgs.cudnn6_cudatoolkit_8; - nccl = pkgs.nccl; + cudatoolkit = pkgs.cudatoolkit_10_0; + cudnn = pkgs.cudnn_cudatoolkit_10_0; + nccl = pkgs.nccl_cudatoolkit_10; }; cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; @@ -5196,6 +5196,8 @@ in { xgboost = pkgs.xgboost; }; + xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + xkcdpass = callPackage ../development/python-modules/xkcdpass { }; xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; @@ -5274,8 +5276,12 @@ in { sigtools = callPackage ../development/python-modules/sigtools { }; + annoy = callPackage ../development/python-modules/annoy { }; + clize = callPackage ../development/python-modules/clize { }; + rl-coach = callPackage ../development/python-modules/rl-coach { }; + zerobin = callPackage ../development/python-modules/zerobin { }; tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; |