diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-26 11:23:18 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-26 11:23:18 -0400 |
commit | e2a20730115c0d36b4b56cdd03cff60f1cfdb369 (patch) | |
tree | dcf0e44daf37f45680199e1d6256cd989ef118e8 | |
parent | ab925bf66284c9b81499b75c451592ef66452a76 (diff) | |
parent | 30d24a2e3f82e83cc19234e16c155382fc4b1e1d (diff) | |
download | nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.gz nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.bz2 nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.lz nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.xz nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.zst nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.zip |
Merge remote-tracking branch 'upstream/master' into staging
60 files changed, 532 insertions, 396 deletions
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 9c84d267a334..d51ed195580d 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -25,6 +25,7 @@ with lib; documentation.enable = mkForce true; # Show the manual. + documentation.nixos.enable = mkForce true; services.nixosManual.showManual = true; # Let the user play Rogue on TTY 8 during the installation. diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index f59fb1c81772..de2a757196a5 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -188,6 +188,8 @@ in uid = config.ids.uids.postgres; group = "postgres"; description = "PostgreSQL server user"; + home = "${cfg.dataDir}"; + useDefaultShell = true; }; users.groups.postgres.gid = config.ids.gids.postgres; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 7202269d3421..df3e71c80dea 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -44,29 +44,30 @@ in }; - config = mkIf cfg.showManual { - - assertions = [{ - assertion = cfgd.enable && cfgd.nixos.enable; - message = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`"; - }]; - - boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ]; - - systemd.services."nixos-manual" = { - description = "NixOS Manual"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${cfg.browser} ${config.system.build.manual.manualHTMLIndex}"; - StandardInput = "tty"; - StandardOutput = "tty"; - TTYPath = "/dev/tty${toString cfg.ttyNumber}"; - TTYReset = true; - TTYVTDisallocate = true; - Restart = "always"; + config = mkMerge [ + (mkIf cfg.showManual { + assertions = singleton { + assertion = cfgd.enable && cfgd.nixos.enable; + message = "Can't enable `services.nixosManual.showManual` without `documentation.nixos.enable`"; }; - }; - - }; + }) + (mkIf (cfg.showManual && cfgd.enable && cfgd.nixos.enable) { + boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ]; + + systemd.services."nixos-manual" = { + description = "NixOS Manual"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${cfg.browser} ${config.system.build.manual.manualHTMLIndex}"; + StandardInput = "tty"; + StandardOutput = "tty"; + TTYPath = "/dev/tty${toString cfg.ttyNumber}"; + TTYReset = true; + TTYVTDisallocate = true; + Restart = "always"; + }; + }; + }) + ]; } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 254e9266e89e..413543df88c6 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -93,49 +93,52 @@ let ${config.system.extraSystemBuilderCmds} ''; - # Handle assertions - - failed = map (x: x.message) (filter (x: !x.assertion) config.assertions); - - showWarnings = res: fold (w: x: builtins.trace "[1;31mwarning: ${w}[0m" x) res config.warnings; - # Putting it all together. This builds a store path containing # symlinks to the various parts of the built configuration (the # kernel, systemd units, init scripts, etc.) as well as a script # `switch-to-configuration' that activates the configuration and # makes it bootable. - baseSystem = showWarnings ( - if [] == failed then pkgs.stdenvNoCC.mkDerivation { - name = let hn = config.networking.hostName; - nn = if (hn != "") then hn else "unnamed"; - in "nixos-system-${nn}-${config.system.nixos.label}"; - preferLocalBuild = true; - allowSubstitutes = false; - buildCommand = systemBuilder; - - inherit (pkgs) utillinux coreutils; - systemd = config.systemd.package; - shell = "${pkgs.bash}/bin/sh"; - - inherit children; - kernelParams = config.boot.kernelParams; - installBootLoader = - config.system.build.installBootLoader - or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; - activationScript = config.system.activationScripts.script; - nixosLabel = config.system.nixos.label; - - configurationName = config.boot.loader.grub.configurationName; - - # Needed by switch-to-configuration. - - perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); - } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}"); + baseSystem = pkgs.stdenvNoCC.mkDerivation { + name = let hn = config.networking.hostName; + nn = if (hn != "") then hn else "unnamed"; + in "nixos-system-${nn}-${config.system.nixos.label}"; + preferLocalBuild = true; + allowSubstitutes = false; + buildCommand = systemBuilder; + + inherit (pkgs) utillinux coreutils; + systemd = config.systemd.package; + shell = "${pkgs.bash}/bin/sh"; + + inherit children; + kernelParams = config.boot.kernelParams; + installBootLoader = + config.system.build.installBootLoader + or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; + activationScript = config.system.activationScripts.script; + nixosLabel = config.system.nixos.label; + + configurationName = config.boot.loader.grub.configurationName; + + # Needed by switch-to-configuration. + + perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); + }; + + # Handle assertions and warnings + + failedAssertions = map (x: x.message) (filter (x: !x.assertion) config.assertions); + + showWarnings = res: fold (w: x: builtins.trace "[1;31mwarning: ${w}[0m" x) res config.warnings; + + baseSystemAssertWarn = if failedAssertions != [] + then throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}" + else showWarnings baseSystem; # Replace runtime dependencies system = fold ({ oldDependency, newDependency }: drv: pkgs.replaceDependency { inherit oldDependency newDependency drv; } - ) baseSystem config.system.replaceRuntimeDependencies; + ) baseSystemAssertWarn config.system.replaceRuntimeDependencies; in diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 4c7cffcf4557..caaf6c0aa59d 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -97,8 +97,8 @@ in "google-instance-setup.service" "google-network-setup.service" ]; - wantedBy = [ "multi-user.target" ]; requires = ["network.target"]; + wantedBy = ["multi-user.target"]; path = with pkgs; [ shadow ]; serviceConfig = { Type = "simple"; @@ -113,8 +113,8 @@ in "google-instance-setup.service" "google-network-setup.service" ]; - requires = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; + requires = ["network.target"]; + wantedBy = ["multi-user.target"]; serviceConfig = { Type = "simple"; ExecStart = "${gce}/bin/google_clock_skew_daemon --debug"; @@ -123,7 +123,7 @@ in systemd.services.google-instance-setup = { description = "Google Compute Engine Instance Setup"; - after = ["fs.target" "network-online.target" "network.target" "rsyslog.service"]; + after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service"]; before = ["sshd.service"]; wants = ["local-fs.target" "network-online.target" "network.target"]; wantedBy = [ "sshd.service" "multi-user.target" ]; @@ -134,15 +134,17 @@ in }; }; - systemd.services.google-ip-forwarding-daemon = { - description = "Google Compute Engine IP Forwarding Daemon"; - after = ["network.target" "google-instance-setup.service" "google-network-setup.service"]; + systemd.services.google-network-daemon = { + description = "Google Compute Engine Network Daemon"; + after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service" "google-instance-setup.service"]; + wants = ["local-fs.target" "network-online.target" "network.target"]; requires = ["network.target"]; + partOf = ["network.target"]; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ iproute ]; serviceConfig = { - Type = "simple"; - ExecStart = "${gce}/bin/google_ip_forwarding_daemon --debug"; + ExecStart = "${gce}/bin/google_network_daemon --debug"; + Type = "oneshot"; }; }; @@ -153,8 +155,9 @@ in "network-online.target" "network.target" "rsyslog.service" + "systemd-resolved.service" "google-instance-setup.service" - "google-network-setup.service" + "google-network-daemon.service" ]; wants = [ "local-fs.target" "network-online.target" "network.target"]; wantedBy = [ "multi-user.target" ]; @@ -167,23 +170,6 @@ in }; }; - systemd.services.google-network-setup = { - description = "Google Compute Engine Network Setup"; - after = [ - "local-fs.target" - "network-online.target" - "network.target" - "rsyslog.service" - ]; - wants = [ "local-fs.target" "network-online.target" "network.target"]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${gce}/bin/google_network_setup --debug"; - KillMode = "process"; - Type = "oneshot"; - }; - }; - systemd.services.google-startup-scripts = { description = "Google Compute Engine Startup Scripts"; after = [ @@ -192,9 +178,9 @@ in "network.target" "rsyslog.service" "google-instance-setup.service" - "google-network-setup.service" + "google-network-daemon.service" ]; - wants = [ "local-fs.target" "network-online.target" "network.target"]; + wants = ["local-fs.target" "network-online.target" "network.target"]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup"; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 6716305df8b5..452ed70e824e 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl -, cmake, lmdb, qt5, qtmacextras, mtxclient +, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient , boost, spdlog, olm, pkgconfig }: @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.5.5"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "0k5gmfwmisfavliyz0nfsmwy317ps8a4r3l1d831giqp9pvqvi0i"; + sha256 = "1qd2c5684722jlpgqyxq6pbb1rdk1zc3sk88mkjyqypj1k0pj3dc"; }; # If, on Darwin, you encounter the error @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - mtxclient olm boost lmdb spdlog + mtxclient olm boost lmdb spdlog cmark qt5.qtbase qt5.qtmultimedia qt5.qttools ] ++ lib.optional stdenv.isDarwin qtmacextras; diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix new file mode 100644 index 000000000000..5dd8bf5f69ab --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit +, pkgconfig +, qmake, qtbase, qtquickcontrols2, qtmultimedia +, libpulseaudio +# Not mentioned but seems needed +, qtgraphicaleffects +# Unsure but needed by similar +, qtdeclarative, qtsvg +}: + +stdenv.mkDerivation rec { + name = "spectral-${version}"; + version = "2018-09-24"; + + src = fetchgit { + url = "https://gitlab.com/b0/spectral.git"; + rev = "c9d1d6887722860a52b597a0f74d0ce39c8622e1"; + sha256 = "1ym8jlqls4lcq5rd81vxw1dni79fc6ph00ip8nsydl6i16fngl4c"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative qtsvg ] + ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio; + + meta = with stdenv.lib; { + description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++"; + homepage = https://gitlab.com/b0/spectral; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 2d9a9d10aed9..e8f2c135fa8a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -2,7 +2,7 @@ { mkDerivation, lib, fetchgit, fetchsvn , pkgconfig, pythonPackages, cmake, wrapGAppsHook -, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify +, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -131,6 +131,7 @@ mkDerivation rec { wrapProgram $out/bin/telegram-desktop \ "''${gappsWrapperArgs[@]}" \ --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \ + --prefix PATH : ${xdg_utils}/bin \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index e4dc86ebd8db..1faf47d680aa 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "cb2bib"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; - sha256 = "0fpa0znlabk0nrzgj4c0l6qbg8l16lp9d7lvb9ijv1y0ih9igf0f"; + sha256 = "12x7zv964r26cfmf3yx5pa8ihc5bd9p199w2g4vc0sb44izryg47"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix index 9e17d807fb14..7f82780fbe92 100644 --- a/pkgs/applications/office/paperwork/backend.nix +++ b/pkgs/applications/office/paperwork/backend.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, fetchFromGitHub +{ buildPythonPackage, lib, fetchFromGitLab , isPy3k, isPyPy @@ -10,18 +10,26 @@ buildPythonPackage rec { pname = "paperwork-backend"; - version = "1.2.2"; + version = "1.2.4"; - src = fetchFromGitHub { - owner = "openpaperwork"; - repo = "paperwork-backend"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + repo = "paperwork"; + group = "World"; + owner = "OpenPaperwork"; rev = version; - sha256 = "1rvf06vphm32601ja1bfkfkfpgjxiv0lh4yxjy31jll0bfnsf7pf"; + sha256 = "0wjjiw99aswmppnhzq3jir0p5p78r3m8hjinhdirkgm6h7skq5p4"; }; + sourceRoot = "source/paperwork-backend"; + # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; + patchPhase = '' + echo 'version = "${version}"' > paperwork_backend/_version.py + ''; + preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; propagatedBuildInputs = [ diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 14cde8415fd7..a48b6e1e1168 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,20 +1,14 @@ -{ lib, python3Packages, fetchFromGitHub, gtk3, cairo +{ lib, python3Packages, fetchFromGitLab, gtk3, cairo , aspellDicts, buildEnv , gnome3, hicolor-icon-theme, librsvg , xvfb_run, dbus, libnotify }: python3Packages.buildPythonApplication rec { + inherit (python3Packages.paperwork-backend) version src; name = "paperwork-${version}"; - # Don't forget to also update paperwork-backend when updating this! - version = "1.2.2"; - src = fetchFromGitHub { - repo = "paperwork"; - owner = "openpaperwork"; - rev = version; - sha256 = "1nb5sna2s952xb7c89qccg9qp693pyqj8g7xz16ll16ydfqnzsdk"; - }; + sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: postPatch = '' @@ -39,6 +33,12 @@ python3Packages.buildPythonApplication rec { sed -i -e 's/"logo"/"logo-icon-name"/g' \ src/paperwork/frontend/aboutdialog/aboutdialog.glade + + cat - ../AUTHORS.py > src/paperwork/_version.py <<EOF + # -*- coding: utf-8 -*- + version = "${version}" + authors_code="" + EOF ''; ASPELL_CONF = "dict-dir ${buildEnv { diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index aa6073479668..5ae10dd68b61 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -114,6 +114,8 @@ let pre-commit = callPackage ./pre-commit { }; + pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; + qgit = qt5.callPackage ./qgit { }; stgit = callPackage ./stgit { diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix new file mode 100644 index 000000000000..d0d60b193437 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg }: + +buildPythonApplication rec { + pname = "pass-git-helper"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "languitar"; + repo = "pass-git-helper"; + rev = "${version}"; + sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap"; + }; + + propagatedBuildInputs = [ pyxdg ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/languitar/pass-git-helper"; + description = "A git credential helper interfacing with pass, the standard unix password manager"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ vanzef ]; + }; +} diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 0c6e3991b1c0..0678591fc2a3 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "qboot-pre-release"; + name = "qboot-20170330"; - src = fetchgit { - url = "https://github.com/yangchengwork/qboot"; - rev = "b2bdaf4c878ef34f309c8c79613fabd1b9c4bf75"; - sha256 = "00f24125733d24713880e430f409d6ded416286d209c9fabb45541311b01cf8d"; + src = fetchFromGitHub { + owner = "bonzini"; + repo = "qboot"; + rev = "ac9488f26528394856b94bda0797f5bd9c69a26a"; + sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy"; }; installPhase = '' diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index e4eca36b266b..9773c37f1671 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -79,6 +79,7 @@ let "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" ] + ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; @@ -189,8 +190,15 @@ in rec { sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"; }; + # the latest Maint version perl528 = common { version = "5.28.0"; sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky"; }; + + # the latest Devel version + perldevel = common { + version = "5.29.3"; + sha256 = "054xi629408p2hv9475jghv6zd1bj69qqpiby8cy9qw5vismgi17"; + }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index df8e6ebf89ff..2609c053d95b 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -240,7 +240,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch ucsEncoding; executable = libPrefix; diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index c8a544c601af..18b90cd1da46 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -175,7 +175,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 2de337a83955..92c277aacd4f 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -175,7 +175,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 6b9e26e99fcd..5b5041f5bcd3 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -196,7 +196,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index adee8d594f18..be503d29b3a7 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -159,7 +159,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index a1741513642f..560ccb768b1e 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "1vwhyk0lrpnn78xx212d16lf7vl2q6651wc8vxqbd296x6wbnh2y"; + sha256 = "1ibc62r3nh33c5w9mbnmzzhalb0jry6ccfb5ph62xsayy9nksfgh"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 015c48d01411..7dd0fcb55905 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "1xmndhcliz25cgdzb7ybkvb05w4klmngpk76fzghamwyi79zfs2c"; + sha256 = "0xyclln1m4079akr31vib242912004lln678prda0qwmwvsdrf7z"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 7f680b6b59bf..a21e2aacde2a 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: +{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.10.1"; + version = "1.15.0"; name = "grpc-${version}"; - src = fetchurl { - url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz"; - sha256 = "0l721r24d6wz889vz4g6i67ijz0zc0ah967i3immi90zdmjwlyjg"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev= "d2c7d4dea492b9a86a53555aabdbfa90c2b01730"; + sha256 = "1dpnhc5kw7znivrnjx1gva57v6b548am4v5nvh3dkwwzsa1k6vkv"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 465a70576356..15c82cb12825 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "mtxclient-${version}"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mujx"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "0i58y45diysayjzy5ick15356972z67dfxm0w41ay88nm42x1imp"; + sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs"; }; postPatch = '' diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index bcc57f09af45..acf531390226 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "podofo-0.9.6"; + version = "0.9.6"; + name = "podofo-${version}"; src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; @@ -30,6 +31,12 @@ stdenv.mkDerivation rec { cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + for i in $out/bin/* ; do + install_name_tool -change libpodofo.${version}.dylib $out/lib/libpodofo.${version}.dylib "$i" + done + ''; + meta = { homepage = http://podofo.sourceforge.net; description = "A library to work with the PDF file format"; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 55c1a641fc3d..2a6c4af43fc3 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -4,14 +4,14 @@ with stdenv.lib; let - version = "3.5.0"; + version = "3.6.3"; in stdenv.mkDerivation { name = "arpack-${version}"; src = fetchurl { url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"; - sha256 = "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh"; + sha256 = "0lzlcsrjsi36pv5bnipwjnyg2fx3nrv31bw2klwrg11gb8g5bwv4"; }; nativeBuildInputs = [ autoconf automake gettext libtool ]; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 6edad2d01619..08a455eb40c3 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { patches = fetchpatch { name = "cheroot-fix-setup-python3.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot&id=9b33cb0885b3c0d91adeacae23761a4321eb0e64"; sha256 = "1rlgz0qln536y00mfqlf0i9hz3f53id73wh47cg5q2vcsw1w2bpc"; }; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 3d3824cdabe4..6141e4a389c2 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; - version = "1.14.1"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "4bf23666e763ca7ff6010465864e9f088f4ac7ecc1e11abd6f85b250e66b2c05"; + sha256 = "1lhh76kgyibgsk6c54nbzzhkskknkbvn71xvixsk0prfp8izr98m"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index c30d80a00155..47a73c9c80af 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,47 +1,39 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pillow, six -, tesseract, cuneiform, isPy3k +{ lib, fetchFromGitLab, buildPythonPackage, pillow, six +, tesseract, cuneiform, isPy3k, substituteAll, pytest, tox }: buildPythonPackage rec { pname = "pyocr"; - version = "0.4.7"; + version = "0.5.3"; name = pname + "-" + version; disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. - src = fetchFromGitHub { - owner = "jflesch"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "OpenPaperwork"; repo = "pyocr"; rev = version; - sha256 = "1iw73r8yrgjf8g00yzpz62ymqbf89cqhyhl9g430srmsrq7mn2yd"; + sha256 = "1nihf0qmbpg3yj3yp11jp6hp5z5dqf39nz6j9lqbvgi1nqbs7x15"; }; - NIX_CUNEIFORM_CMD = "${cuneiform}/bin/cuneiform"; - NIX_CUNEIFORM_DATA = "${cuneiform}/share/cuneiform"; - NIX_LIBTESSERACT_PATH = "${tesseract}/lib/libtesseract.so"; - NIX_TESSDATA_PREFIX = "${tesseract}/share/tessdata"; - NIX_TESSERACT_CMD = "${tesseract}/bin/tesseract"; - - patches = [ ./paths.patch ]; + patches = [ (substituteAll { + src = ./paths.patch; + inherit cuneiform tesseract; + }) + ]; postPatch = '' - substituteInPlace src/pyocr/cuneiform.py \ - --subst-var NIX_CUNEIFORM_CMD \ - --subst-var NIX_CUNEIFORM_CMD - - substituteInPlace src/pyocr/tesseract.py \ - --subst-var NIX_TESSERACT_CMD - - substituteInPlace src/pyocr/libtesseract/tesseract_raw.py \ - --subst-var NIX_TESSDATA_PREFIX \ - --subst-var NIX_LIBTESSERACT_PATH + echo 'version = "${version}"' > src/pyocr/_version.py # Disable specific tests that are probably failing because of this issue: # https://github.com/jflesch/pyocr/issues/52 for test in $disabledTests; do file="''${test%%:*}" fun="''${test#*:}" - echo "$fun = unittest.skip($fun)" >> "tests/tests_$file.py" + echo "import pytest" >> "tests/tests_$file.py" + echo "$fun = pytest.mark.skip($fun)" >> "tests/tests_$file.py" done ''; @@ -57,14 +49,18 @@ buildPythonPackage rec { "libtesseract:TestLineBox.test_japanese" "libtesseract:TestTxt.test_japanese" "libtesseract:TestWordBox.test_japanese" + "libtesseract:TestTxt.test_multi" + "tesseract:TestTxt.test_multi" "tesseract:TestDigitLineBox.test_digits" "tesseract:TestTxt.test_japanese" ]; propagatedBuildInputs = [ pillow six ]; + checkInputs = [ pytest tox ]; + checkPhase = "pytest"; meta = { - homepage = "https://github.com/jflesch/pyocr"; + inherit (src.meta) homepage; description = "A Python wrapper for Tesseract and Cuneiform"; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths.patch index 3fe11598b7d3..9350d4050dad 100644 --- a/pkgs/development/python-modules/pyocr/paths.patch +++ b/pkgs/development/python-modules/pyocr/paths.patch @@ -1,28 +1,28 @@ -diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py -index a461d92..1f2b914 100644 ---- a/src/pyocr/cuneiform.py -+++ b/src/pyocr/cuneiform.py +Index: current/src/pyocr/cuneiform.py +=================================================================== +--- current.orig/src/pyocr/cuneiform.py ++++ current/src/pyocr/cuneiform.py @@ -27,13 +27,9 @@ from . import error from . import util -# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY -CUNEIFORM_CMD = 'cuneiform' -+CUNEIFORM_CMD = '@NIX_CUNEIFORM_CMD@' ++CUNEIFORM_CMD = '@cuneiform@/bin/cuneiform' -CUNEIFORM_DATA_POSSIBLE_PATHS = [ - "/usr/local/share/cuneiform", - "/usr/share/cuneiform", -] -+CUNEIFORM_DATA_POSSIBLE_PATHS = ['@NIX_CUNEIFORM_DATA@'] ++CUNEIFORM_DATA_POSSIBLE_PATHS = ['@cuneiform@/share/cuneiform'] LANGUAGES_LINE_PREFIX = "Supported languages: " LANGUAGES_SPLIT_RE = re.compile("[^a-z]") -diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py -index b4e7bda..47505f7 100644 ---- a/src/pyocr/libtesseract/tesseract_raw.py -+++ b/src/pyocr/libtesseract/tesseract_raw.py -@@ -1,55 +1,13 @@ +Index: current/src/pyocr/libtesseract/tesseract_raw.py +=================================================================== +--- current.orig/src/pyocr/libtesseract/tesseract_raw.py ++++ current/src/pyocr/libtesseract/tesseract_raw.py +@@ -1,52 +1,13 @@ import ctypes import logging import os @@ -56,7 +56,13 @@ index b4e7bda..47505f7 100644 - # Jflesch> Don't they have the equivalent of LD_LIBRARY_PATH on - # Windows ? - "../vs2010/DLL_Release/libtesseract302.dll", +- # prefer the most recent first +- "libtesseract305.dll", +- "libtesseract304.dll", +- "libtesseract303.dll", - "libtesseract302.dll", +- "libtesseract400.dll", # Tesseract 4 is still in alpha stage +- "libtesseract.dll", - "C:\\Program Files (x86)\\Tesseract-OCR\\libtesseract-4.dll", - "C:\\Program Files (x86)\\Tesseract-OCR\\libtesseract-3.dll", - ] @@ -66,27 +72,18 @@ index b4e7bda..47505f7 100644 - "libtesseract.so.3", - ] - -- --g_libtesseract = None -- --for libname in libnames: -- try: -- g_libtesseract = ctypes.cdll.LoadLibrary(libname) -- break -- except OSError: -- pass -+g_libtesseract = ctypes.cdll.LoadLibrary('@NIX_LIBTESSERACT_PATH@') ++libnames = [ "@tesseract@/lib/libtesseract.so" ] + g_libtesseract = None - class PageSegMode(object): -@@ -326,12 +284,11 @@ def init(lang=None): +@@ -346,12 +307,11 @@ def init(lang=None): try: if lang: lang = lang.encode("utf-8") - prefix = None - if TESSDATA_PREFIX: - prefix = TESSDATA_PREFIX.encode("utf-8") -+ prefix = os.getenv('TESSDATA_PREFIX', '@NIX_TESSDATA_PREFIX@') ++ prefix = os.getenv('TESSDATA_PREFIX', '@tesseract@/share/tessdata') + os.environ['TESSDATA_PREFIX'] = prefix g_libtesseract.TessBaseAPIInit3( ctypes.c_void_p(handle), @@ -95,17 +92,17 @@ index b4e7bda..47505f7 100644 ctypes.c_char_p(lang) ) g_libtesseract.TessBaseAPISetVariable( -diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py -index c935881..7139ffe 100755 ---- a/src/pyocr/tesseract.py -+++ b/src/pyocr/tesseract.py -@@ -31,8 +31,7 @@ from .builders import DigitBuilder # backward compatibility +Index: current/src/pyocr/tesseract.py +=================================================================== +--- current.orig/src/pyocr/tesseract.py ++++ current/src/pyocr/tesseract.py +@@ -31,8 +31,7 @@ from .builders import DigitBuilder # ba from .error import TesseractError # backward compatibility from .util import digits_only -# CHANGE THIS IF TESSERACT IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY -TESSERACT_CMD = 'tesseract.exe' if os.name == 'nt' else 'tesseract' -+TESSERACT_CMD = '@NIX_TESSERACT_CMD@' ++TESSERACT_CMD = '@tesseract@/bin/tesseract' TESSDATA_EXTENSION = ".traineddata" diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix new file mode 100644 index 000000000000..76503122a1b1 --- /dev/null +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow +, isPy3k, isPyPy +}: +buildPythonPackage rec { + name = "pypillowfight-${version}"; + version = "0.2.4"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "OpenPaperwork"; + repo = "libpillowfight"; + rev = version; + sha256 = "0wbzfhbzim61fmkm7p7f2rwslacla1x00a6xp50haawjh9zfwc4y"; + }; + + prePatch = '' + echo '#define INTERNAL_PILLOWFIGHT_VERSION "${version}"' > src/pillowfight/_version.h + ''; + + # Disable tests because they're designed to only work on Debian: + # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 + doCheck = false; + + # Python 2.x is not supported, see: + # https://github.com/jflesch/libpillowfight/issues/1 + disabled = !isPy3k && !isPyPy; + + # This is needed by setup.py regardless of whether tests are enabled. + buildInputs = [ nose ]; + propagatedBuildInputs = [ pillow ]; + + meta = with stdenv.lib; { + description = "Library containing various image processing algorithms"; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 91caf0348a4e..42deae45a25d 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "1wjpn1wxg8fid2mch5ili35xqvasa3pk8h1xaiygw5idpxh3cm0f"; + sha256 = "07fwp5sczyivdz37ag9fa258gr9jbz3k3395hp5db7cwizaip2vm"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 3ae172213639..ed650f37698a 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "easyjson-unstable-${version}"; - version = "2018-07-30"; + version = "2018-08-23"; goPackagePath = "github.com/mailru/easyjson"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; repo = "easyjson"; - rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; - sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; + rev = "60711f1a8329503b04e1c88535f419d0bb440bff"; + sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 9fd70cb60c96..097f0f105447 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.5.1"; + name = "libsigrokdecode-0.5.2"; src = fetchurl { url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; - sha256 = "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9"; + sha256 = "1w434nl1syjkvwl08lji3r9sr60lbxp1nqys8hqwzv2lgiwrx3g0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index e66500ac8339..147883afd428 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "quicktemplate-unstable-${version}"; - version = "2018-04-30"; + version = "2018-09-06"; goPackagePath = "github.com/valyala/quicktemplate"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; - rev = "a91e0946457b6583004fbfc159339b8171423aed"; - sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; + rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be"; + sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/quicktemplate/deps.nix b/pkgs/development/tools/quicktemplate/deps.nix index 11a65c415c69..6064f7646818 100644 --- a/pkgs/development/tools/quicktemplate/deps.nix +++ b/pkgs/development/tools/quicktemplate/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/bytebufferpool"; - rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7"; - sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; + sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; }; } ] diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index ee88b2313662..784c59c7c1e1 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.9.0"; - sha256 = "00hdachbmcf9pyd1iksprsi5mddwp6z59mb3lr81z8ynfbmzhzni"; + version = "10.11.0"; + sha256 = "16wfgwnb2yd6y608svj2fizdq3sid44m0wqn4swkvclxb71444mr"; } diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index b8821d335b26..f90baee91fcf 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "brightnessctl-${version}"; - version = "0.3.2"; + version = "0.4"; src = fetchFromGitHub { owner = "Hummer12007"; repo = "brightnessctl"; rev = "${version}"; - sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z"; + sha256 = "1n1gb8ldgqv3vs565yhk1w4jfvrviczp94r8wqlkv5q6ab43c8w9"; }; makeFlags = [ "MODE=0755" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 05b75312646d..8717d9355d2b 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-08-17"; + version = "2018-09-24"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "12a5fd80bde3c1f5557ea647ebb127d37e74040d"; - sha256 = "0sk3jn5sm9fabs5bvwy75zw2szrb19qqwns2ypzqpgd4d5zjrs4x"; + rev = "97b1a9bb2a0c29f0f68963483156d5285e1fb1d5"; + sha256 = "0dwc4l7a7r1f65gh1rhxa854xsknrgp62rr3a0y67lk3xf5y38d7"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index b9c0d0d4436f..d9846415484b 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,43 +1,53 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3 +, gnome-themes-standard, gtk-engine-murrine, optipng, inkscape}: let - # treat versions newer than 3.22 as 3.22 - gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version; pname = "arc-theme"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2017-05-12"; + version = "20180715"; src = fetchFromGitHub { - owner = "horst3180"; + owner = "NicoHood"; repo = pname; - rev = "8290cb813f157a22e64ae58ac3dfb5983b0416e6"; - sha256 = "1lxiw5iq9n62xzs0fks572c5vkz202jigndxaankxb44wcgn9zyf"; + rev = version; + sha256 = "1kkfnkiih0i3pds5mgd1v9lrdrp4nh4hk42mw7sa4fpbjff4jh6j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gnome3.gtk ]; + preBuild = '' + # Shut up inkscape's warnings + export HOME="$NIX_BUILD_ROOT" + ''; + + nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ]; + buildInputs = [ gtk3 ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gnome-themes-standard gtk-engine-murrine ]; - preferLocalBuild = true; + postPatch = '' + find . -name render-assets.sh | + while read filename + do + substituteInPlace "$filename" \ + --replace "/usr/bin/inkscape" "${inkscape.out}/bin/inkscape" \ + --replace "/usr/bin/optipng" "${optipng.out}/bin/optipng" + done + patchShebangs . + ''; - configureFlags = [ "--disable-unity" "--with-gnome=${gnomeVersion}" ]; + configureFlags = [ "--disable-unity" ]; postInstall = '' - mkdir -p $out/share/plank/themes - cp -r extra/*-Plank $out/share/plank/themes - install -Dm644 -t $out/share/doc/${pname}/Chrome extra/Chrome/*.crx install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; meta = with stdenv.lib; { description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; - homepage = https://github.com/horst3180/arc-theme; + homepage = https://github.com/NicoHood/arc-theme; license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ad181c7bf953..a9a997546351 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -53,12 +53,12 @@ }; ale = buildVimPluginFrom2Nix { - name = "ale-2018-09-19"; + name = "ale-2018-09-20"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "169a6e26b2ca63ab0f2f5bb3d2176ff0a2f68bc3"; - sha256 = "09pc3a9wkql7j9rc3yfgwns94s7rrldichxwhq37ily139596wkm"; + rev = "aa5c82b1718f44d04f6dd11bc63f6eeed2089d9d"; + sha256 = "03m19d6zcsjr5ydbnkpa93k82sq70lj44l2shw7szjzxxyzb2h14"; }; }; @@ -83,12 +83,12 @@ }; auto-pairs = buildVimPluginFrom2Nix { - name = "auto-pairs-2017-07-03"; + name = "auto-pairs-2018-09-23"; src = fetchFromGitHub { owner = "jiangmiao"; repo = "auto-pairs"; - rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; - sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; + rev = "9086ce897a616d78baf69ddb07ad557c5ceb1d7c"; + sha256 = "02ds4i7aiq1a68qwz2gnmiigp25hi8qa9d4zcfazc3bgh855bx0l"; }; }; @@ -133,12 +133,12 @@ }; caw-vim = buildVimPluginFrom2Nix { - name = "caw-vim-2018-09-13"; + name = "caw-vim-2018-09-22"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "2427ba1379b1bb3c7b737921219a346f10a21ad8"; - sha256 = "1cwx0lpf0xvrqmbjg83y79j9f4gjdkl7iickg9ypzhdxhld0i972"; + rev = "2b88f9978b25892d918d8c7b564d3e05fc24656f"; + sha256 = "1njbyg5l4k6f0fnpfwg058rwyffxj43jf4lsfai5gjl3dckk9yw4"; }; }; @@ -314,12 +314,12 @@ }; denite-extra = buildVimPluginFrom2Nix { - name = "denite-extra-2018-08-13"; + name = "denite-extra-2018-09-20"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-extra"; - rev = "8e46f87ceb619d0db93bac58120fe01584e565fd"; - sha256 = "0pm63yi1qv1r4s098skr8pqx956d87f34cvj4vly67gj59lfyzzz"; + rev = "57ab8e6d8756e294c12a6177bef0155b736eaf1f"; + sha256 = "0in7dg23gh6h39jjn84b2sqkcyd02dvv8pvnp6c3413dnjzmiryz"; }; }; @@ -478,12 +478,12 @@ }; fastfold = buildVimPluginFrom2Nix { - name = "fastfold-2018-06-03"; + name = "fastfold-2018-09-24"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30"; - sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r"; + rev = "cdd44dcf54dd6900e9699e957ba4b203d3021d1d"; + sha256 = "1a7x026cjd6nc9l0gx3cvfvhwalxj8d4361yvy6krpjaha4yk43j"; }; }; @@ -779,12 +779,12 @@ }; ncm2 = buildVimPluginFrom2Nix { - name = "ncm2-2018-09-03"; + name = "ncm2-2018-09-20"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "08f026d84b50e8db3d3a4124da63c8c3e0e5e558"; - sha256 = "07d411p3shm27qmir8hsw88mx3wdmz3am4qi0fqzkhkpkgli70jw"; + rev = "5b5984b5528a90c40bf1d98c48bda1eda6b5e0f0"; + sha256 = "1fwg5y3kbxdv64kglkd028kyvp8k9i5wppvw56iwf4qncpd66sdg"; }; }; @@ -879,12 +879,12 @@ }; neoformat = buildVimPluginFrom2Nix { - name = "neoformat-2018-09-05"; + name = "neoformat-2018-09-22"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "c8bc4ec044a0d8c96291426b5ce10f741d63e6b6"; - sha256 = "140f1q1wbn7d7mxb2q08421a8qgxii3ffd8lmhsjj7mjsdvxmcks"; + rev = "5ea3abc08f3f0db3600e9f6f36f096c64bffdc07"; + sha256 = "0yb2mias9pc4f2hgb5lrc7k5xs3pq96c6zsahd74jb1hcjb5j5sw"; }; }; @@ -899,12 +899,12 @@ }; neomake = buildVimPluginFrom2Nix { - name = "neomake-2018-09-17"; + name = "neomake-2018-09-21"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "5c0e5c5de14a03c438a370a5ef79a3165a2e705f"; - sha256 = "0ffkpidgc9lki5h4x8w3yvf5vj6rdip6n0wd89dax81bk7579pcb"; + rev = "1686a91cc4ea4b48152e314decb827946221b1ad"; + sha256 = "1radvd8nvbgjf158jdymvwi050fncqsf7vw3kw7hcz4adk97a1pr"; }; }; @@ -1469,12 +1469,12 @@ }; vim = buildVimPluginFrom2Nix { - name = "vim-2018-09-13"; + name = "vim-2018-09-20"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "72a0d0d584e2b64dd7cd44047688d470e6e39f8f"; - sha256 = "0n2cyxkwfpy95033zisb5q1jrf17vzi11mprhkm01vfxjp5xh4hy"; + rev = "15d0ff9f1a1a5455201dbf62221e8b119cfa9161"; + sha256 = "1cmmx99hs10mnr5x5kmac39kxjf9n3riphirhmijsnym8yijrcz1"; }; }; @@ -1679,12 +1679,12 @@ }; vim-airline = buildVimPluginFrom2Nix { - name = "vim-airline-2018-09-18"; + name = "vim-airline-2018-09-23"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "251ed064e84dc684a944edbe37d3c559af3e02bf"; - sha256 = "1nmcir24f9mlnnfnkbcn3ww5dhn96k6nh0kdpjz1hdh4wd659vhm"; + rev = "2390022e33dc5eac6872a09ec39ee769298e1ef3"; + sha256 = "1b2y6zz0478ih1zbjqk2mirgbj1vnsi93ggjgfdvmxm8j9lh22h3"; }; }; @@ -2039,12 +2039,12 @@ }; vim-fugitive = buildVimPluginFrom2Nix { - name = "vim-fugitive-2018-09-19"; + name = "vim-fugitive-2018-09-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "9fec8aadc54372cbea6ac3c9cf6909054140b573"; - sha256 = "0pkfhbaka6gsabmz74v5dpwd72rwjrrq9wchcda86rmb6nxqsgmg"; + rev = "a9100fafb8c6deb187ee1cfaa37a4a02018d6c9a"; + sha256 = "0p37gywcwbdd2sl09s2c3dhr0cvf2s53jpwyz93jls2dgnlbdri8"; }; }; @@ -2099,12 +2099,12 @@ }; vim-go = buildVimPluginFrom2Nix { - name = "vim-go-2018-09-19"; + name = "vim-go-2018-09-24"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "1656f2ff1bb8c4865b2e9870c2be3468974c6ea9"; - sha256 = "1k6gyzh3sm5ndmh6r8k07q8gmr6190qfvk8cxcj1i37hr6ari0zd"; + rev = "5ec87ee2dd3443bb5d0c7f7331bec1d1ed60df9f"; + sha256 = "066sja0f78a11943fwilz40csnm13gqzff23hj6hwrlxjq31ysy4"; }; }; @@ -2218,6 +2218,16 @@ }; }; + vim-husk = buildVimPluginFrom2Nix { + name = "vim-husk-2015-11-29"; + src = fetchFromGitHub { + owner = "vim-utils"; + repo = "vim-husk"; + rev = "ad89559ff8a6c4b1e94a18b2d494a69a1f701d08"; + sha256 = "09kqzaqa4jdh31q0a3nxbx9li7zg890qxh68rfzblzyx22xv4mka"; + }; + }; + vim-iced-coffee-script = buildVimPluginFrom2Nix { name = "vim-iced-coffee-script-2013-12-26"; src = fetchFromGitHub { @@ -2360,12 +2370,12 @@ }; vim-latex-live-preview = buildVimPluginFrom2Nix { - name = "vim-latex-live-preview-2018-09-15"; + name = "vim-latex-live-preview-2018-09-25"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "c573115642e1a991e0dd763f25dc02b3d99acea5"; - sha256 = "1s1p8mi9n6qxfd9847fbzc12sy9ala5jnkjicrcdcbn7irlvvwcg"; + rev = "855c30915547c7e9c19b7e6efb528730c071d2e8"; + sha256 = "14fgbq7wyyhhzkd8832g07z97jg1b9awibzf3sn33ih7p5bb3hhp"; }; }; @@ -2400,12 +2410,12 @@ }; vim-localvimrc = buildVimPluginFrom2Nix { - name = "vim-localvimrc-2018-08-21"; + name = "vim-localvimrc-2018-09-24"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "7f8fbfedaaf217488bbc9ae3fbd2539a5d825623"; - sha256 = "1q12lxblymv0j594161lpy5a6dlsg4510gmsdf2p70kbd8jfp1ar"; + rev = "e0ce126a2a8baf3816ae722b604121951a73e092"; + sha256 = "0wi5gyafzdfwin6bxk369fz59gbw5w4xm4pgq2jpz5hxk7krwkll"; }; }; @@ -2660,12 +2670,12 @@ }; vim-puppet = buildVimPluginFrom2Nix { - name = "vim-puppet-2018-04-12"; + name = "vim-puppet-2018-09-24"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097"; - sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv"; + rev = "5680f0dca2d6b5e98687e091a544e4e0ae41d74b"; + sha256 = "134x4z88qrzfxyqa1kxmwwmhlcqa3n8qj7f71bn9w9h4ac2v650v"; }; }; @@ -2710,12 +2720,12 @@ }; vim-rhubarb = buildVimPluginFrom2Nix { - name = "vim-rhubarb-2018-08-22"; + name = "vim-rhubarb-2018-09-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "b6cbbb0ad3e22870a3cd8d79a22722c63d98d18b"; - sha256 = "13mndz5p7slhn7ba8nnmzkh20ixhsq5rsy07y61sm5fxnb128r4n"; + rev = "3a9ddb8ffa46b9fa49f3d9372bbb5d64bdc5fd23"; + sha256 = "1swybc30vyf309w1a34jf94xja1kikvrr3xpixfban50s6aiyips"; }; }; @@ -2830,12 +2840,12 @@ }; vim-snippets = buildVimPluginFrom2Nix { - name = "vim-snippets-2018-09-18"; + name = "vim-snippets-2018-09-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "39219ca29234a7e28e56379308f59e7190358092"; - sha256 = "1hnvpkqipa82qqhn68fr1qi71dj4khjgjqzhj85w6chdii1bf6qp"; + rev = "cd463f36f3d449fcb6f21b1385b79c9cbcb16f36"; + sha256 = "18k63ixxk10rws5z6gplyjgakxc6zhblh2c7jkcbrqv0dv0xhywv"; }; }; @@ -2950,12 +2960,12 @@ }; vim-test = buildVimPluginFrom2Nix { - name = "vim-test-2018-08-30"; + name = "vim-test-2018-09-23"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "0941cfc91cdaa896f16f5e32d20940aab902f88c"; - sha256 = "0zggwjyiyiipykw42b5qxgz8zhh10vi5ci3ywj1rh5h7kl858bwb"; + rev = "5aa77d57d22d453bd53f28a18f80e7bfecccf811"; + sha256 = "1w0x4xfj3fl5zwnk14sh9sp1hkj25grrw1wan0g3y7ar8ygjyl7f"; }; }; @@ -2990,12 +3000,12 @@ }; vim-toml = buildVimPluginFrom2Nix { - name = "vim-toml-2018-06-15"; + name = "vim-toml-2018-09-25"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80"; - sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n"; + rev = "2069e7413d8eaab567fa320723c4af24bb437f3a"; + sha256 = "0ffngrry8ambv27wwzp0czgccdag1qcmbcvazjklm2i5b3ads39i"; }; }; @@ -3050,12 +3060,12 @@ }; vim-wakatime = buildVimPluginFrom2Nix { - name = "vim-wakatime-2018-07-14"; + name = "vim-wakatime-2018-09-24"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf"; - sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2"; + rev = "17e5d1b21128b955dba244d5d0d5ad9f359a5c68"; + sha256 = "0v2hb6hzcdn4ks691m511las5mli6igfg3srxnr3a09krgxi512f"; }; }; @@ -3160,12 +3170,12 @@ }; vimtex = buildVimPluginFrom2Nix { - name = "vimtex-2018-09-19"; + name = "vimtex-2018-09-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "fb09eed5336b6540f8350f2792fded0956362d7b"; - sha256 = "0g3pw5qw6y9vpdmdnw4x478m5c34g2wll01gdy76yf8r5vysyv41"; + rev = "d16ae14c15bb597c5421cff6c3abf6f9aae22bca"; + sha256 = "083h9xq25sv6zxcp000gbs7npwfb367m4xdmcz1b80hgv7gnwwr9"; }; }; @@ -3244,8 +3254,8 @@ src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "a020cbc0fc4b535f81d9f8db33150b92df68694a"; - sha256 = "1i9hqmns7hyc15cz565g8xzlf6ryk03xwg714sfbcmkai9vl61w3"; + rev = "e37923a752c7eee184cd6d96ac34e303fb7cfae9"; + sha256 = "1dhh88f1mz7rajxyjbarqf3qiia6n34salknri3a0dffbih5y8rc"; fetchSubmodules = true; }; }; @@ -3281,12 +3291,12 @@ }; zig-vim = buildVimPluginFrom2Nix { - name = "zig-vim-2018-09-17"; + name = "zig-vim-2018-09-21"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "9986edc96f220bb9208473a5ad61339c1567df23"; - sha256 = "03grs1ha5r4cfh8hczfawj7x7xwb6j716rl52gbkhbxhlk72w5kq"; + rev = "febf2fc8d7aa27809758fd90be29d3a9b501efc2"; + sha256 = "1zp1bz3fzcwvdw3qgiyvmd5imrzjh7rnpnjpxm8mma0kxi2bnl3g"; }; }; } \ No newline at end of file diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5f664c39e3c5..df6b33a53c06 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -311,6 +311,7 @@ vim-scripts/tabmerge vim-scripts/taglist.vim vim-scripts/wombat256.vim vim-scripts/YankRing.vim +vim-utils/vim-husk vimwiki/vimwiki vmchale/dhall-vim w0rp/ale diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 9ccda9178f10..fdb6ea3695e8 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2018.2"; + ver = "2018.3"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "09bxh4yifqiphn0ljc3msbxid62ynd9kk3vn82h13gcpfnyckw6z"; + sha256 = "1rljx2jlh3wlk6l9p068mhbqpdr5p5qnwm0336ay1316x0zjvqr4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index fcec5fd0df41..5decdc14e110 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.71"; + version = "4.14.72"; # 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 = "12blj3zzvzs2nz8rp1g5ykibfvm355442c31l4ijr4mxphylg93n"; + sha256 = "0zsmch2m9drk297n6ck8ja6m5p4fzg87lz8ky3y41g0b4l35k4nz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 48fc823ee084..48ae108c48a7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.9"; + version = "4.18.10"; # 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 = "0yli3qr9rygqk5zc4w70xb49b8jbgd09cdz4ji5a00krwm8m76ac"; + sha256 = "1pli16s1vprmrq4cdii93k8rqrxy20a7vs7jf77fgdfaiizlyq0h"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 3106dc981055..d906700f437e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.157"; + version = "4.4.158"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0kb23pq0q7nkrri4bir5x6285wbi17fn5mpbm9awzjablq5bq400"; + sha256 = "1a921xq475y961izkzn8n4ky9s7n4xsvhs9qh664xk5biip8y72p"; }; } // (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 6e5d310075e2..d34db0989963 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.128"; + version = "4.9.129"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04kgdci8xndml2fwbam59pjwwxqd4kf7y3qgkk4asshs9546zdxx"; + sha256 = "064kwdsxzk65mn991cmxqs31i332szf2z3lw5lgbzhgyzk9i0mbg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 6e3a7614a56b..f58ab5c95cc4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.18.2018.08.31"; + version = "4.18.2018.09.21"; modDirVersion = "4.18.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "9c08efd02b827e6ee2a6e5a751045c6c6bd484d4"; - sha256 = "0xnkg0fpilmwckyb1drspggv3ibx8vkqic9ai53d5vx2rrnvvafw"; + rev = "2fe17e38d355271a8212a8123a9281e2f9df811f"; + sha256 = "1p35qf7fdwpr8sz4alblmbq6rmhd87rwrrwk6xpgxsfkkhmf36d6"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 657f17c16849..86e9e0d3d4d0 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { name = "nfs-utils-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz"; - sha256 = "06av6cjf8h18dpaxh8cd1awsra75zf6s5sj5r2z5g7scbj051ziw"; + sha256 = "08k36d7l8yqylscnln3p85lcfwi7r7g6n3bnslgmzc1i71wk92zn"; }; # libnfsidmap is built together with nfs-utils from the same source, diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 03fdf7908cc4..012b66e19809 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-08-18"; + version = "2018-09-25"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "78257f1c1f34cdad1931531601163071f7f29aa9"; - sha256 = "0rpvbayx48xncy70vzbxn3cs0lslza0i3hxmywlngyl17da97bf0"; + rev = "ad88ec03e5c7a527fddebb6b54909f50ecaae00c"; + sha256 = "074bzl38f4y4xs4vavbn7mgi4srv1fbzkcx4p17mrqipzk6ffbca"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index c5d584f1bcd3..b2c367cf42d6 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29"; - sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn"; + rev = "3b6e9e96624526bce05b577b76ca726a20bb3c83"; + sha256 = "16jw3af3lyb5x9yn7anx0rb3mz70bivnixkvh8dzrq16wkkn760h"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/dimfeld/httptreemux"; - rev = "7f532489e7739b3d49df5c602bf63549881fe753"; - sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk"; + rev = "a53c8f73d4b7d82c30b7e5ab6aa155b981c42fb5"; + sha256 = "08s90ggydcwz2683bbsrc33h2b7x2q5ws104gva838b573xzrhqj"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"; - sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; + rev = "7e0369fae54b097612a946bc6709f3a3fbccb3de"; + sha256 = "00i2is2z7101igf7sr8prmd8m59x7k7xdkhm5h4bjs37k157zm38"; }; } { @@ -59,17 +59,8 @@ fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; - sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; - sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; + rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"; + sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; }; } { @@ -77,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "b3511bfdd742af558b54eb6160aca9446d762a19"; - sha256 = "1v41is0h05p4jgv8nal3l8lcdcggylsyblq0ihycnprkdzwls808"; + rev = "e85a2792f3166972d6619b7051f01a2df254192a"; + sha256 = "088bckqifg61xdda0f0hrcyzm3dslr3jzcsgdyk8ccjmjv2112sd"; }; } { @@ -86,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/bytebufferpool"; - rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7"; - sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; + sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; }; } { @@ -95,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/quicktemplate"; - rev = "a91e0946457b6583004fbfc159339b8171423aed"; - sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; + rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be"; + sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6"; }; } { @@ -104,8 +95,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "aaf60122140d3fcf75376d319f0554393160eb50"; - sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv"; + rev = "f04abc6bdfa7a0171a8a0c9fd2ada9391044d056"; + sha256 = "0mygvmprcssixj3bm2djl3xzdnyh4zqhkwhynzml5rha8mvrxknd"; }; } ] diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index bab3faa79695..dd56bc89c0d0 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.30.2"; + version = "0.31.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "143jsm0pbfhsa2iwkg5zanl9qxbpmsdvay5djyac4rvgl53m0wy9"; + sha256 = "0dnn2vgjbbb82kvbmgrfq0hqwfk0jh5gc3xrcfqwvvq673yf4f2m"; }; nativeBuildInputs = [ go ]; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index daa9f66615c9..d1efa3602374 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -53,9 +53,6 @@ in lib.init bootStages ++ [ else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs - ++ lib.optionals - (hostPlatform.isLinux && !buildPlatform.isLinux) - [ buildPackages.patchelf buildPackages.paxctl ] ++ lib.optional (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index d0434ebe28b4..d7cca2a77bdc 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bibutils-${version}"; - version = "6.6"; + version = "6.7"; src = fetchurl { url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz"; - sha256 = "1zqwhjsngnflzdp2nd3762bvmkjq5mal417fly1n2xfgdqpg37ps"; + sha256 = "072cmhv692nk1lfcwmaqid5gpg8q4jc4vai5ss8lj72zms32p882"; }; configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index e2cc49a3e99a..afb9fc70a739 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { name = "cargo-edit-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "killercup"; repo = "cargo-edit"; rev = "v${version}"; - sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0"; + sha256 = "0g3dikwk6n48dmhx9qchmzyrhcr40242lhvlcyk1nqbpvs3b51fm"; }; - cargoSha256 = "1j7fqswdx6f2i5wr0pdavdvcv18j1l27a8ighr75p7f54apa27l8"; + cargoSha256 = "1bq0mjn44f0sn94nb9wqal4swhkzn7f3vbk5jyay4v3wqfz1gb7r"; nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig; buildInputs = lib.optional (!stdenv.isDarwin) openssl; diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix new file mode 100644 index 000000000000..68b9194015b1 --- /dev/null +++ b/pkgs/tools/security/2fa/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "1.1.0"; + name = "2fa-${version}"; + + goPackagePath = "rsc.io/2fa"; + + src = fetchFromGitHub { + owner = "rsc"; + repo = "2fa"; + rev = "v${version}"; + sha256 = "0827vl2bxd6m2rbj00x7857cs7cic3mlg5nlhqzd0n73dm5vk2za"; + }; + + meta = with stdenv.lib; { + homepage = https://rsc.io/2fa; + description = "Two-factor authentication on the command line"; + platforms = platforms.all; + maintainers = with maintainers; [ rvolosatovs ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 51fcbb572053..c0b9954206ad 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -11,14 +11,14 @@ buildPythonApplication rec { name = "google-compute-engine-${version}"; - version = "20180510"; + version = "20180905"; namePrefix = ""; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; rev = version; - sha256 = "13hmg29s1pljcvf40lrv5yickg8x51rcnv68wxhs6zkkg75k448p"; + sha256 = "0095f000kgk2lc5p1y4080sbc0r7ly60a7i9id8hydfnkhqqz75n"; }; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91dc2f35f067..be2dfefceb02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -288,13 +288,13 @@ with pkgs; # gitlab example fetchFromGitLab = { - owner, repo, rev, domain ? "gitlab.com", name ? "source", + owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null, ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://${domain}/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; - meta.homepage = "https://${domain}/${owner}/${repo}/"; - } // removeAttrs args [ "domain" "owner" "repo" "rev" ]) // { inherit rev; }; + url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) "${group}%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; + meta.homepage = "https://${domain}/${lib.optionalString (group != null) "${group}/"}${owner}/${repo}/"; + } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; }; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { @@ -1338,6 +1338,8 @@ with pkgs; gdrive = callPackage ../applications/networking/gdrive { }; + go-2fa = callPackage ../tools/security/2fa {}; + go-dependency-manager = callPackage ../development/tools/gdm { }; geckodriver = callPackage ../development/tools/geckodriver { }; @@ -7605,7 +7607,7 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528; + inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528 perldevel; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -11642,7 +11644,7 @@ with pkgs; postgis = callPackage ../development/libraries/postgis { }; - protobuf = protobuf3_4; + protobuf = protobuf3_6; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; @@ -12835,6 +12837,7 @@ with pkgs; ### DEVELOPMENT / PERL MODULES + # old versions perl522Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { perl = perl522; overrides = (config.perlPackageOverrides or (p: {})) pkgs; @@ -12847,10 +12850,16 @@ with pkgs; perl = perl526; overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); + # the latest Maint version perl528Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { perl = perl528; overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); + # the latest Devel version + perldevelPackages = recurseIntoAttrs (callPackage ./perl-packages.nix { + perl = perldevel; + overrides = (config.perlPackageOverrides or (p: {})) pkgs; + }); perlPackages = perl528Packages; inherit (perlPackages) perl buildPerlPackage; @@ -13364,11 +13373,7 @@ with pkgs; check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {}; - net_snmp = callPackage ../servers/monitoring/net-snmp { - # https://sourceforge.net/p/net-snmp/bugs/2712/ - # remove after net-snmp > 5.7.3 - perl = perl522; - }; + net_snmp = callPackage ../servers/monitoring/net-snmp { }; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; @@ -13388,7 +13393,7 @@ with pkgs; softether_4_25 = callPackage ../servers/softether/4.25.nix { }; softether = softether_4_25; - qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; + qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; OVMF-CSM = OVMF.override { openssl = null; }; @@ -16983,6 +16988,8 @@ with pkgs; spectrwm = callPackage ../applications/window-managers/spectrwm { }; + spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; + super-productivity = callPackage ../applications/networking/super-productivity { }; wlc = callPackage ../development/libraries/wlc { }; @@ -20158,7 +20165,9 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; - pokerth = callPackage ../games/pokerth { }; + pokerth = callPackage ../games/pokerth { + protobuf = protobuf3_4; + }; pokerth-server = pokerth.server; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bbb028ceb4b8..ea5cc8ded1db 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -54,13 +54,13 @@ in { }; ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix { bootPkgs = packages.ghc7103Binary; - sphinx = pkgs.python27Packages.sphinx; + inherit (buildPackages.python27Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_37; llvmPackages = pkgs.llvmPackages_37; }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix { bootPkgs = packages.ghc821Binary; - sphinx = pkgs.python3Packages.sphinx; + inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c8fc8c64de39..4b27db158767 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1123,7 +1123,7 @@ in { }; blessed = callPackage ../development/python-modules/blessed {}; - + block-io = callPackage ../development/python-modules/block-io {}; # Build boost for this specific Python version @@ -3869,35 +3869,7 @@ in { }; }; - pypillowfight = buildPythonPackage rec { - name = "pypillowfight-${version}"; - version = "0.2.1"; - - src = pkgs.fetchFromGitHub { - owner = "jflesch"; - repo = "libpillowfight"; - rev = version; - sha256 = "1rwmajsy9qhl3qhhy5mw0xmr3n8abxcq8baidpn0sxv6yjg2369z"; - }; - - # Disable tests because they're designed to only work on Debian: - # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 - doCheck = false; - - # Python 2.x is not supported, see: - # https://github.com/jflesch/libpillowfight/issues/1 - disabled = !isPy3k && !isPyPy; - - # This is needed by setup.py regardless of whether tests are enabled. - buildInputs = [ self.nose ]; - propagatedBuildInputs = [ self.pillow ]; - - meta = { - description = "Library containing various image processing algorithms"; - homepage = "https://github.com/jflesch/libpillowfight"; - license = licenses.gpl3Plus; - }; - }; + pypillowfight = callPackage ../development/python-modules/pypillowfight { }; pyprind = callPackage ../development/python-modules/pyprind { }; @@ -9725,7 +9697,7 @@ in { protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; - protobuf = pkgs.protobuf3_5; + protobuf = pkgs.protobuf; }; protobuf3_1 = callPackage ../development/python-modules/protobuf { |