diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 955a6067799..3962d7b1598 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -1,39 +1,26 @@ { config, lib, pkgs, ... }: - with lib; - let - -cfg = config.services.tlp; - -enableRDW = config.networking.networkmanager.enable; - -tlp = pkgs.tlp.override { - inherit enableRDW; -}; - -# XXX: We can't use writeTextFile + readFile here because it triggers -# TLP build to get the .drv (even on --dry-run). -confFile = pkgs.runCommand "tlp" - { config = cfg.extraConfig; - passAsFile = [ "config" ]; - preferLocalBuild = true; - } - '' - cat ${tlp}/etc/default/tlp > $out - cat $configPath >> $out - ''; - + cfg = config.services.tlp; + enableRDW = config.networking.networkmanager.enable; + tlp = pkgs.tlp.override { inherit enableRDW; }; + # TODO: Use this for having proper parameters in the future + mkTlpConfig = tlpConfig: generators.toKeyValue { + mkKeyValue = generators.mkKeyValueDefault { + mkValueString = val: + if isInt val then toString val + else if isString val then val + else if true == val then "1" + else if false == val then "0" + else if isList val then "\"" + (concatStringsSep " " val) + "\"" + else err "invalid value provided to mkTlpConfig:" (toString val); + } "="; + } tlpConfig; in - { - ###### interface - options = { - services.tlp = { - enable = mkOption { type = types.bool; default = false; @@ -45,77 +32,64 @@ in default = ""; description = "Additional configuration variables for TLP"; }; - }; - }; - ###### implementation - config = mkIf cfg.enable { + boot.kernelModules = [ "msr" ]; - powerManagement.scsiLinkPolicy = null; - powerManagement.cpuFreqGovernor = null; - powerManagement.cpufreq.max = null; - powerManagement.cpufreq.min = null; + environment.etc = { + "tlp.conf".text = cfg.extraConfig; + } // optionalAttrs enableRDW { + "NetworkManager/dispatcher.d/99tlp-rdw-nm".source = + "${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm"; + }; - systemd.sockets.systemd-rfkill.enable = false; + environment.systemPackages = [ tlp ]; - systemd.services = { - "systemd-rfkill@".enable = false; - systemd-rfkill.enable = false; - - tlp = { - description = "TLP system startup/shutdown"; - - after = [ "multi-user.target" ]; - wantedBy = [ "multi-user.target" ]; - before = [ "shutdown.target" ]; - restartTriggers = [ confFile ]; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${tlp}/bin/tlp init start"; - ExecStop = "${tlp}/bin/tlp init stop"; - }; - }; - - tlp-sleep = { - description = "TLP suspend/resume"; - - wantedBy = [ "sleep.target" ]; - before = [ "sleep.target" ]; - - unitConfig = { - StopWhenUnneeded = true; - }; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${tlp}/bin/tlp suspend"; - ExecStop = "${tlp}/bin/tlp resume"; - }; - }; + # FIXME: When the config is parametrized we need to move these into a + # conditional on the relevant options being enabled. + powerManagement = { + scsiLinkPolicy = null; + cpuFreqGovernor = null; + cpufreq.max = null; + cpufreq.min = null; }; services.udev.packages = [ tlp ]; - environment.etc = - { - "default/tlp".source = confFile; - } // optionalAttrs enableRDW { - "NetworkManager/dispatcher.d/99tlp-rdw-nm" = { - source = "${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm"; - }; + systemd = { + packages = [ tlp ]; + # XXX: These must always be disabled/masked according to [1]. + # + # [1]: https://github.com/linrunner/TLP/blob/a9ada09e0821f275ce5f93dc80a4d81a7ff62ae4/tlp-stat.in#L319 + sockets.systemd-rfkill.enable = false; + services.systemd-rfkill.enable = false; + + services.tlp = { + # XXX: The service should reload whenever the configuration changes, + # otherwise newly set power options remain inactive until reboot (or + # manual unit restart.) + restartTriggers = [ config.environment.etc."tlp.conf".source ]; + # XXX: When using systemd.packages (which we do above) the [Install] + # section of systemd units does not work (citation needed) so we manually + # enforce it here. + wantedBy = [ "multi-user.target" ]; }; - environment.systemPackages = [ tlp ]; - - boot.kernelModules = [ "msr" ]; - + services.tlp-sleep = { + # XXX: When using systemd.packages (which we do above) the [Install] + # section of systemd units does not work (citation needed) so we manually + # enforce it here. + before = [ "sleep.target" ]; + wantedBy = [ "sleep.target" ]; + # XXX: `tlp suspend` requires /var/lib/tlp to exist in order to save + # some stuff in there. There is no way, that I know of, to do this in + # the package itself, so we do it here instead making sure the unit + # won't fail due to the save dir not existing. + serviceConfig.StateDirectory = "tlp"; + }; + }; }; - } diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index f3bf9268b29..60ef0159ff1 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -52,6 +52,8 @@ let ''; activationScript = '' + ${set_XDG_CONFIG_HOME} + # The KDE icon cache is supposed to update itself automatically, but it uses # the timestamp on the icon theme directory as a trigger. This doesn't work # on NixOS because the timestamp never changes. As a workaround, delete the @@ -62,7 +64,7 @@ let # xdg-desktop-settings generates this empty file but # it makes kbuildsyscoca5 fail silently. To fix this # remove that menu if it exists. - rm -fv ''${XDG_CONFIG_HOME:?}/menus/applications-merged/xdg-desktop-menu-dummy.menu + rm -fv ''${XDG_CONFIG_HOME}/menus/applications-merged/xdg-desktop-menu-dummy.menu # Qt writes a weird ‘libraryPath’ line to # ~/.config/Trolltech.conf that causes the KDE plugin @@ -71,7 +73,7 @@ let # disastrous, so here we nuke references to the Nix store # in Trolltech.conf. A better solution would be to stop # Qt from doing this wackiness in the first place. - trolltech_conf="''${XDG_CONFIG_HOME:?}/Trolltech.conf" + trolltech_conf="''${XDG_CONFIG_HOME}/Trolltech.conf" if [ -e "$trolltech_conf" ]; then ${sed} -i "$trolltech_conf" -e '/nix\\store\|nix\/store/ d' fi @@ -84,10 +86,20 @@ let ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5 ''; + set_XDG_CONFIG_HOME = '' + # Set the default XDG_CONFIG_HOME if it is unset. + # Per the XDG Base Directory Specification: + # https://specifications.freedesktop.org/basedir-spec/latest + # 1. Never export this variable! If it is unset, then child processes are + # expected to set the default themselves. + # 2. Contaminate / if $HOME is unset; do not check if $HOME is set. + XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config} + ''; + startplasma = '' - export XDG_CONFIG_HOME="''${XDG_CONFIG_HOME:-$HOME/.config}" - mkdir -p "''${XDG_CONFIG_HOME:?}" + ${set_XDG_CONFIG_HOME} + mkdir -p "''${XDG_CONFIG_HOME}" '' + optionalString pulseaudio.enable '' @@ -100,10 +112,10 @@ let ${activationScript} # Create default configurations if Plasma has never been started. - kdeglobals="''${XDG_CONFIG_HOME:?}/kdeglobals" + kdeglobals="''${XDG_CONFIG_HOME}/kdeglobals" if ! [ -f "$kdeglobals" ] then - kcminputrc="''${XDG_CONFIG_HOME:?}/kcminputrc" + kcminputrc="''${XDG_CONFIG_HOME}/kcminputrc" if ! [ -f "$kcminputrc" ] then cat ${kcminputrc} >"$kcminputrc" @@ -115,7 +127,7 @@ let cat ${gtkrc2} >"$gtkrc2" fi - gtk3_settings="''${XDG_CONFIG_HOME:?}/gtk-3.0/settings.ini" + gtk3_settings="''${XDG_CONFIG_HOME}/gtk-3.0/settings.ini" if ! [ -f "$gtk3_settings" ] then mkdir -p "$(dirname "$gtk3_settings")" diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 6d9147a7f5d..2f3e5f64767 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.44.0"; + version = "3.45.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0gap0cyw6sfb4487i1x220rr9fbsz6xyw68l15ar0vfll0zv0760"; + sha256 = "02jmylz76wlwxlv8drndprb7r9l8kqqgjkp17mjx5ngnl545pc2w"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index d6cf17c159f..b241f750d03 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0msdnp6wh97lnm3m084jsvbp95h5d35y5fm71j64cgf4g39zp5ds"; + sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; @@ -33,7 +33,7 @@ in pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://musicbrainz.org/doc/MusicBrainz_Picard; + homepage = "https://picard.musicbrainz.org/"; description = "The official MusicBrainz tagger"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix deleted file mode 100644 index ffa509d2320..00000000000 --- a/pkgs/applications/blockchains/parity/beta.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - version = "2.6.6"; - sha256 = "1gx5qg9c588d5m564bnbly86663yrzb2hmlgv9zplwba7p0lpphl"; - cargoSha256 = "1xqmnirx2r91q5gy1skxl0f79xvaqzimq3l0cj4xvfms7mpdfbg1"; -in - import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix index 1b5870b429b..e390b78b86d 100644 --- a/pkgs/applications/blockchains/parity/default.nix +++ b/pkgs/applications/blockchains/parity/default.nix @@ -1,6 +1,46 @@ -let - version = "2.5.11"; - sha256 = "1x2p559g2f30520v3kn46n737l5s1kwrn962dv73s6mb6n1lhs55"; - cargoSha256 = "16nf6y0hyffwdhxn1w4ms4zycs5lkzir8sj6c2lgsabig057hb6z"; -in - import ./parity.nix { inherit version sha256 cargoSha256; } +{ lib +, fetchFromGitHub +, rustPlatform +, cmake +, llvmPackages +, openssl +, pkg-config +, systemd +}: + +rustPlatform.buildRustPackage rec { + pname = "parity"; + version = "2.7.2"; + + src = fetchFromGitHub { + owner = "paritytech"; + repo = "parity-ethereum"; + rev = "v${version}"; + sha256 = "09cvqk0h9c26famh3f1nc3g74cd0zk6klys977yr1f13bgqmzx0x"; + }; + + cargoSha256 = "1fdymy8hvn137i5y4flyhlxwjxkd2cd6gq81i1429gk7j3h085ig"; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + nativeBuildInputs = [ + cmake + llvmPackages.clang + llvmPackages.libclang + pkg-config + ]; + + buildInputs = [ openssl systemd ]; + + cargoBuildFlags = [ "--features final" ]; + + # test result: FAILED. 88 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out + doCheck = false; + + meta = with lib; { + description = "Fast, light, robust Ethereum implementation"; + homepage = "http://parity.io"; + license = licenses.gpl3; + maintainers = with maintainers; [ akru xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix deleted file mode 100644 index 6937d6efb09..00000000000 --- a/pkgs/applications/blockchains/parity/parity.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ version -, sha256 -, cargoSha256 -}: - -{ lib -, fetchFromGitHub -, rustPlatform - -, cmake -, openssl -, pkgconfig -, systemd -}: - -rustPlatform.buildRustPackage { - pname = "parity"; - inherit version; - inherit cargoSha256; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - - src = fetchFromGitHub { - owner = "paritytech"; - repo = "parity-ethereum"; - rev = "v${version}"; - inherit sha256; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ openssl systemd ]; - - cargoBuildFlags = [ "--features final" ]; - - # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out - doCheck = false; - - meta = with lib; { - description = "Fast, light, robust Ethereum implementation"; - homepage = "http://parity.io"; - license = licenses.gpl3; - maintainers = with maintainers; [ akru xrelkd ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 8ff2ed36fdc..a10e62be467 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0zn4b4md3pn1rvb15rnz3zcx9a359x26nfy7zcfp7nx27ais13n5"; + cargoSha256 = "13k21akyfqgamywj39bw73sldby1s02vyvxfglxbaqq1x96xcy4i"; # failures: structures::polyline::test::test_polyline_split doCheck = false; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index e9223b1453e..b5df3d768d2 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -50,13 +50,13 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.16"; + version = "2.10.18"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb"; + sha256 = "Zb/hEejuv/093jAWzLUH+ZSNJmPZSXy0ONm7YJ4R1xY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch index e37351cfd46..20c350bdaea 100644 --- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch +++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch @@ -1,13 +1,11 @@ diff --git a/app/gimp-version.c b/app/gimp-version.c -index 0f7bfb9bf9..1679624b8e 100644 +index 3d1894a036..48bb670b64 100644 --- a/app/gimp-version.c +++ b/app/gimp-version.c -@@ -228,9 +228,9 @@ - "# Libraries #\n%s", - GIMP_GIT_VERSION, +@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, GIMP_BUILD_ID, gimp_version_get_revision (), - GIMP_BUILD_PLATFORM, + GIMP_BUILD_PLATFORM_FAMILY, - CC_VERSION, + "@cc_version@", lib_versions); diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index d57775c3d8f..71997ff8ffa 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "calls"; rev = "v${version}"; - sha256 = "01inx4mvrzvklwrfryw5hw9p89v8cn78m3qmv97g7a3v0h5c0n35"; + sha256 = "105r631a0rva1k1fa50lravsfk5dd3f0k3gfc7lvpn2jkd99s1g6"; }; nativeBuildInputs = [ @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A phone dialer and call handler"; - homepage = https://source.puri.sm/Librem5/calls; + homepage = "https://source.puri.sm/Librem5/calls"; license = licenses.gpl3Plus; maintainers = with maintainers; [ craigem lheckemann ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 6b19cb8c43c..09a69f4b80e 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "kompose"; - version = "1.20.0"; + version = "1.21.0"; goPackagePath = "github.com/kubernetes/kompose"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "kubernetes"; repo = "kompose"; - sha256 = "1zgxm3zcxapav4jxh1r597rmxmlxcgns1l8w632ch7d90x5ihvll"; + sha256 = "15a1alf6ywwfc4z5kdcnv64fp3cfy3qrcw62ny6xyn1kh1w24vkh"; }; nativeBuildInputs = [ installShellFiles ]; @@ -20,9 +20,9 @@ buildGoPackage rec { installShellCompletion kompose.{bash,zsh} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to help users who are familiar with docker-compose move to Kubernetes"; - homepage = https://github.com/kubernetes/kompose; + homepage = "https://kompose.io"; license = licenses.asl20; maintainers = with maintainers; [ thpham vdemeester ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 2da36be90de..1dbc49512c6 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.2.1"; + version = "3.2.2"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0nz84zyhs4177ljxmv34vgc9kgg7ssxhxa4mssxqwh6nb00697sq"; + sha256 = "0ygdxpz0i4jxp55fg9x4xcan093wycjb66yas073gviz9kpj6naz"; }; cmakeFlags = [ @@ -100,7 +100,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.wireshark.org/; + homepage = "https://www.wireshark.org/"; description = "Powerful network protocol analyzer"; license = licenses.gpl2; diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix new file mode 100644 index 00000000000..9f239f221b1 --- /dev/null +++ b/pkgs/applications/science/logic/mcy/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub +, yosys, symbiyosys, python3 +}: + +let + python = python3.withPackages (p: with p; [ flask ]); +in +stdenv.mkDerivation { + pname = "mcy"; + version = "2020.02.05"; + + src = fetchFromGitHub { + owner = "YosysHQ"; + repo = "mcy"; + rev = "83deeddd12d583a89ad4aa1d2147efa4d6adc33c"; + sha256 = "1i0cabiqr68zflwzc6z894i4n7k6m3hbfck58vzh8zb9jwxwizav"; + }; + + buildInputs = [ python ]; + patchPhase = '' + substituteInPlace mcy.py \ + --replace yosys '${yosys}/bin/yosys' \ + --replace 'os.execvp("mcy-dash"' "os.execvp(\"$out/libexec/mcy/mcy-dash.py\"" + ''; + + # the build needs a bit of work... + buildPhase = "true"; + installPhase = '' + mkdir -p $out/bin $out/libexec/mcy + install mcy.py $out/bin/mcy && chmod +x $out/bin/mcy + install mcy-dash.py $out/libexec/mcy/mcy-dash.py + ''; + + meta = { + description = "Mutation-based coverage testing for hardware designs, with Yosys"; + homepage = "https://github.com/YosysHQ/mcy"; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index d6ff7a8b4a7..6b41a44a358 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, yosys, bash, python3, yices }: +{ stdenv, fetchFromGitHub +, bash, python3, yosys +, yices, boolector, aiger, abc-verifier +}: stdenv.mkDerivation { pname = "symbiyosys"; @@ -11,9 +14,24 @@ stdenv.mkDerivation { sha256 = "1pwbirszc80r288x81nx032snniqgmc80i09bbha2i3zd0c3pj5h"; }; - buildInputs = [ python3 yosys ]; + buildInputs = [ python3 ]; + patchPhase = '' + patchShebangs . - propagatedBuildInputs = [ yices ]; + # Fix up Yosys imports + substituteInPlace sbysrc/sby.py \ + --replace "##yosys-sys-path##" \ + "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" + + # Fix various executable references + substituteInPlace sbysrc/sby_core.py \ + --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \ + --replace ': "btormc"' ': "${boolector}/bin/btormc"' \ + --replace ': "yosys"' ': "${yosys}/bin/yosys"' \ + --replace ': "yosys-smtbmc"' ': "${yosys}/bin/yosys-smtbmc"' \ + --replace ': "yosys-abc"' ': "${abc-verifier}/bin/abc"' \ + --replace ': "aigbmc"' ': "${aiger}/bin/aigbmc"' \ + ''; buildPhase = "true"; installPhase = '' @@ -21,19 +39,13 @@ stdenv.mkDerivation { cp sbysrc/sby_*.py $out/share/yosys/python3/ cp sbysrc/sby.py $out/bin/sby - chmod +x $out/bin/sby - # Fix up shebang and Yosys imports - patchShebangs $out/bin/sby - substituteInPlace $out/bin/sby \ - --replace "##yosys-sys-path##" \ - "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" - substituteInPlace $out/share/yosys/python3/sby_core.py \ - --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' + chmod +x $out/bin/sby ''; + meta = { description = "Tooling for Yosys-based verification flows"; - homepage = https://symbiyosys.readthedocs.io/; + homepage = "https://symbiyosys.readthedocs.io/"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ thoughtpolice emily ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 477b628c4d7..d0c468ab68e 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghq"; - version = "0.12.6"; + version = "1.1.0"; src = fetchFromGitHub { - owner = "motemen"; + owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "14rm7fvphr7r9x0ys10vhzjwhfhhscgr574n1i1z4lzw551lrnp4"; + sha256 = "1i0q9lxdxbyj0l0510cbkwkbycawrx8cxlbdrhb2p2fnk0vqnyiv"; }; - modSha256 = "1y2v8ir7kc2avgri06nagfyaxqr3xrg4g5pxl9rwzq9dyzm6ci5z"; + modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41"; buildFlagsArray = '' -ldflags= @@ -19,20 +19,13 @@ buildGoModule rec { ''; postInstall = '' - install -m 444 -D ${src}/zsh/_ghq $out/share/zsh/site-functions/_ghq + install -m 444 -D ${src}/misc/zsh/_ghq $out/share/zsh/site-functions/_ghq + install -m 444 -D ${src}/misc/bash/_ghq $out/share/bash-completion/completions/_ghq ''; - patches = [ - (fetchpatch { - # remove once the commit lands in a release. - url = "https://github.com/motemen/ghq/commit/38ac89e60e60182b5870108f9753c9fe8d00e4a6.patch"; - sha256 = "1z8yvzmka3sh44my6jnwc39p8zs7mczxgvwc9z0pkqk4vgvaj8gj"; - }) - ]; - meta = { description = "Remote repository management made easy"; - homepage = https://github.com/motemen/ghq; + homepage = https://github.com/x-motemen/ghq; maintainers = with stdenv.lib.maintainers; [ sigma ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 1e343cdb180..6d548f04054 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk"; + cargoSha256 = "0jc6mhszxmwsdjk73wkfi0jjp9vkzzl9kk0dbnry6w7dyr5if8cc"; buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 1899be9a038..b28c95e6bfb 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0va6ny1v7lk30hhx4i5qyk9fwg3apy2nmh6kbmxhcf0rs5449ikg"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "099hn0pm9ppply3m3dwns3f5p43rdag2d3niaj8jyc1mnavviwjv"; + cargoSha256 = "1lywr21kk3idjyc10gy4848dmmgyqc2jjf7hpzq0vywkp639bf2x"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 02ac6bfbcde..cff1885e279 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -1,50 +1,59 @@ -{ stdenv, fetchurl, unzip, version ? "2.0.0" }: +{ stdenv, fetchurl, unzip, version ? "2.7.1" }: let sources = let base = "https://storage.googleapis.com/dart-archive/channels"; - stable = "${base}/stable/release"; - dev = "${base}/dev/release"; + stable_version = "stable"; + dev_version = "dev"; + x86_64 = "x64"; + i686 = "ia32"; + aarch64 = "arm64"; in { - "1.16.1-x86_64-linux" = fetchurl { - url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "01cbnc8hd2wwprmivppmzvld9ps644k16wpgqv31h1596l5p82n2"; - }; - "1.16.1-i686-linux" = fetchurl { - url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0jfwzc3jbk4n5j9ka59s9bkb25l5g85fl1nf676mvj36swcfykx3"; - }; "1.24.3-x86_64-linux" = fetchurl { - url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "e323c97c35e6bc5d955babfe2e235a5484a82bb1e4870fa24562c8b9b800559b"; + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; + sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3"; }; "1.24.3-i686-linux" = fetchurl { - url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "d67b8f8f9186e7d460320e6bce25ab343c014b6af4b2f61369ee83755d4da528"; + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; + sha256 = "0a559mfpb0zfd49zdcpld95h2g1lmcjwwsqf69hd9rw6j67qyyyn"; }; - "2.0.0-x86_64-linux" = fetchurl { - url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "4014a1e8755d2d32cc1573b731a4a53acdf6dfca3e26ee437f63fe768501d336"; + "1.24.3-aarch64-linux" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; + sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh"; }; - "2.0.0-i686-linux" = fetchurl { - url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "3164a9de70bf11ab5b20af0d51c8b3303f2dce584604dce33bea0040bdc0bbba"; + "2.7.1-x86_64-linux" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; + sha256 = "1zjd9hxxg1dsyzkzgqjvl933kprf8h143z5qi4mj1iczxv7zp27a"; }; - "2.0.0-dev.26.0-x86_64-linux" = fetchurl { - url = "${dev}/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "18360489a7914d5df09b34934393e16c7627ba673c1e9ab5cfd11cd1d58fd7df"; + "2.7.1-i686-linux" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; + sha256 = "0cggr1jbhzahmazlhba0vw2chz9zxd98jgk6zxvxdnw5hvkx8si1"; }; - "2.0.0-dev.26.0-i686-linux" = fetchurl { - url = "${dev}/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "83ba8b64c76f48d8de4e0eb887e49b7960053f570d27e7ea438cc0bac789955e"; + "2.7.1-aarch64-linux" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; + sha256 = "0m4qlc3zy87habr61npykvpclggn5k4hadl59v2b0ymvxa4h5zfh"; + }; + "2.8.0-dev.10.0-x86_64-linux" = fetchurl { + url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; + sha256 = "17x0q94zampm99dd2sn6q1644lfwcl0ig2rdlmfzd9i4llj2ddbl"; + }; + "2.8.0-dev.10.0-i686-linux" = fetchurl { + url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; + sha256 = "0hmkg4jrffzh8x2mxn8nbf7dl7k0v2vacbmxgpsl382vw9wwj96j"; + }; + "2.8.0-dev.10.0-aarch64-linux" = fetchurl { + url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; + sha256 = "185ipcmr9h76g44kzlj5pyj99cljlap82rhd1c2larfklyj5ryvv"; }; }; in +with stdenv.lib; + stdenv.mkDerivation { pname = "dart"; @@ -65,19 +74,20 @@ stdenv.mkDerivation { $out/bin/dart ''; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; + libPath = makeLibraryPath [ stdenv.cc.cc ]; dontStrip = true; meta = { - platforms = [ "i686-linux" "x86_64-linux" ]; homepage = https://www.dartlang.org/; + maintainers = with maintainers; [ grburst ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' Dart is a class-based, single inheritance, object-oriented language with C-style syntax. It offers compilation to JavaScript, interfaces, mixins, abstract classes, reified generics, and optional typing. ''; - license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index be7aa5fc09d..98a98c0dd34 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -56,7 +56,7 @@ name ? "${attrs.pname}-${attrs.version}" # Appended to the generated luarocks config , extraConfig ? "" # Inserted into the generated luarocks config in the "variables" table -, extraVariables ? "" +, extraVariables ? {} # The two above arguments have access to builder variables -- e.g. to $out # relative to srcRoot, path to the rockspec to use when using rocks @@ -77,7 +77,10 @@ let # luarocks only looks for rockspecs in the default/system tree instead of all # configured trees) luarocks_config = "luarocks-config.lua"; - luarocks_content = '' + luarocks_content = let + extraVariablesStr = lib.concatStringsSep "\n " + (lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables); + in '' local_cache = "" -- To prevent collisions when creating environments, we install the rock -- files into per-package subdirectories @@ -105,8 +108,8 @@ let -- Some needed machinery to handle multiple-output external dependencies, -- as per https://github.com/luarocks/luarocks/issues/766 ${lib.optionalString (lib.length depVariables > 0) '' - ${lib.concatStringsSep "\n " depVariables}''} - ${extraVariables} + ${lib.concatStringsSep "\n " depVariables}''} + ${extraVariablesStr} } ${extraConfig} ''; @@ -139,7 +142,7 @@ let externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; in toLuaModule ( lua.stdenv.mkDerivation ( -builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // { +builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariables"] // { name = namePrefix + name; @@ -199,8 +202,6 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // { LUAROCKS="$LUAROCKS --verbose" fi - patchShebangs . - runHook postBuild ''; @@ -229,6 +230,13 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // { runHook postInstall ''; + + checkPhase = attrs.checkPhase or '' + runHook preCheck + $LUAROCKS test + runHook postCheck + ''; + passthru = { inherit lua; # The lua interpreter inherit externalDeps; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 1f832efee89..ca8d2b2b0da 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.01"; + version = "2020.02"; src = fetchurl { url = "https://github.com/rakudo/rakudo/releases/download/${version}/rakudo-${version}.tar.gz"; - sha256 = "1c63ns90zy13gyj0l27k63q7dv08w4589w605nywd7pplbygq0if"; + sha256 = "0yhld3ij4mfa42chkfph7lzcl5q9b613hdjmw9rv46appmxvvmrs"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 48430ef548b..3c5c5f2a2f2 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.01.1"; + version = "2020.02"; src = fetchurl { - url = "https://github.com/MoarVM/MoarVM/releases/download/${version}/MoarVM-${version}.tar.gz"; - sha256 = "11rmlps6r3nqa9m2yyv9i2imahirsqmxbfay71f3gs4ql121xdnw"; - }; + url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; + sha256 = "1kz97yy357lax7xdz4mnnwswn7axhp14nq0dw3n6xbcpap6m82aw"; + }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; doCheck = false; # MoarVM does not come with its own test suite @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; - homepage = "https://github.com/MoarVM/MoarVM"; + homepage = "https://www.moarvm.org/"; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 5a93a7f9dad..84a214201a0 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.01"; + version = "2020.02"; src = fetchurl { url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0nwn6a9i9akw1zmywhkn631gqy8l4dvy50d6id63zir28ccrrk2c"; + sha256 = "0ik3fscywxjx1qxlbjf68msz83alpckzw3myj9jmkalvy8q5v0nk"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 5c3597cf289..9a8c11324a2 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "064nbl2hz55mpxdcy9zi39s2z6bad3bj73xsna966a7hzkls0a70"; + sha256 = "1fscv8fbaa5l8dcwclmq3hvg3c59l4dvyjqb316mgnc5anxpzy2f"; }; buildInputs = [ rakudo makeWrapper ]; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 87684a4bbe4..50de0c88a5b 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,24 +1,24 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost -, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl -, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost +, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl +, python, rapidjson, snappy, thrift, which, zlib, zstd , enableShared ? true }: let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "a277dc4e55ded3e3ea27dab1e4faf98c112442df"; - sha256 = "1yh5a8l4ship36hwmgmp2kl72s5ac9r8ly1qcs650xv2g9q7yhnq"; + rev = "46c9e977f58f6c5ef1b81f782f3746b3656e5a8c"; + sha256 = "1z2s6zh58nf484s0yraw7b1aqgx66dn2wzp1bzv9ndq03msklwly"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1jbghpppabsix2rkxbnh41inj9lcxfz4q94p96xzxshh4g3mhb4s"; + sha256 = "1xdp1yni9i1cpml326s78qql1g832m800h7zjlqmk89983g94696"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -35,6 +35,14 @@ in stdenv.mkDerivation rec { patches = [ # patch to fix python-test ./darwin.patch + # Adjust CMake target names to make -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON work. + # Remove this when updating to the next version. + (fetchpatch { + name = "arrow-use-upstream-cmake-target-names.patch"; + url = "https://github.com/apache/arrow/commit/396861b38d2f4e805db7c2ecd2c96fff0ca2678b.patch"; + sha256 = "0ki7nx858374anvwyi4szz5hgnnzv4fghdd05c38bzry9rfljgb1"; + stripLen = 1; + }) ] ++ lib.optionals (!enableShared) [ # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic. ./jemalloc-disable-shared.patch @@ -48,7 +56,6 @@ in stdenv.mkDerivation rec { buildInputs = [ boost brotli - double-conversion flatbuffers gflags glog @@ -57,7 +64,6 @@ in stdenv.mkDerivation rec { rapidjson snappy thrift - uriparser zlib zstd python.pkgs.python @@ -71,29 +77,41 @@ in stdenv.mkDerivation rec { ''; cmakeFlags = [ + "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" "-DARROW_BUILD_TESTS=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" - "-DARROW_PARQUET=ON" "-DARROW_PLASMA=ON" # Disable Python for static mode because openblas is currently broken there. "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" - "-Duriparser_SOURCE=SYSTEM" + "-DARROW_USE_GLOG=ON" + "-DARROW_WITH_BROTLI=ON" + "-DARROW_WITH_LZ4=ON" + "-DARROW_WITH_SNAPPY=ON" + "-DARROW_WITH_ZLIB=ON" + "-DARROW_WITH_ZSTD=ON" + # Parquet options: + "-DARROW_PARQUET=ON" + "-DPARQUET_BUILD_EXECUTABLES=ON" + "-DTHRIFT_COMPILER=${thrift}/bin/thrift" + "-DTHRIFT_VERSION=${thrift.version}" ] ++ lib.optionals (!enableShared) [ "-DARROW_BUILD_SHARED=OFF" + "-DARROW_BOOST_USE_SHARED=OFF" + "-DARROW_GFLAGS_USE_SHARED=OFF" + "-DARROW_PROTOBUF_USE_SHARED=OFF" "-DARROW_TEST_LINKAGE=static" "-DOPENSSL_USE_STATIC_LIBS=ON" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests + "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; doInstallCheck = true; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; installCheckInputs = [ perl which ]; - installCheckPhase = (lib.optionalString stdenv.isDarwin '' - for f in release/*test{,s}; do - install_name_tool -add_rpath "$out"/lib "$f" - done - '') - + (let + installCheckPhase = + let excludedTests = lib.optionals stdenv.isDarwin [ # Some plasma tests need to be patched to use a shorter AF_UNIX socket # path on Darwin. See https://github.com/NixOS/nix/pull/1085 @@ -103,7 +121,7 @@ in stdenv.mkDerivation rec { in '' ctest -L unittest -V \ --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' - ''); + ''; meta = { description = "A cross-language development platform for in-memory data"; diff --git a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch b/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch index 0f7955724e1..564f6727388 100644 --- a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch +++ b/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch @@ -1,11 +1,11 @@ diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -1428,6 +1428,7 @@ if(ARROW_JEMALLOC) - "--with-jemalloc-prefix=je_arrow_" - "--with-private-namespace=je_arrow_private_" - "--without-export" -+ "--disable-shared" - # Don't override operator new() - "--disable-cxx" "--disable-libdl" - # See https://github.com/jemalloc/jemalloc/issues/1237 +@@ -1317,6 +1317,7 @@ if(ARROW_JEMALLOC) + "--with-jemalloc-prefix=je_arrow_" + "--with-private-namespace=je_arrow_private_" + "--without-export" ++ "--disable-shared" + # Don't override operator new() + "--disable-cxx" "--disable-libdl" + # See https://github.com/jemalloc/jemalloc/issues/1237 diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix index 73a6ff77522..23824e35001 100644 --- a/pkgs/development/libraries/dnnl/default.nix +++ b/pkgs/development/libraries/dnnl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dnnl"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "intel"; repo = "mkl-dnn"; rev = "v${version}"; - sha256 = "17xpdwqjfb2bq586gnk3hq94r06jd8pk6qfs703qqd7155fkbil9"; + sha256 = "17bydid5v43lgwvgxv25i67iiyirmwgbdzvv9wpjig34ryhx8hvf"; }; # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631 diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 63657cfc5e6..d9028ddfbb5 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -7,7 +7,8 @@ with stdenv.lib; let - common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { + common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: + stdenv.mkDerivation rec { pname = "openssl"; inherit version; @@ -130,7 +131,7 @@ let license = licenses.openssl; platforms = platforms.all; maintainers = [ maintainers.peti ]; - }; + } // extraMeta; }; in { @@ -145,6 +146,7 @@ in { then ./1.0.2/use-etc-ssl-certs-darwin.patch else ./1.0.2/use-etc-ssl-certs.patch) ]; + extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ]; }; openssl_1_1 = common { diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 6acbb66e15c..4c0b16c140b 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o + ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 971ab485221..ef50bf31a36 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -30,12 +30,12 @@ let meta = with stdenv.lib; { description = "Search engine library"; - homepage = https://xapian.org/; + homepage = "https://xapian.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }; in { - xapian_1_4 = generic "1.4.14" "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp"; + xapian_1_4 = generic "1.4.15" "1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i"; } diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch index cce96a2762b..d763a2a2b43 100644 --- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch +++ b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch @@ -6,9 +6,9 @@ diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc // test for keepalives DEFINE_TESTCASE(keepalive1, remote) { + SKIP_TEST("Fails in darwin nix build environment"); - XFAIL_FOR_BACKEND("multi_glass_remoteprog_glass", - "Multi remote databases are currently buggy"); + Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); + /* Test that keep-alives work */ diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc --- xapian-core.old/tests/api_scalability.cc +++ xapian-core.new/tests/api_scalability.cc diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index fd99a70de3a..cb429e59c92 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -153,11 +153,11 @@ with super; }); luadbi-mysql = super.luadbi-mysql.override({ - extraVariables = '' - -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql'; - MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql'; - ''; + extraVariables = { + # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' + MYSQL_INCDIR="${pkgs.libmysqlclient}/include/mysql"; + MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql"; + }; buildInputs = [ pkgs.mysql.client pkgs.libmysqlclient diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 5ebc8b231f2..4b632458c6a 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -12,10 +12,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.0.beta.3) + cocoapods (1.9.0) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.0.beta.3) + cocoapods-core (= 1.9.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,7 +31,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.0.beta.3) + cocoapods-core (1.9.0) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -50,7 +50,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 958f36192f9..93478fa1fda 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.1) + CFPropertyList (3.0.2) activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) @@ -12,10 +12,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.4) + cocoapods (1.9.0) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.4) + cocoapods-core (= 1.9.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -30,15 +30,17 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.4) + xcodeproj (>= 1.14.0, < 2.0) + cocoapods-core (1.9.0) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) + netrc (~> 0.11) + typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.2.2) + cocoapods-downloader (1.3.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) @@ -48,25 +50,30 @@ GEM netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) escape (0.0.4) + ethon (0.12.0) + ffi (>= 1.3.0) + ffi (1.12.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - json (2.2.0) - minitest (5.12.2) + json (2.3.0) + minitest (5.14.0) molinillo (0.6.6) nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) ruby-macho (1.4.0) thread_safe (0.3.6) - tzinfo (1.2.5) + typhoeus (1.3.1) + ethon (>= 0.9.0) + tzinfo (1.2.6) thread_safe (~> 0.1) - xcodeproj (1.13.0) + xcodeproj (1.15.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -80,4 +87,4 @@ DEPENDENCIES cocoapods! BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index a5760106862..fb70f8aa6c9 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dd2a4m7axnqk2rj8piwprqrg91dp8gmyj2rala4viawfq0mj5mf"; + sha256 = "1qywwpwdzspybi0772yscyiffq6bgqvzcppi2gjl6w4chxbmnphx"; type = "gem"; }; - version = "1.9.0.beta.3"; + version = "1.9.0"; }; cocoapods-core = { dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pf54634zi03vbi2m7n1g6kj0k2azgk2pahh9p2mqx814wka99nr"; + sha256 = "0wpjkps6q7lmd3cxhrcl9v3p5bk7y7bcjgnjw4ylbwirsl60bq95"; type = "gem"; }; - version = "1.9.0.beta.3"; + version = "1.9.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -160,10 +160,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; escape = { groups = ["default"]; diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 2f268a60c94..26c19830020 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -34,10 +34,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8"; + sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; claide = { groups = ["default"]; @@ -55,21 +55,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "007ssx75588ji2d8l8s6c95dng1c7b6yacng8nngpy7maijzjgzc"; + sha256 = "1qywwpwdzspybi0772yscyiffq6bgqvzcppi2gjl6w4chxbmnphx"; type = "gem"; }; - version = "1.8.4"; + version = "1.9.0"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zcisqb404828n5d3lbk9y2yyx8v2yr6rk1l8y9a4i1hp743fiad"; + sha256 = "0wpjkps6q7lmd3cxhrcl9v3p5bk7y7bcjgnjw4ylbwirsl60bq95"; type = "gem"; }; - version = "1.8.4"; + version = "1.9.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -86,10 +86,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3"; + sha256 = "08vn0pgcyn6w6fq5xjd7szv2h9s5rzl17kyidnd7fl5qdmzc9c54"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -150,10 +150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; escape = { source = { @@ -163,6 +163,27 @@ }; version = "0.0.4"; }; + ethon = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + type = "gem"; + }; + version = "0.12.0"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + type = "gem"; + }; + version = "1.12.2"; + }; fourflusher = { groups = ["default"]; platforms = []; @@ -213,20 +234,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zjm24aiz42i9n37mcw8lydd7n0y7wfk27by06jx77ypcld3qvkw"; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; type = "gem"; }; - version = "5.12.2"; + version = "5.14.0"; }; molinillo = { source = { @@ -278,14 +299,27 @@ }; version = "0.3.6"; }; - tzinfo = { - dependencies = ["thread_safe"]; + typhoeus = { + dependencies = ["ethon"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; type = "gem"; }; - version = "1.2.5"; + version = "1.3.1"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + type = "gem"; + }; + version = "1.2.6"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; @@ -293,9 +327,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c69yrhqd92q6nnpyhvnqyw9l7axnc91gnbd2gai8f5njdisd8wx"; + sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.0"; }; } \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix index 4f97594fb7c..de54c24b774 100644 --- a/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/pkgs/development/ocaml-modules/biocaml/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "biocaml"; - version = "0.10.0"; + version = "0.10.1"; owner = "biocaml"; @@ -14,7 +14,7 @@ buildDunePackage rec { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "0dghqx6jbzihmga8jjwwavs0wqksgcns4z1nmwj0ds9ik3mcra30"; + sha256 = "1f19nc8ld0iv45jjnsvaah3ddj88s2n9wj8mrz726kzg85cfr8xj"; }; buildInputs = [ ppx_jane ppx_sexp_conv ]; @@ -23,7 +23,7 @@ buildDunePackage rec { meta = with stdenv.lib; { description = "Bioinformatics library for Ocaml"; - homepage = "http://${owner}.github.io/${pname}"; + homepage = "http://${pname}.org"; maintainers = [ maintainers.bcdarwin ]; license = licenses.gpl2; }; diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index db6d2b1d440..0ec1949f562 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "cfstream"; - version = "1.3.0"; + version = "1.3.1"; minimumOCamlVersion = "4.04.1"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "biocaml"; repo = pname; rev = version; - sha256 = "1bpzpci0cx6r3sdk183mm603wgzvvj46nlx0lpx44108anxcxbak"; + sha256 = "0qnxfp6y294gjsccx7ksvwn9x5q20hi8sg24rjypzsdkmlphgdnd"; }; patches = [ ./git_commit.patch ]; diff --git a/pkgs/development/ocaml-modules/cfstream/git_commit.patch b/pkgs/development/ocaml-modules/cfstream/git_commit.patch index 5f8d8f5ce31..596cfdc7092 100644 --- a/pkgs/development/ocaml-modules/cfstream/git_commit.patch +++ b/pkgs/development/ocaml-modules/cfstream/git_commit.patch @@ -1,13 +1,13 @@ -diff --git a/lib/jbuild b/lib/jbuild -index fcc5a39..d72d50c 100644 ---- a/lib/jbuild -+++ b/lib/jbuild -@@ -10,7 +10,7 @@ - (rule ( - (targets (GIT_COMMIT)) - (deps (../bin/git_commit.sh)) -- (action (with-stdout-to ${@} (run ${<}))) -+ (action (with-stdout-to ${@} (run echo "None"))) - )) +diff --git a/lib/dune b/lib/dune +index 2266b87..344c704 100644 +--- a/lib/dune ++++ b/lib/dune +@@ -8,7 +8,7 @@ + (rule + (targets GIT_COMMIT) + (deps (:x ../bin/git_commit.sh)) +- (action (with-stdout-to %{targets} (run %{x}))) ++ (action (with-stdout-to %{targets} (run echo None))) + ) - (rule ( + (rule diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index c7586ad23e4..91ccbc9ca9e 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -8,11 +8,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-javalib-${version}"; - version = "3.1.1"; + version = "3.2.1"; src = fetchzip { url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz"; - sha256 = "1myrf7kw7pi04pmp0bi4747nj4h4vfxlla05sz2hp4w8k76iscld"; + sha256 = "1fkdaiiza145yv0r1cm0n2hsrr0rbn6b27vs66njgv405zwn3vbn"; }; buildInputs = [ which ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index d0dba6c2cee..c6cda7d0573 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -1,19 +1,24 @@ -{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }: - -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +{ stdenv, fetchFromGitHub, which, perl, ocaml, findlib, javalib }: let pname = "sawja"; - version = "1.5.7"; + version = "1.5.8"; webpage = "http://sawja.inria.fr/"; in + +if !stdenv.lib.versionAtLeast ocaml.version "4.07" +then throw "${pname} is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation { name = "ocaml${ocaml.version}-${pname}-${version}"; - src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/38117/sawja-1.5.7.tar.bz2; - sha256 = "08xv1bq4pragc1g93w4dnbn0mighcjwfp3ixj9jzmhka2vzqm4cc"; + src = fetchFromGitHub { + owner = "javalib-team"; + repo = pname; + rev = "v${version}"; + sha256 = "0rawr0jav33rvagm8sxc0arc7ya1fd9w5nng3lhfk8p02f9z8wrp"; }; buildInputs = [ which perl ocaml findlib ]; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix new file mode 100644 index 00000000000..79a80451d02 --- /dev/null +++ b/pkgs/development/python-modules/breezy/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, configobj +, six +, fastimport +, dulwich +, launchpadlib +, testtools +}: + +buildPythonPackage rec { + pname = "breezy"; + version = "3.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "50f16bc7faf299f98fe58573da55b0664078f94b1a0e7f0ce9e1e6a0d47e68e0"; + }; + + propagatedBuildInputs = [ configobj six fastimport dulwich launchpadlib ]; + + checkInputs = [ testtools ]; + + # There is a conflict with their `lazy_import` and plugin tests + doCheck = false; + + # symlink for bazaar compatibility + postInstall = '' + ln -s "$out/bin/brz" "$out/bin/bzr" + ''; + + pythonImportsCheck = [ "breezy" ]; + + meta = with lib; { + description = "Friendly distributed version control system"; + homepage = "https://www.breezy-vcs.org/"; + license = licenses.gpl2; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix new file mode 100644 index 00000000000..1ded86af3fb --- /dev/null +++ b/pkgs/development/python-modules/ignite/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, mock +, pytorch +, pynvml +, scikitlearn +, tqdm +}: + +buildPythonPackage rec { + pname = "ignite"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = pname; + rev = "v${version}"; + sha256 = "15k6dd11yxn4923llcpmw4srl1by5ljhh7aw5pnkn4n4qpywh6cm"; + }; + + checkInputs = [ pytest mock ]; + + checkPhase = '' + pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon' tests/ + ''; + # these packages are not currently in nixpkgs + + propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; + + meta = with lib; { + description = "High-level training library for PyTorch"; + homepage = https://pytorch.org/ignite; + license = licenses.bsd3; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix new file mode 100644 index 00000000000..72e3c7f1cf7 --- /dev/null +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, httplib2 +, keyring +, lazr-restfulclient +, lazr-uri +, setuptools +, six +, testresources +, wadllib +}: + +buildPythonPackage rec { + pname = "launchpadlib"; + version = "1.10.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "740580d72611452804ad7735c9af6944ed4a14fc1a2fcbcddba3fc719b5317f3"; + }; + + propagatedBuildInputs = [ + httplib2 + keyring + lazr-restfulclient + lazr-uri + setuptools + six + testresources + wadllib + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + doCheck = isPy3k; + + meta = with lib; { + description = "Script Launchpad through its web services interfaces. Officially supported"; + homepage = "https://help.launchpad.net/API/launchpadlib"; + license = licenses.lgpl3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/lazr-restfulclient/default.nix b/pkgs/development/python-modules/lazr-restfulclient/default.nix new file mode 100644 index 00000000000..93956c51b25 --- /dev/null +++ b/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi +, distro +, httplib2 +, oauthlib +, setuptools +, six +, wadllib +}: + +buildPythonPackage rec { + pname = "lazr.restfulclient"; + version = "0.14.3"; + + disabled = isPy27; # namespace is broken for python2 + + src = fetchPypi { + inherit pname version; + sha256 = "9f28bbb7c00374159376bd4ce36b4dacde7c6b86a0af625aa5e3ae214651a690"; + }; + + propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ]; + + doCheck = false; # requires to package lazr.restful, lazr.authentication, and wsgi_intercept + + pythonImportsCheck = [ "lazr.restfulclient" ]; + + meta = with lib; { + description = "A programmable client library that takes advantage of the commonalities among"; + homepage = "https://launchpad.net/lazr.restfulclient"; + license = licenses.lgpl3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/lazr-uri/default.nix b/pkgs/development/python-modules/lazr-uri/default.nix new file mode 100644 index 00000000000..d6b3cc29324 --- /dev/null +++ b/pkgs/development/python-modules/lazr-uri/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "lazr.uri"; + version = "1.0.3"; + + disabled = isPy27; # namespace is broken for python2 + + src = fetchPypi { + inherit pname version; + sha256 = "5c620b5993c8c6a73084176bfc51de64972b8373620476ed841931a49752dc8b"; + }; + + propagatedBuildInputs = [ setuptools ]; + + meta = with lib; { + description = "A self-contained, easily reusable library for parsing, manipulating"; + homepage = "https://launchpad.net/lazr.uri"; + license = licenses.lgpl3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix new file mode 100644 index 00000000000..b61c3d92bc9 --- /dev/null +++ b/pkgs/development/python-modules/nitime/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, python +, fetchPypi +, pytest +, cython +, numpy +, scipy +, matplotlib +, networkx +, nibabel +}: + +buildPythonPackage rec { + pname = "nitime"; + version = "0.8.1"; + disabled = python.pythonVersion != "3.7"; # gcc error when running Cython with Python 3.8 + + src = fetchPypi { + inherit pname version; + sha256 = "0hb3x5196z2zaawb8s7lhja0vd3n983ncaynqfl9qg315x9ax7i6"; + }; + + checkInputs = [ pytest ]; + buildInputs = [ cython ]; + propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; + + checkPhase = "pytest nitime/tests"; + + meta = with lib; { + homepage = https://nipy.org/nitime; + description = "Algorithms and containers for time-series analysis in time and spectral domains"; + license = licenses.bsd3; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 5590337951b..ab05f49ac38 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -13,7 +13,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ hypothesis pandas pytest ]; + checkInputs = [ hypothesis pandas pytest pytest-lazy-fixture ]; PYARROW_BUILD_TYPE = "release"; PYARROW_WITH_PARQUET = true; diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix new file mode 100644 index 00000000000..c64d723ec32 --- /dev/null +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cudatoolkit +}: + +buildPythonPackage rec { + pname = "pynvml"; + version = "8.0.4"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pfykj1amqh1rixp90rg85v1nj6qmx89fahqr6ii4zlcckffmm68"; + }; + + propagatedBuildInputs = [ cudatoolkit ]; + + doCheck = false; # no tests in PyPi dist + pythonImportsCheck = [ "pynvml" "pynvml.smi" ]; + + meta = with lib; { + description = "Python bindings for the NVIDIA Management Library"; + homepage = https://www.nvidia.com; + license = licenses.bsd3; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix new file mode 100644 index 00000000000..2b9c57b99d8 --- /dev/null +++ b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-lazy-fixture"; + version = "0.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b0hmnsxw4s2wf9pks8dg6dfy5cx3zcbzs8517lfccxsfizhqz8f"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Helps to use fixtures in pytest.mark.parametrize"; + homepage = "https://github.com/pytest-dev/pytest-repeat"; + license = licenses.mit; + maintainers = with maintainers; [ tobim ]; + }; +} diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix new file mode 100644 index 00000000000..87555fe774b --- /dev/null +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, setuptools +, lazr-uri +}: + +buildPythonPackage rec { + pname = "wadllib"; + version = "1.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1234cfe81e2cf223e56816f86df3aa18801d1770261865d93337b8b603be366e"; + }; + + propagatedBuildInputs = [ setuptools lazr-uri ]; + + doCheck = isPy3k; + + meta = with lib; { + description = "Navigate HTTP resources using WADL files as guides"; + homepage = "https://launchpad.net/wadllib"; + license = licenses.lgpl3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 696a0264767..23c0fc06b6a 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -13,10 +13,7 @@ buildRustPackage rec { sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1i1aq7bwkx8sqrlpxq24ldh908j72lwi2r3sg9zaz5p8xq1xgq6p"; + cargoSha256 = "1s7g9mcjyp0pjjxma1mb290fi7fk54qy2khh1zksxhr4d3mciv08"; meta = { description = "Generate changelogs from local git metadata"; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 1eb8bf75cdf..6c339bf31b5 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -2,15 +2,15 @@ , directory, hpack, hspec, hspec-discover, hspec-expectations , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl , optparse-applicative, parser-combinators, retry, stdenv, text -, unix, unordered-containers, utf8-string, fetchzip +, unix, unordered-containers, utf8-string, fetchzip, dotenv }: mkDerivation rec { pname = "vaultenv"; - version = "0.8.0"; + version = "0.13.0"; src = fetchzip { url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz"; - sha256 = "04hrwyy7gsybdwljrks4ym3pshqk1i43f8wpirjx7b0dfjgsd2l5"; + sha256 = "0kz5p57fq855mhbqrpb737sqrax9cdcyh2g57460hc8fyvs97lq0"; }; buildTools = [ hpack ]; @@ -21,6 +21,7 @@ mkDerivation rec { async base bytestring connection containers http-client http-conduit lens lens-aeson megaparsec mtl optparse-applicative parser-combinators retry text unix unordered-containers utf8-string + dotenv ]; testHaskellDepends = [ async base bytestring connection containers directory hspec @@ -32,7 +33,5 @@ mkDerivation rec { homepage = "https://github.com/channable/vaultenv#readme"; description = "Runs processes with secrets from HashiCorp Vault"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ lnl7 ]; - hydraPlatforms = []; - broken = true; # does not compile any longer + maintainers = with stdenv.lib.maintainers; [ lnl7 manveru ]; } diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 98c400d5285..c59847b1e0f 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -3,18 +3,15 @@ # IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix -let - version = "1.5.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "stlink"; - inherit version; + version = "1.6.0"; src = fetchFromGitHub { owner = "texane"; repo = "stlink"; - rev = "v1.5.1"; - sha256 = "1d5gxiqpsm8fc105cxlp27af9fk339fap5h6nay21x5a7n61jgyc"; + rev = "v${version}"; + sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; }; buildInputs = [ cmake libusb1 ]; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index eac81aa7f17..7befc0fef2d 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -8,12 +8,13 @@ stdenv.mkDerivation { pname = "ycmd"; - version = "2019-09-19"; + version = "2020-02-22"; + disabled = !python.isPy3k; src = fetchgit { url = "https://github.com/Valloric/ycmd.git"; - rev = "c6d360775b0c5c82e2513dce7b625f8bf3812702"; - sha256 = "19rxlval20gg65xc5p7q9cnzfm9zw2j0m6vxxk0vqlalcyh0rnzd"; + rev = "9a6b86e3a156066335b678c328f226229746bae5"; + sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index cd14accb741..dd5a492de6a 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -99,22 +99,22 @@ dependencies = [ [[package]] name = "cargo-make" -version = "0.27.0" +version = "0.28.0" dependencies = [ "ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscriptsdk 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -235,18 +235,22 @@ dependencies = [ [[package]] name = "duckscript" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "duckscriptsdk" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -363,6 +367,15 @@ name = "fs_extra" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "fsio" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "getrandom" version = "0.1.14" @@ -956,8 +969,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" -"checksum duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "747bb4e541a0830b4581bffc001045d3dc259683546fbf35a35f47af831634b5" -"checksum duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c03843d05bb809ea1ee653c4f9ba9a5ee766c07490cc684cf6b259b68ba94" +"checksum duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0f699115ffc264c2d6ed8eed098b48d7d08122ba8d59d44f93170c5d33972c7" +"checksum duckscriptsdk 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dad6bba01030a40c5c26a1393926220d046319c00352520b83e02bedf324c805" "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" @@ -972,6 +985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" +"checksum fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2131cb03096f67334dfba2f0bc46afc5564b08a919d042c6e217e2665741fc54" "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" "checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index a622a822cfa..35dba114982 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.27.0"; + version = "0.28.0"; src = let @@ -10,10 +10,10 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "197r7rlgk8csvq612gz4431vvrvyxhcmfswarsdczp4b94pzaa6h"; + sha256 = "1sf4hjsylk68d3wb7bs8gfkz5az41hjs7hvb8mbhyc7nryklkq4d"; }; in - runCommand "cargo-make-src" {} '' + runCommand "source" {} '' cp -R ${source} $out chmod +w $out cp ${./Cargo.lock} $out/Cargo.lock @@ -24,10 +24,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + legacyCargoFetcher = false; - cargoSha256 = "02bx8nz8kkr0l8m1b8nfc9576qx9is6s72x4ji3bzwimy76jvx3j"; + cargoSha256 = "1x0lb68d47nhggnj7jf90adz7shb0cg305mavgqvxizd2s9789dx"; # Some tests fail because they need network access. # However, Travis ensures a proper build. @@ -39,7 +38,7 @@ rustPlatform.buildRustPackage rec { description = "A Rust task runner and build tool"; homepage = "https://github.com/sagiegurari/cargo-make"; license = licenses.asl20; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd ma27 ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3c5e76e2a4a..4181ddbdd9d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-02-22"; + version = "2020-02-25"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "8012809c3f30a767db8395c5b8e3651cdb995635"; - sha256 = "1g3zws7zi18plvwd6m7wrvj83siczsnwx0yr892v1m0gh7x2452y"; + rev = "634c81fd465269f59e3db878fe8405828e6d2da9"; + sha256 = "1lcqyj0yjdhm2kdk0p6pr8avjnb7gm4hg0dygm6fpjz3f078n9py"; }; }; @@ -160,12 +160,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-02-23"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "fc222a81de4734eeccd89e81d66319d4a2e8fee7"; - sha256 = "08wk7i2p62zghvk7q22z6ac6qidpd58r1pkx5lbxg6l9zv7sb8j3"; + rev = "b8bdaca805a059eed03a4f439578d373798c6d74"; + sha256 = "1gmip6fggm5scbry9r1ggaq2fiy5xhwsj6ql24fa5jylyf1gfm26"; }; }; @@ -347,12 +347,12 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-02-19"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "b0b6d913f2faaf02a79542c41cfa4db0c1d9b373"; - sha256 = "0xg90a2h6g97m3wiakniqk60kdzi4ijgyc1p0bk1cxbj7gxvc7yg"; + rev = "fc720742d1f7fed7a0737ee92235d743f2a86a12"; + sha256 = "0qx3wsdnjnfxi6dg3z9pdcqnj2rhwnprz3ypch6ysyshlbvbs9ag"; }; }; @@ -402,12 +402,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2019-12-17"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "4be4a57ad8f888ef92974ccb6e685358498863f1"; - sha256 = "15175bphaiih5j63bigj5sblcyqjj68g3k81wn7dwgwdpglf1mwf"; + rev = "4c5124b38f1b2a252bf4713cce67a1bb0cf04b5d"; + sha256 = "1ygr4dpbjgy3872fc9kaivgbplkyc9l9wmifxkapp9s9ll11c7l0"; }; }; @@ -446,12 +446,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-02-19"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "973360108311862d6b49711af20671329d22fef5"; - sha256 = "0f1chb6f18bqzcrps1nl871k98i91833lp1d2ql2rpl7kk7bsl72"; + rev = "4dd4685ef44f1a38ea20b373f2a20b82304d68e0"; + sha256 = "1q165kh4k59ikivs9pwp6w9jla6li8hcln5zbpkxhis6sh9g3bn6"; }; }; @@ -854,12 +854,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-02-09"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "17c86251515e18a2791552d88d6142495fa78a69"; - sha256 = "184mwc8iapjzdysc5fsabdm77kyvr2p2a1azsryji7b65h1pzdal"; + rev = "f962b9908f48f823b817b7fd61ce9d706bbb41fd"; + sha256 = "1sv2g6sx9ap71937ky8iysck9q32mracmanc0vnyvffvqy7jwksf"; }; }; @@ -887,12 +887,12 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-02-18"; + version = "2020-02-26"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-git"; - rev = "52b47c249ba67bc089c9fdcbab5628fc1b767651"; - sha256 = "000vv7jka1911b9sb8vbb6y25npqrw95nx6wmcj7vnm9pn64izdb"; + rev = "0c7ffefa872ca19d61ecec6e014a797f0c25e98f"; + sha256 = "11mz76x7pj2p3k3d8ycjvrwdjrabrdcssw5lr529r9dardkqchzl"; }; }; @@ -963,6 +963,17 @@ let }; }; + deoplete-github = buildVimPluginFrom2Nix { + pname = "deoplete-github"; + version = "2018-03-04"; + src = fetchFromGitHub { + owner = "SevereOverfl0w"; + repo = "deoplete-github"; + rev = "8e30256e50b3914a7e57ea4d5976b6a499fb936f"; + sha256 = "11n15nqi417sdcqgb6gkk6z4wrrdd8vdbd7wzqpg41140c73v5gm"; + }; + }; + deoplete-go = buildVimPluginFrom2Nix { pname = "deoplete-go"; version = "2020-01-01"; @@ -975,6 +986,17 @@ let }; }; + deoplete-greek = buildVimPluginFrom2Nix { + pname = "deoplete-greek"; + version = "2019-12-23"; + src = fetchFromGitHub { + owner = "Inazuma110"; + repo = "deoplete-greek"; + rev = "aecf3b2f8acfab20c93a6dc88d55260a0df04cbf"; + sha256 = "086qjbqps05zb2vnyb5q7a67i7al8mxxi86n0h5nsqdd0ws6qqhx"; + }; + }; + deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; version = "2020-02-03"; @@ -1031,6 +1053,17 @@ let }; }; + deoplete-phpactor = buildVimPluginFrom2Nix { + pname = "deoplete-phpactor"; + version = "2019-02-22"; + src = fetchFromGitHub { + owner = "kristijanhusak"; + repo = "deoplete-phpactor"; + rev = "53e239effb8ff20fc0a192206e96d98d4f9001ad"; + sha256 = "14097r9fmyp9zxfgv0fj2s52qd1v5cxdckfg4zph7lg3yri1hx9p"; + }; + }; + deoplete-rust = buildVimPluginFrom2Nix { pname = "deoplete-rust"; version = "2017-07-18"; @@ -1077,12 +1110,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-02-23"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "ebc9c155b0247314609e8d326e030adb3391f243"; - sha256 = "1y51fn2lxal6kf7cls913kl51f67in08xhv2waqngv71bd377bjj"; + rev = "08582f7c52aa53d63f9a7a714fab9137d6ea48f0"; + sha256 = "1bnz9q6rz95w8xw9vhzhfrfr6r8zdgf0ihylvjaa2kzxir7sngm2"; }; }; @@ -1121,12 +1154,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-02-12"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "42d0ac0f41601f5e09bd9d62d6c14a5de99f0964"; - sha256 = "19mydl8r6cqmv2z93p7rww0bxvr7b1y1ag8qml5ajfcsfaz9r1i2"; + rev = "577b7e7d083e37c0c15158cbd761de7cd831e682"; + sha256 = "1cmp80s4k7sslj4vd919wwlinzmy0yghnczwzrwgk9yf0jclk4nv"; }; }; @@ -1189,12 +1222,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2020-02-07"; + version = "2020-02-26"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "b37f45f0a25dbbebe86470e72d735e110e193b4e"; - sha256 = "148s39lm13m825ax48p0lrj2bg0i80lli8x18f3xnaqjad0lb1fk"; + rev = "7128e3a6778347ff7848d9f8a423f63b94e6d9b9"; + sha256 = "0s4sd982z3f8cppcz4hja788jgcm1gsh6qn8lw9535i6bmphn027"; }; }; @@ -1586,12 +1619,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2020-02-03"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "8d24b837547688f19f3184d99e96a430b3c3722e"; - sha256 = "1xbk0d4r02hmxj7y33jjazr0ri5a4bw7v29fl5qll3dgqjbijmjm"; + rev = "686f39ac002ca31acd663ae8749982144484ff95"; + sha256 = "0ll0rnw00kl58a3dpvcx85dmd5j2figg6cc87qld2mn169qcx354"; fetchSubmodules = true; }; }; @@ -2027,12 +2060,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-01-26"; + version = "2020-02-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "0d7f506538a82b594e3527c58f7b2bccd44d9a85"; - sha256 = "0clb394pkxwrh14rbll4ffpx45sqgvmlbrr9bl3q58q7b5qhg54d"; + rev = "aed6074642363d0c97da5cd86e1b23027479df84"; + sha256 = "1smfyghn7sxdqx867145xyjranvrjaa8s9fp1wvyzb3s3jfwh3mk"; }; }; @@ -2225,12 +2258,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-02-23"; + version = "2020-02-25"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "2dc39ef00bedde68aa7fab7023646a5ff8ca9986"; - sha256 = "0l6blvqj2fh942farbwk02gfl2skqr59m6zz1kn4drybvr0sdw8k"; + rev = "1739274e24087565760b35a789a28bc217308ecf"; + sha256 = "08lmpagkxqgn06375bib8z9k3hm7b6q139vbkzc2hxpbg3xd4jfs"; }; }; @@ -2632,12 +2665,12 @@ let seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256-vim"; - version = "2019-12-13"; + version = "2020-02-25"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "b68f4032c49b64065072b449dc0f0f1f30616d8d"; - sha256 = "0bxw0ks5gndzrgixa6xqhnf78b7n75w2jnc3s6bv75lz0fn0gypx"; + rev = "fb0607ff91ac3b2fb2fa226be12bec1ccef4f1e1"; + sha256 = "1d2rsxb8ag42ba0bqj9g7ax56v36vch6x2q768q73plagiwr4jzy"; }; }; @@ -2702,8 +2735,8 @@ let src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "44d2e55286bc04588b35b356e36c56ae15e78ad2"; - sha256 = "1qzlcp46x4pm6dyf2k4n2rrdh27zj7j719gh853gvhdbvjk650yr"; + rev = "c35ee8509a9f690366b7d8c04cded9d9f07d8a86"; + sha256 = "18y7z79469lkcn293zyly306hm7dr1sq9dvnl69nc4a82cdpaha8"; }; }; @@ -3018,12 +3051,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-02-12"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "a6c9d4fd1b23e1480b973e7cee1fe20c79248b75"; - sha256 = "1imqxb04gmqf5v4rd3pb26g5px3sd2pgvb6s0l0bg0qxhg8ksq0p"; + rev = "129d33fc34a72ced857f3cfb72ff10caf10f0020"; + sha256 = "1hf6d4rr2y4msjxqh0pjpdh6237992497wfj8jy0jalnp2j8icbx"; }; }; @@ -3040,12 +3073,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-02-07"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "749a38330c5cfb2557636137a3ab8183004173e6"; - sha256 = "1lzp691a7q9hvc6vg0gl2v871sgryki3yifza7rdfwaxiam4yy0k"; + rev = "582b715562c953ea9a1f043443f98793cfbc0d47"; + sha256 = "1wjmdjn129d8p6nrx69xdrrzg05l930a5lfbrvhyic3aiqn5x1mf"; }; }; @@ -3337,12 +3370,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-02-21"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "0b2683464877c1e39d0c67427c7fdc4bc6697d15"; - sha256 = "010cqvszgfvwci1iw8w0kwjdy4284i16yarfcsq5zcd0786sn8s6"; + rev = "774cd8b08ff1569f86cba78e24ee06e448f86b4f"; + sha256 = "09hhgsbg5nnmzdpz4wclwgjnkxg2l1rvizhmv0wd7g6sshs9i83w"; }; }; @@ -3524,12 +3557,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-01-13"; + version = "2020-02-26"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "af796cf4084a3d32b85313ccc82675d626d40b59"; - sha256 = "0pbwirsh8nx0dgf82w1sy6az6mpwdnxzy0ycqrx6qxs6bbf1kf74"; + rev = "6d69f933f243ed3d7797641bd41c0e65d245c931"; + sha256 = "0vzzyz7v03ihky3vx12rji4l1r6vbxgslvc1fvi4dznfqn5m9gfn"; }; }; @@ -3722,12 +3755,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-01-26"; + version = "2020-02-24"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "5d84cb9ce7fdf7d3fd729a9d3f59060ca5ab3a6e"; - sha256 = "0jsssvh1h4kzs51fcgd1gyrkrx6ldf5z3dcnllc26qz4fki1ds89"; + rev = "0a53fadc22ab6df6aed9cc580c9e498715870522"; + sha256 = "09q5xpc4xbskzxppp66ypzd5mnic5bcwxahmhb259ch9xs8qmrc6"; }; }; @@ -4001,8 +4034,8 @@ let src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "31629d8bd18ddb5db6d9c55585d1eeb325a6bb43"; - sha256 = "1qvhdxha29wj7fw88i72n16m05hd9apfqwf16g6wi6v2nfqfwpnp"; + rev = "c452181975761f8b055b88eb1c98f736323510fd"; + sha256 = "0zx9p9y45h26imrzw9nm5balxw7dmv94ynd7cn8mvml29v0awv2g"; }; }; @@ -4041,12 +4074,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-02-13"; + version = "2020-02-24"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "da2c785221810b3d57479bb4b3678aabf32f3b88"; - sha256 = "1kgyzraz48c4zlpkz4qxlvzqzmh6dy7qwlq7gz8n8pbpr7kahmhb"; + rev = "c337eef1b735906411577f488e977be69506ef08"; + sha256 = "10sz744djns1qn9lh7npzvnmkqbr34zgk78cag6ss45bnczqx1h7"; }; }; @@ -4074,12 +4107,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-02-23"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "dc02b2192ff2f652379f94791b7c7e311c946068"; - sha256 = "1h6hb870zqx7wdk49wpcp7rrd70nvvb4wk311j8439z4f6ibfsdq"; + rev = "1bf0d57e01f930ccc1db3dacb3c169d6dc78d2cb"; + sha256 = "18imfrn948c20y7ymgh1xqsd82939dswj7hkf0b0fnsi0w9ydddk"; }; }; @@ -4548,12 +4581,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2020-02-17"; + version = "2020-02-25"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "1e3238470d833c8622453245694ba107eca46133"; - sha256 = "1agiyycrjkh1ajfpfj4vzl9sd3xpxv68c7jrqkxqq0rfg74rksbc"; + rev = "fc2f789ce7afa4bbdefbbb4599a802b39b7e7596"; + sha256 = "19drgnsn4rb9kv30ykndwjgflsfs328dhm44a9hcp8f8faqpim3d"; }; }; @@ -5252,12 +5285,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2020-02-16"; + version = "2020-02-26"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "80c04d49b8d3c2a182e5cd745c52153de6ae272c"; - sha256 = "12k1xq8xmwb7v7i8yx55mpg7fzin0ag2rvxvz77kdiwwni4vdrii"; + rev = "73449cc1bf3375ce6f92a1018821cdd0ae91959d"; + sha256 = "1wsrgchjxhircgdvwphvswnl7jq5b63l360wnjjlmcff6nvwhm77"; }; }; @@ -5307,12 +5340,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-02-20"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "35067caeca1c17fa5d38d5de031b26610e939cba"; - sha256 = "00y608jfrw72wfvzyl82f8m1qxmb1m3c5micncca8qvyjyya07y7"; + rev = "66975121c7c824cb7c4fa8f2ea53f824e538e3cb"; + sha256 = "0m1pw3iq29jpp439yzkaszjg1jiz5qkd16vfkskmk2kkg84y3kqn"; }; }; @@ -5472,23 +5505,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-02-07"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "c8c9bbd70da65e2c0bcba2947c4061a7c3e24e69"; - sha256 = "0mpzy2y8k5kyz7pvg41pqy88g15mqay8lxhribi288smmbyswsyl"; + rev = "a0046044670c412bcccc44aa80e5642785fb57a2"; + sha256 = "0c1qzc3ds7gvsp2vk7cszy11x57angmjwq1skfsk1zz7vgzhcj2i"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-02-19"; + version = "2020-02-24"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "3ffaea971fe579c028242e79d7823dd8e8dbeebd"; - sha256 = "0f3sn7zkwmdj3adxvclm8yqwkhxlbjzph8jmlr6kyx8xk8axdin8"; + rev = "1dba5d0328b2d632a418dfc7b417ae83455cc342"; + sha256 = "0rm1ckriwajhskyybnq83m027lhki8p7c5cykzl5f05ax9rfiva6"; }; }; @@ -5692,12 +5725,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-02-18"; + version = "2020-02-26"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "7417eaf7349db2c904f1ff85e69b14122a1c07ae"; - sha256 = "14cxpwq0r0c8aq3n6vk5b9rqlazvvjszm9fdlbsrggx52llkpq3z"; + rev = "32fa278c458d8790a2604a71f3ac3d2500112040"; + sha256 = "0v7asrgbqz70jq4avpi72338fcrs81bgapyvar18l43k6vgb867a"; }; }; @@ -5901,12 +5934,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-02-18"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "20f47baff2a981d6d72a8404adfd878c8736e4ee"; - sha256 = "1bw4fh1c9xi1hfa3c3dpk605zkmg1hr4qnxrl02jlpiy631lalq2"; + rev = "63593e05440bde5f1f4dbcd30447f410940f94c3"; + sha256 = "19fxcqbvxx2b60cj03qcaawwi88b7y4wamw9fk278d7q64933h2z"; }; }; @@ -5945,12 +5978,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-02-19"; + version = "2020-02-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "73ce1d884987910f3c219a99cf659ae4146e6bf4"; - sha256 = "0815pjnzf3pgvf45y801bzigjq79dscl7xdcs3p7qj4b8afazygg"; + rev = "6c8173a10633541fe99d54cc693874806e08858c"; + sha256 = "08p4xkrgzfb9b3r738lnsp4hrly9p5bbzcv446qcflbxmbmy3fw4"; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index af06e12ab6b..7f271aa0adc 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -136,6 +136,7 @@ hsitz/VimOrganizer ianks/vim-tsx icymind/NeoSolarized idris-hackers/idris-vim +Inazuma110/deoplete-greek inkarkat/vim-SyntaxRange int3/vim-extradite itchyny/calendar.vim @@ -204,6 +205,7 @@ kien/rainbow_parentheses.vim konfekt/fastfold kristijanhusak/defx-git kristijanhusak/defx-icons +kristijanhusak/deoplete-phpactor kristijanhusak/vim-hybrid-material kshenoy/vim-signature lambdalisue/vim-gista @@ -398,6 +400,7 @@ scrooloose/nerdcommenter scrooloose/nerdtree scrooloose/syntastic sebastianmarkow/deoplete-rust +SevereOverfl0w/deoplete-github sheerun/vim-polyglot Shougo/context_filetype.vim Shougo/defx.nvim diff --git a/pkgs/os-specific/linux/metastore/default.nix b/pkgs/os-specific/linux/metastore/default.nix new file mode 100644 index 00000000000..590b931ac92 --- /dev/null +++ b/pkgs/os-specific/linux/metastore/default.nix @@ -0,0 +1,24 @@ +{ stdenv, libbsd, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "1.1.2"; + pname = "metastore"; + + src = fetchFromGitHub { + owner = "przemoc"; + repo = "metastore"; + rev = "v${version}"; + sha256 = "0mb10wfckswqgi0bq25ncgabnd3iwj7s7hhg3wpcyfgckdynwizv"; + }; + + buildInputs = [ libbsd ]; + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Store and restore metadata from a filesystem"; + homepage = "https://software.przemoc.net/#metastore"; + license = licenses.gpl2; + maintainers = with maintainers; [ sstef ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix index c333b94f40e..e9e0e82a093 100644 --- a/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zenmonitor"; - version = "1.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ocerman"; repo = "zenmonitor"; rev = "v${version}"; - sha256 = "16p2njrgik8zfkidm64v4qy53qlsqqxxgr9m3n84pr9l3pk25dwk"; + sha256 = "1mn496iqfmhqsac7a5r0bdfddzrfiz6l34qiga0pip925g7hsm52"; }; buildInputs = [ gtk3 ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Monitoring software for AMD Zen-based CPUs"; - homepage = https://github.com/ocerman/zenmonitor; + homepage = "https://github.com/ocerman/zenmonitor"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ alexbakker ]; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 6241380ea0c..5c29d8b4780 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -1,31 +1,49 @@ -{ stdenv, fetchurl, pkgconfig, - version ? "2.2.11", - mainSrc ? fetchurl { - url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz"; - sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6"; - } +{ stdenv, fetchurl, pkg-config, expat, libmysqlclient, + enableXmlpipe2 ? false, + enableMysql ? true }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "sphinxsearch"; - inherit version; - src = mainSrc; + version = "2.2.11"; + + src = fetchurl { + url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz"; + sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6"; + }; + + enableParallelBuilding = true; configureFlags = [ "--program-prefix=sphinxsearch-" - "--without-mysql" "--enable-id64" + ] ++ stdenv.lib.optionals (!enableMysql) [ + "--without-mysql" ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; + buildInputs = stdenv.lib.optionals enableMysql [ + libmysqlclient + ] ++ stdenv.lib.optionals enableXmlpipe2 [ + expat + ]; + + CXXFLAGS = with stdenv.lib; concatStringsSep " " (optionals stdenv.isDarwin [ + # see upstream bug: http://sphinxsearch.com/bugs/view.php?id=2578 + # workaround for "error: invalid suffix on literal + "-Wno-reserved-user-defined-literal" + # workaround for "error: non-constant-expression cannot be narrowed from type 'long' to 'int'" + "-Wno-c++11-narrowing" + ]); + meta = { description = "An open source full text search server"; homepage = http://sphinxsearch.com; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ ederoyd46 ]; + maintainers = with stdenv.lib.maintainers; [ ederoyd46 valodim ]; }; } diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index d50a7c006c8..f2fadd71427 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation { - version = "2016-09-30"; + version = "2019-05-09"; pname = "xcwd"; src = fetchFromGitHub { owner = "schischi"; repo = "xcwd"; - rev = "3f0728b932904985b703b33bd5c936ea96cf15a0"; - sha256 = "0lwfz6qg7fkiq86skp51vpav33yik22ps4dvr48asv3570skhlf9"; + rev = "99738e1176acf3f39c2e709236c3fd87b806f2ed"; + sha256 = "1wvhj5x8ysi1q73f9cw1f6znvp2zivd8pp6z1p3znw732h4zlv6v"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 1998ac67713..7326e2427d0 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1cx026g1gdvk4qmnrbsmg46y2lizx0wqny25hhdjnh9pwzjc77mh"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1213mg7xhv9ymgm0xqdai5wgammz9n07whw2d42m83208k94zss3"; + cargoSha256 = "17wgsj2fcxhpsib3ps20sninbf236f9ihf4lnnfrawknmqfvq4s9"; # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index f5dba34202e..aa9fbf55d86 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "tJnF1X+NI1hP0J/n3rGy8TD/yIveqRPVlJvJvn0C7Do="; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "TL2WehcCwygLMVVrBHOX1HgVtDhgVsIgUeiadEjCj1o="; + cargoSha256 = "0sbhij8qh9n05nzhp47dm46hbc59awar515f9nhd3wvahwz53zam"; meta = with lib; { description = "Minimal X screenshot utility"; diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index e3cb3334b58..350fdefba5c 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0kzrklw5nrzgvrfzq1mlnri06s19p4f3w38v39247baz2xd6j1n2"; + cargoSha256 = "1xhwlsq9b6cnafbapm5jf48zqdx5k2vxlr701lh5f8nqvd7nxi6g"; meta = with stdenv.lib; { description = "A tool for tidying and optimizing SVGs"; diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 560dbecd4bf..3153c843025 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clipman"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "0b27rgyjwvdm9qjq824imda3yjbxxcwwyv8rzzk95ggvyayxw8an"; + sha256 = "0d5w94cylrzhwyb4zfgidh6rr1h82dx5y7cxfa37wx5xxcjyyja1"; }; - modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv"; + modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 3e5f12da0c3..0b56b03b9de 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,19 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.1.11"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "08zgi2yiynb20l1f9rhly4a7zgqnr7lq3cr5vkmh1jnfs6z27dv6"; + sha256 = "15pmmjnzjbjlf7np5zf2yahccqx8iw1jlzl3nkhqbs673ns0gjml"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/tests/fixtures + ''; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + cargoSha256 = "0xqjbhqb08bk40i0rfzfkcl9kp67b8a285ksil4f663nidycmgw3"; - cargoSha256 = "0hd46h4wwh81hnida0in3142884y8n6ygk7qm09i5wj52g73bivv"; + doCheck = false; meta = with lib; { description = "A tool to conveniently learn about the disk usage of directories, fast!"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index f012aa120eb..3136381dd8e 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0ylanxcb1vrhvm9h3lvq8nh28362wi5hjy0pqdv5lh40pphcknnz"; + cargoSha256 = "1nhlarrl0m6as3j2547yf1xxjm88qy3v8jgvhd47z3f5s63bb6w5"; preFixup = '' install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1" @@ -37,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/sharkdp/fd"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir globin ]; + maintainers = with maintainers; [ dywedir globin ma27 ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 6637f2d2a4a..38619f53715 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -25,10 +25,7 @@ buildRustPackage rec { sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1wwdnm6a5g4gpd1f89qii8v4f6mcfc1bif1v6mdlcbrpwax5skh4"; + cargoSha256 = "0m2931fmc8jczjpb08077cpz9klhhf3aq15j2h76sb254qndagzy"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 5c2e5e3da2d..2a3813eb184 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zccl60l557lhaaqb33myys4vp3jsnjqh3dxb22i46bff28s1w6c"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1496zjrkwj5bv08k575m064x0hfk0gpci0dmxvvspj6jf8f8bfm6"; + cargoSha256 = "0023adx4xkm24p3nwj0j669xns4qf8insalcnlv3r2iv4138w10l"; meta = with stdenv.lib; { description = "Find files with SQL-like queries"; diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index e8e48d7879a..5e59d34fe4a 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fsmon"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; rev = version; - sha256 = "1zpac37biy8jz8234q0krn7pjggz33k0grz590ravbjgfawm1ccy"; + sha256 = "18p80nmax8lniza324kvwq06r4w2yxcq90ypk2kqym3bnv0jm938"; }; installPhase = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FileSystem Monitor utility"; - homepage = https://github.com/nowsecure/fsmon; + homepage = "https://github.com/nowsecure/fsmon"; license = licenses.mit; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index 5fa57e830d2..5181610a039 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fx_cast_bridge"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb"; - sha256 = "1qmp1d7miq7c2q8i4bhfp5ywxdngvyi7rjl6i82is2g5nhr7gbvv"; + sha256 = "1mjpwd27b0cpigz4cc2mdl97d78rj5ikn2bqfdic50lqjciaqi1b"; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index b3cc549e018..caef41cb394 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1n2q5a6697bxvl0askywhad2x560cajv456gxihdqqmmyq2vf63h"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1wcpbqlglf9r0xhfjmyym8bnd4pgrsf9lrmb14hn1ml5zlshpd7p"; + cargoSha256 = "0dd7b6iibjmmriwi081pc65crq0y1j2pmbm1iq0lkqdd89c9f1yp"; meta = with stdenv.lib; { description = "A command-line hex viewer"; diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index be199f7eb0a..77df7ab6908 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -3,10 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "journaldriver"; version = "1.1.0"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g"; + cargoSha256 = "1vyc9pglppfz5idahvcj01wpmmm6jw043zk896wdksywa5zcqn28"; src = fetchFromGitHub { owner = "tazjin"; diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 55a3cf409eb..4bcfd81f71d 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0kzrrphlilnyl79yfmlvd6an8iyi8zcs0inwiq74z383lnbdpk7q"; + cargoSha256 = "1cmms8kvh24sjb0w77i1bwl09wkx3x65p49pkg1j0lipwic3apm3"; buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index e3d8d15922d..2b5bb1989f4 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -10,10 +10,7 @@ rustPlatform.buildRustPackage { sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "19x8n39yaa924naldw6fv7mq9qb500arkhwj9jz2fsbhz5nz607r"; + cargoSha256 = "1ydd0sd4lvl6fdl4b13ncqcs03sbxb6v9dwfyqi64zihqzpblshv"; meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index ae3b5723850..24006e5cbd9 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0377jbjkrrjss3w8xmjsjjynycpdk19grp20hffxschg4ryvniin"; + cargoSha256 = "1z7sg9b7qsjw1hhc7dkvxz8xgf4k8jddr7gbnjr4d2569g97jf3f"; preFixup = '' install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index ee3d622a47a..e9ba1c3b5d1 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -17,10 +17,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/share/mcfly mcfly.bash ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1bf65kagvhsi6lg8187ihi5j45hkq9d8v6j7rzmmfhngdzvcfr69"; + cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv"; meta = with stdenv.lib; { homepage = https://github.com/cantino/mcfly; diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 89ffdde2974..dd64200e130 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0nqcp54nwv4ic5jc3cgg15rh8dgkixfgkwb5q47rv8ding4cd0j5"; + cargoSha256 = "0sja0q9i0b1zb3a0a6z561yg9lqykylwr3iwin4r6cmi7j2sw5j6"; meta = with stdenv.lib; { description = "An autojump \"zap to directory\" helper"; diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 10844fc30c2..df0d344afaa 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0rqlxxl58dpfvm2idhi0vzinraf4bgiapmawiih9wxs599fnhm3y"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1vdx5nwj4qmkb3rdgnchd9xixc5pmhvskvn6dmqgm91s41p2al1p"; + cargoSha256 = "0a41a6kgwgz4040c2369jldvk6xy6s6fkgayca0qy7hdwc4bcxdp"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index 670d8c19382..71cb3d23beb 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1s59ra99wcyyqz8gzly4qmcq5rh22c50c75cdi2kyajm7ghgryy9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0s4p4mpz1p5v9hr4flxlzqvc1b3zbqr3nxp1nxjw39ng9g3hplpg"; + cargoSha256 = "1nqzg5jnwvf6wiihi3wwrym3d6g0hsfaxcadhl95r3v4k35fn5qb"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/tools/misc/shell-hist/default.nix index 19f69655bbf..fd30d0370d8 100644 --- a/pkgs/tools/misc/shell-hist/default.nix +++ b/pkgs/tools/misc/shell-hist/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1nqnkzwqk879qy1261g1gds668xz6islhzq7chzhilaqpmvf6039"; + cargoSha256 = "0mfgax937na351qvi5n6s1ql9136djqiydzyfyax4684sp3kp613"; meta = with lib; { description = "Inspect your shell history"; diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index 7e5b0e7d736..a17994706bb 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -1,22 +1,18 @@ -{ rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }: +{ rustPlatform, fetchFromGitLab, lib, makeWrapper, gst_all_1, libsixel }: rustPlatform.buildRustPackage rec { pname = "termplay"; version = "2.0.6"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "termplay"; rev = "v${version}"; - sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p"; }; cargoBuildFlags = ["--features" "bin"]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "15i7qid91awlk74n823im1n6isqanf4vlcal90n1w9izyddzs9j0"; + cargoSha256 = "0nxm2k8dx6nxyghvpw44wqfd1n65947v2wqxxvy641hin4d7xzma"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index e5932d9e946..5a467dd626d 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,81 +1,126 @@ -{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill -, hdparm, ethtool, inetutils , kmod, pciutils, smartmontools -, x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux -, checkbashisms, shellcheck -, enableRDW ? false, networkmanager -}: - -let - paths = lib.makeBinPath - ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools - x86_energy_perf_policy gawk gnugrep coreutils utillinux - ] - ++ lib.optional enableRDW networkmanager - ); - -in stdenv.mkDerivation rec { +{ stdenv +, lib +, checkbashisms +, coreutils +, ethtool +, fetchFromGitHub +, gawk +, gnugrep +, gnused +, hdparm +, iw +, kmod +, makeWrapper +, pciutils +, perl +, shellcheck +, smartmontools +, systemd +, utillinux +, x86_energy_perf_policy + # RDW only works with NetworkManager, and thus is optional with default off +, enableRDW ? false +, networkmanager +}: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "0vm31ca6kdak9xzwskz7a8hvdp67drfh2zcdwlz3260r8r2ypgg1"; + sha256 = "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5"; }; - outRef = placeholder "out"; - - makeFlags = [ - "DESTDIR=${outRef}" - "TLP_SBIN=${outRef}/bin" - "TLP_BIN=${outRef}/bin" - "TLP_TLIB=${outRef}/share/tlp" - "TLP_FLIB=${outRef}/share/tlp/func.d" - "TLP_ULIB=${outRef}/lib/udev" - "TLP_NMDSP=${outRef}/etc/NetworkManager/dispatcher.d" - "TLP_SHCPL=${outRef}/share/bash-completion/completions" - "TLP_MAN=${outRef}/share/man" - "TLP_META=${outRef}/share/metainfo" - - "TLP_NO_INIT=1" - ]; - - nativeBuildInputs = [ makeWrapper file ]; + # XXX: See patch files for relevant explanations. + patches = [ ./patches/fix-makefile-sed.patch ./patches/tlp-sleep-service.patch ]; buildInputs = [ perl ]; + nativeBuildInputs = [ makeWrapper gnused ]; - installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw"; + # XXX: While [1] states that DESTDIR should not be used, and that the correct + # variable to set is, in fact, PREFIX, tlp thinks otherwise. The Makefile for + # tlp concerns itself only with DESTDIR [2] (possibly incorrectly) and so we set + # that as opposed to PREFIX, despite what [1] says. + # + # [1]: https://github.com/NixOS/nixpkgs/issues/65718 + # [2]: https://github.com/linrunner/TLP/blob/ab788abf4936dfb44fbb408afc34af834230a64d/Makefile#L4-L46 + makeFlags = [ + "DESTDIR=${placeholder "out"}" - checkInputs = [ - checkbashisms - shellcheck + "TLP_NO_INIT=1" + "TLP_WITH_ELOGIND=0" + "TLP_WITH_SYSTEMD=1" + + "TLP_BIN=/bin" + "TLP_CONFDEF=/share/tlp/defaults.conf" + "TLP_FLIB=/share/tlp/func.d" + "TLP_MAN=/share/man" + "TLP_META=/share/metainfo" + "TLP_SBIN=/sbin" + "TLP_SHCPL=/share/bash-completion/completions" + "TLP_TLIB=/share/tlp" ]; - doCheck = true; + installTargets = [ "install-tlp" "install-man" ] + ++ lib.optionals enableRDW [ "install-rdw" "install-man-rdw" ]; + + # XXX: This is disabled because it's basically just noise since upstream + # itself does not seem to care about the zillion shellcheck errors. + doCheck = false; + checkInputs = [ checkbashisms shellcheck ]; checkTarget = [ "checkall" ]; - postInstall = '' - cp -r $out/$out/* $out - rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2) + postInstall = let + paths = lib.makeBinPath ( + [ + coreutils + ethtool + gawk + gnugrep + gnused + hdparm + iw + kmod + pciutils + perl + smartmontools + systemd + utillinux + x86_energy_perf_policy + ] ++ lib.optional enableRDW networkmanager + ); + in + '' + fixup_perl=( + $out/share/tlp/tlp-pcilist + $out/share/tlp/tlp-readconfs + $out/share/tlp/tlp-usblist + $out/share/tlp/tpacpi-bat + ) + for f in "''${fixup_perl[@]}"; do + wrapProgram "$f" --prefix PATH : "${paths}" + done - for i in $out/bin/* $out/lib/udev/tlp-* ${lib.optionalString enableRDW "$out/etc/NetworkManager/dispatcher.d/*"}; do - if file "$i" | grep -q Perl; then - # Perl script; use wrapProgram - wrapProgram "$i" \ - --prefix PATH : "${paths}" - else - # Bash script - sed -i '2iexport PATH=${paths}:$PATH' "$i" - fi - done - ''; + fixup_bash=( + $out/bin/* + $out/etc/NetworkManager/dispatcher.d/* + $out/lib/udev/tlp-* + $out/sbin/* + $out/share/tlp/func.d/* + $out/share/tlp/tlp-func-base + ) + for f in "''${fixup_bash[@]}"; do + sed -i '2iexport PATH=${paths}:$PATH' "$f" + done + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced Power Management for Linux"; - homepage = https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; + homepage = + "https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar lovesegfault ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch new file mode 100644 index 00000000000..942c9a579f6 --- /dev/null +++ b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch @@ -0,0 +1,46 @@ +commit c44347b3b813e209fff537b4d46d23430727a5e2 +Author: Bernardo Meurer +Date: Tue Feb 25 21:27:39 2020 -0800 + + makefile: correctly sed paths + + The default Makefile for tlp makes a mess with catenating `DESTDIR` to + everything, but then not actualy using the catenated (_ prefixed) + variables to sed it's `.in` files. + + This patch makes sure that it correctly sets the paths, taking `DESTDIR` + in account where it makes sense (e.g. /bin where we want $out/bin) but + not where it doesn't (/etc/tlp.conf should be just that). + + The reason DESTDIR is used at all, as opposed to the more appropriate + PREFIX, is covered in the nix formula, and is (also) due to the Makefile + being a bit "different." + +diff --git a/Makefile b/Makefile +index b5af74e..95122df 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,17 +47,17 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) + + SED = sed \ + -e "s|@TLPVER@|$(TLPVER)|g" \ +- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \ +- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ +- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ +- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ ++ -e "s|@TLP_SBIN@|$(_SBIN)|g" \ ++ -e "s|@TLP_TLIB@|$(_TLIB)|g" \ ++ -e "s|@TLP_FLIB@|$(_FLIB)|g" \ ++ -e "s|@TLP_ULIB@|$(_ULIB)|g" \ + -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ + -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ +- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ ++ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ + -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ + -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ + -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ +- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" ++ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" + + INFILES = \ + tlp \ diff --git a/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch b/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch new file mode 100644 index 00000000000..b37c7280e38 --- /dev/null +++ b/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch @@ -0,0 +1,95 @@ +commit ca94cd56210067e2a55c1f413bd7713f7d338f9f +Author: Bernardo Meurer +Date: Wed Feb 26 10:46:23 2020 -0800 + + tlp-sleep.service: reintroduce + + This patch reintroduces tlp-sleep as a systemd unit as opposed to a + systemd system-sleep hook script. This is due to the recommendation by + systemd itself to not use the hook scripts. As per the manual: + + > Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/ + > are intended for local use only and should be considered hacks. If + > applications want to react to system suspend/hibernation and resume, + > they should rather use the Inhibitor interface[1]. + +diff --git a/Makefile b/Makefile +index 95122df..0e9230a 100644 +--- a/Makefile ++++ b/Makefile +@@ -70,6 +70,7 @@ INFILES = \ + tlp.rules \ + tlp-readconfs \ + tlp-run-on \ ++ tlp-sleep.service \ + tlp.service \ + tlp-stat \ + tlp.upstart \ +@@ -99,7 +100,6 @@ SHFILES = \ + tlp-rdw-udev.in \ + tlp-rf.in \ + tlp-run-on.in \ +- tlp-sleep \ + tlp-sleep.elogind \ + tlp-stat.in \ + tlp-usb-udev.in +@@ -147,7 +147,7 @@ ifneq ($(TLP_NO_INIT),1) + endif + ifneq ($(TLP_WITH_SYSTEMD),0) + install -D -m 644 tlp.service $(_SYSD)/tlp.service +- install -D -m 755 tlp-sleep $(_SDSL)/tlp ++ install -D -m 644 tlp-sleep.service $(_SYSD)/tlp-sleep.service + endif + ifneq ($(TLP_WITH_ELOGIND),0) + install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep +@@ -204,7 +204,7 @@ uninstall-tlp: + rm $(_ULIB)/rules.d/85-tlp.rules + rm -f $(_SYSV)/tlp + rm -f $(_SYSD)/tlp.service +- rm -f $(_SDSL)/tlp-sleep ++ rm -f $(_SYSD)/tlp-sleep.service + rm -f $(_ELOD)/49-tlp-sleep + rm -f $(_SHCPL)/tlp-stat + rm -f $(_SHCPL)/bluetooth +diff --git a/tlp-sleep b/tlp-sleep +deleted file mode 100644 +index 3de85ce..0000000 +--- a/tlp-sleep ++++ /dev/null +@@ -1,11 +0,0 @@ +-#!/bin/sh +- +-# tlp - systemd suspend/resume hook +-# +-# Copyright (c) 2020 Thomas Koch and others. +-# This software is licensed under the GPL v2 or later. +- +-case $1 in +- pre) tlp suspend ;; +- post) tlp resume ;; +-esac +diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in +new file mode 100644 +index 0000000..4ac17bd +--- /dev/null ++++ b/tlp-sleep.service.in +@@ -0,0 +1,19 @@ ++# tlp - systemd suspend/resume service ++# ++# Copyright (c) 2020 Thomas Koch and others. ++# This software is licensed under the GPL v2 or later. ++ ++[Unit] ++Description=TLP suspend/resume ++Before=sleep.target ++StopWhenUnneeded=yes ++Documentation=https://linrunner.de/tlp ++ ++[Service] ++Type=oneshot ++RemainAfterExit=yes ++ExecStart=@TLP_SBIN@/tlp suspend ++ExecStop=@TLP_SBIN@/tlp resume ++ ++[Install] ++WantedBy=sleep.target diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 6309cbc1961..9c58785e84e 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage { # too many impure/platform-dependent tests doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0qnpx2xhckb45q8cgn0xh31dg5k73hqp5mz5zg3micmg7as4b621"; + cargoSha256 = "186hwzdpy7j0gw7491qx02vy4di5md47hipf1xxi1qccvmcfghwh"; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index 2f665f19958..1696a54d0aa 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace src/main.rs --replace /usr/share $out/share ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "04xx26ngz7hx7bv5g01q9h6dqa96xkx0xm3jb0qk6c3hp6500zpn"; + cargoSha256 = "1l34i7qalid9mlcbpqhbb2bxgn2ylb2lwki4c0hf4kkq646ql0n1"; postInstall = '' mkdir -p $out/share/${pname} diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index 7e570d21f7a..f71151259c8 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { # The tests are long-running and not that useful doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03g7155jpg8k1ymk95m8rlhlszkxyq0rv32966n4gk5yziijvk4k"; + cargoSha256 = "0fnkcjxcsiw9j0ibh4z7zy0m6r5d84q5hvr2darwpckbn9ryrh3k"; meta = with stdenv.lib; { description = "Terminal-based personal organizer"; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 26fc7107d41..eede909ddce 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "03s9nsss4895x4lp90y65jajavk8c2nj1jjnmx0vbbwl210ghlv1"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07whi9w51ddh8s7v06c3k6n5q9gfx74rdkhgfysi180y2rgnbanj"; + cargoSha256 = "0p20d7paiafvl4k9iiazbgq75wk7k42sz2h1y5lalq16f5rp6dbp"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 003932551ef..14617f207db 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = [ "--features=ssl" ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "163kwpahrbb9v88kjkrc0jx2np3c068pspr8rqrm9cb8jyl2njrr"; + cargoSha256 = "09chj0bgf4r8v5cjq0hvb84zvh98nrzrh1m0wdqjy5gi7zc30cis"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/xv/default.nix b/pkgs/tools/misc/xxv/default.nix similarity index 67% rename from pkgs/tools/misc/xv/default.nix rename to pkgs/tools/misc/xxv/default.nix index bbf966d1c1f..6b20c39b185 100644 --- a/pkgs/tools/misc/xv/default.nix +++ b/pkgs/tools/misc/xxv/default.nix @@ -7,20 +7,17 @@ let useNcurses = !stdenv.hostPlatform.isWindows; in assert useNcurses -> ncurses != null; rustPlatform.buildRustPackage rec { - pname = "xv"; - version = "0.1.1"; + pname = "xxv"; + version = "0.1.2"; src = fetchFromGitHub { owner = "chrisvest"; repo = pname; rev = version; - sha256 = "0x2yd21sr4wik3z22rknkx1fgb64j119ynjls919za8gd83zk81g"; + sha256 = "0ppfsgdigza2jppbkg4qanjhlkpnq7p115c4471vc6vpikpfrlk3"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0m69pcmnx3c3q7lgvbhxc8dl6lavv5ch4r6wg2bhdmapcmb4p7jq"; + cargoSha256 = "1gnyig87a0yqgkng52fpn6hv629vym6k7ydljnxrhb5phmj2qbqx"; buildInputs = lib.optionals useNcurses [ ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]) @@ -33,10 +30,10 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A visual hex viewer for the terminal"; longDescription = '' - XV is a terminal hex viewer with a text user interface, written in 100% safe Rust. + XXV is a terminal hex viewer with a text user interface, written in 100% safe Rust. ''; - homepage = https://chrisvest.github.io/xv/; - license = with licenses; [ asl20 ]; + homepage = "https://chrisvest.github.io/xxv/"; + license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ lilyball ]; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 39024ff462f..e42de87f58b 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1c4lndrr7xndgp60zcdjqpciwibm9sjwwrd3921fyz4jg44g76zy"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1sa81570cvvpqgdcpnb08b0q4c6ap8a2wxfp2z336jzbv0zgv8a6"; + cargoSha256 = "1jnkfiyp5mlwm6bn7i66g5vbbrhps2avlmbilip4346m2j8qc2qv"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index d746d1f42b5..973d0287149 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "18nlvqa9ha4vs9xb60hivhgcsqr69zsigfmqyig48slvwgqkbwda"; + cargoSha256 = "0srmn8ndy7vdvcysyb7a5pjly0m3jchq0zrqzhrwicynm291w56h"; buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 4ad924ee5b5..20bc456eea8 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0h41ws3jcxb90mhnznckfkfv0mpx6ykga7087bipbaw2fqhr7izd"; + cargoSha256 = "0v1hx6kjsmydx6ckjqj31y2gcpvax4mshwrniicplkka3q6hx9ra"; meta = with stdenv.lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 3b94c61a713..6f9ee7355df 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -31,10 +31,7 @@ buildRustPackage rec { doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1nv0630yb8k857n7km4bbgf41j747xdxv7xnc6a9746qpggmdbkh"; + cargoSha256 = "1ka22krw8s05vpamg9naqqf7vv5h8dkpfdik0wy8nispkrxzgb92"; meta = with stdenv.lib; { description = "A server application to run tox node written in pure Rust"; diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix index d0768300d82..e648990ccf8 100644 --- a/pkgs/tools/package-management/cargo-deps/default.nix +++ b/pkgs/tools/package-management/cargo-deps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deps"; - version = "1.1.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "m-cat"; repo = pname; - rev = "ab93f5655900e49fb0360ccaf72b2b61b6b428ef"; - sha256 = "16181p7ghvy9mqippg1xi2cw7yxvicis8v6n39wly5qw05i57aw2"; + rev = "4033018eaa53134fd6169653b709b195a5f5958b"; + sha256 = "1cdmgdag9chjifsp2hxr9j15hb6l6anqq38y8srj1nk047a3kbcw"; }; - cargoSha256 = "1zk6pf7agqs1mpld40rn05cwp4wy0vpjnn5ip6m83bxm8b3i87wk"; + cargoSha256 = "1gjbvgpicy9n311qh9a5n0gdyd2rnc0b9zypnzk2ibn1pgaikafy"; meta = with lib; { description = "Cargo subcommand for building dependency graphs of Rust projects"; diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 088dfc6c5a1..2bb4e4aeea3 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1lfp9vyrk8880j7p5i73zja9dglvl1lvvh7286rwd1a9gbcj6grb"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "09dg43vba8hwivng2h70qmpxnijad171mf02vwjw0gqxk83ql28v"; + cargoSha256 = "0jjzxzdlflzvy39zi8vwx53xiv66v90idllsfvhj9p9lhc5ssi24"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index d93ffa9d090..9ddaa3468ff 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1dddb3a547qnpm1vvrgffb3v9m8sh19hmhy0fg6xjqpm032lqx3v"; + cargoSha256 = "17xgjk8li29b8q8p2bi56klqg0v2q0j6ich438c4p06jrszccx1f"; nativeBuildInputs = []; buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 42478f38b84..4601dc37443 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -509,6 +509,7 @@ mapAliases ({ xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20 xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 + xv = xxv; # added 2020-02-22 youtubeDL = youtube-dl; # added 2014-10-26 zdfmediathk = mediathekview; # added 2019-01-19 gnome_user_docs = gnome-user-docs; # added 2019-11-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6335de18e20..e89933fa1a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7586,7 +7586,7 @@ in xurls = callPackage ../tools/text/xurls {}; - xv = callPackage ../tools/misc/xv {}; + xxv = callPackage ../tools/misc/xxv {}; xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; @@ -16921,6 +16921,8 @@ in mdadm = mdadm4; mdadm4 = callPackage ../os-specific/linux/mdadm { }; + metastore = callPackage ../os-specific/linux/metastore { }; + mingetty = callPackage ../os-specific/linux/mingetty { }; miraclecast = callPackage ../os-specific/linux/miraclecast { }; @@ -18457,6 +18459,8 @@ in brave = callPackage ../applications/networking/browsers/brave { }; + breezy = with python3Packages; toPythonApplication breezy; + notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; brig = callPackage ../applications/networking/brig { }; @@ -22864,7 +22868,7 @@ in zcash = callPackage ../applications/blockchains/zcash { }; parity = callPackage ../applications/blockchains/parity { }; - parity-beta = callPackage ../applications/blockchains/parity/beta.nix { }; + parity-ui = callPackage ../applications/blockchains/parity-ui { }; polkadot = callPackage ../applications/blockchains/polkadot { }; @@ -24513,6 +24517,8 @@ in symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; + mcy = callPackage ../applications/science/logic/mcy {}; + lingeling = callPackage ../applications/science/logic/lingeling {}; ### SCIENCE / ELECTRONICS @@ -25866,9 +25872,9 @@ in spdlog = spdlog_1; dart = callPackage ../development/interpreters/dart { }; - dart_stable = dart.override { version = "2.0.0"; }; - dart_old = dart.override { version = "1.24.3"; }; - dart_dev = dart.override { version = "2.0.0-dev.26.0"; }; + dart_old = dart.override { version = "1.24.3"; }; + dart_stable = dart.override { version = "2.7.1"; }; + dart_dev = dart.override { version = "2.8.0-dev.10.0"; }; httrack = callPackage ../tools/backup/httrack { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99d321ada39..53b7eba5f30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -502,6 +502,8 @@ in { braintree = callPackage ../development/python-modules/braintree { }; + breezy = callPackage ../development/python-modules/breezy { }; + deepdiff = callPackage ../development/python-modules/deepdiff { }; django-sesame = callPackage ../development/python-modules/django-sesame { }; @@ -783,6 +785,8 @@ in { i3ipc = callPackage ../development/python-modules/i3ipc { }; + ignite = callPackage ../development/python-modules/ignite { }; + ihatemoney = callPackage ../development/python-modules/ihatemoney { }; imutils = callPackage ../development/python-modules/imutils { }; @@ -817,10 +821,16 @@ in { langdetect = callPackage ../development/python-modules/langdetect { }; + launchpadlib = callPackage ../development/python-modules/launchpadlib { }; + lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; + + lazr-uri = callPackage ../development/python-modules/lazr-uri { }; + libmr = callPackage ../development/python-modules/libmr { }; limitlessled = callPackage ../development/python-modules/limitlessled { }; @@ -2368,6 +2378,8 @@ in { pytest-isort = callPackage ../development/python-modules/pytest-isort { }; + pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; + pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; pytest-mock = callPackage ../development/python-modules/pytest-mock { }; @@ -4462,6 +4474,8 @@ in { inherit (pkgs) which; }; + nitime = callPackage ../development/python-modules/nitime { }; + nixpkgs = callPackage ../development/python-modules/nixpkgs { }; nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; @@ -5124,6 +5138,8 @@ in { pynrrd = callPackage ../development/python-modules/pynrrd { }; + pynvml = callPackage ../development/python-modules/pynvml { }; + pynzb = callPackage ../development/python-modules/pynzb { }; process-tests = callPackage ../development/python-modules/process-tests { }; @@ -6172,6 +6188,8 @@ in { vultr = callPackage ../development/python-modules/vultr { }; + wadllib = callPackage ../development/python-modules/wadllib { }; + waitress = callPackage ../development/python-modules/waitress { }; waitress-django = callPackage ../development/python-modules/waitress-django { };