diff options
27 files changed, 296 insertions, 184 deletions
diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 2ff82804318..f6ec6a0ec69 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; - sha256 = "sha256-ZNSNROWl6RR4GZnoRGAXrdw48wH9OOgrsoKz0RNIIcs="; + sha256 = "sha256-ZYncyaX9gqBhDKiC87A2xI7VeU0zGsmm3Sx45lwgnrg="; }; patches = [ diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index b4b55fa264d..0803b495b2f 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -28,15 +28,16 @@ , nss , pango , systemd +, udev , xdg-utils }: stdenv.mkDerivation rec { pname = "1password"; - version = "8.0.34"; + version = "8.1.1"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "0mp119v5vgsva7pnxpsbq4xhh4vbhwv7ga9b5b7f6slx3biy1wmh"; + sha256 = "0y39sfhj9xrgprh01i9apzfkqzm6pdhjc8x59x5p5djjjvxbcwmy"; }; nativeBuildInputs = [ makeWrapper ]; @@ -95,8 +96,12 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${rpath}:$out/share/1password $file done + # Electron is trying to open udev via dlopen() + # and for some reason that doesn't seem to be impacted from the rpath. + # Adding udev to LD_LIBRARY_PATH fixes that. makeWrapper $out/share/1password/1password $out/bin/1password \ - --prefix PATH : ${xdg-utils}/bin + --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} runHook postInstall ''; diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 9694e9b6918..3605e7c416f 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QGVBJKTBo2RckGwW1deM2toRPT73PYDLvr7YVepkQvg="; + sha256 = "0fx9ig08whl7bsii9m1h9wp361ngf1szd8v8yqglgl0x8044fwrk"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix new file mode 100644 index 00000000000..201add9cda2 --- /dev/null +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, jq }: + +let + emojiJSON = fetchFromGitHub { + owner = "github"; + repo = "gemoji"; + sha256 = "sha256-Tn0vba129LPlX+MRcCBA9qp2MU1ek1jYzVCqoNxCL/w="; + rev = "v4.0.0.rc2"; + }; + +in stdenv.mkDerivation rec { + pname = "wofi-emoji"; + version = "unstable-2021-05-24"; + + src = fetchFromGitHub { + owner = "dln"; + repo = pname; + rev = "bfe35c1198667489023109f6843217b968a35183"; + sha256 = "sha256-wMIjTUCVn4uF0cpBkPfs76NRvwS0WhGGJRy9vvtmVWQ="; + }; + + nativeBuildInputs = [ jq ]; + + postPatch = '' + cp "${emojiJSON}/db/emoji.json" . + substituteInPlace build.sh \ + --replace 'curl https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json' 'cat emoji.json' + ''; + + buildPhase = '' + runHook preBuild + + bash build.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp wofi-emoji $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Simple emoji selector for Wayland using wofi and wl-clipboard"; + homepage = "https://github.com/dln/wofi-emoji"; + license = licenses.mit; + maintainers = [ maintainers.ymarkus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix index f5b450b4f2a..b4c4d43e99a 100644 --- a/pkgs/data/machine-learning/mnist/default.nix +++ b/pkgs/data/machine-learning/mnist/default.nix @@ -29,7 +29,7 @@ in ln -s "${srcs.test-images}" "$out/${srcs.test-images.name}" ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}" ''; - phases = [ "installPhase" ]; + dontUnpack = true; meta = with lib; { description = "A large database of handwritten digits"; longDescription = '' diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix index 19aab27ba74..d8640228513 100644 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.6.1"; + version = "1.6.2"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "01i5sm4vqb0y5qznql571zap19b42775drrcxnzsyhpaqgg8m23w"; + sha256 = "0h1jh8gbvxb0pl1an0fbbg4lbd0sa24yj2f4yqwavw8dbdvvbd1y"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 1809f9fd2dc..810d783d4fb 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/java diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index fc871f174eb..df05754da58 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Denable-test=false" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Ddisable-introspection=true" ]; passthru = { diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix index 9a3bac5abda..ee902d772c9 100644 --- a/pkgs/development/python-modules/editables/default.nix +++ b/pkgs/development/python-modules/editables/default.nix @@ -20,9 +20,12 @@ buildPythonPackage rec { # Tests not included in archive. doCheck = false; - meta = { + pythonImportsCheck = [ "editables" ]; + + meta = with lib; { description = "Editable installations"; - homepage = https://github.com/pfmoore/editables; - license = lib.licenses.mit; + maintainers = with maintainers; [ ]; + homepage = "https://github.com/pfmoore/editables"; + license = licenses.mit; }; } diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 93644caa5a4..7ae24c69148 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, coreutils, makeWrapper }: -let version = "1.9.15"; in +let version = "1.9.16"; in stdenv.mkDerivation { pname = "ant"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "0yfx5qsvrg12lar4908ndbnlpppy7g7qk8ay41y4sz9g873v07mr"; + sha256 = "0rif9kj6njajy951w3aapk27y1mbaxb08whs126v533h96rb1kjp"; }; contrib = fetchurl { diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index d2ef8361ec0..6ff91a4e5a6 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, coreutils, makeWrapper }: -let version = "1.10.9"; in +let version = "1.10.11"; in stdenv.mkDerivation { pname = "ant"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "1ab8ybczvk12501dnj450a3d4v43ca0pjhk33s175hax46s58z47"; + sha256 = "19m8xb7h6xm4jykzb79kakbx1pa4awaglw6z31pbfg8m5pmwkipz"; }; contrib = fetchurl { diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index fb9dab54049..8e0095bb819 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: - -assert guileSupport -> ( pkg-config != null && guile != null ); +{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config, guile }: let version = "4.3"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9eb3b04dd7f..d6465324bda 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -39,6 +39,18 @@ final: prev: meta.homepage = "https://github.com/eikenb/acp/"; }; + aerial-nvim = buildVimPluginFrom2Nix { + pname = "aerial-nvim"; + version = "2021-07-17"; + src = fetchFromGitHub { + owner = "stevearc"; + repo = "aerial.nvim"; + rev = "e641878818c5545afd09b093a368f2d03f169273"; + sha256 = "1zykpbd42nwvpkgbq0hh52micyybxyvia6558fp6nlcs56bdmqf4"; + }; + meta.homepage = "https://github.com/stevearc/aerial.nvim/"; + }; + agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; version = "2020-11-23"; @@ -65,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-14"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "d8f4e8b7081724c0b9ff2491dd68409b3da69b0f"; - sha256 = "0rwj9rhkzg004jv9q8wr86l9xak4wqf7l5skq1nf8k0xis9aw6d3"; + rev = "f83a1f70d542ac885b72d1161140d6d999e2d7b2"; + sha256 = "0mx9g2j32hbpg5gyxn4apkfm28myzpasj4w7dpq6p61c90hwhgq4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -185,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-06-06"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "6a77e8ecf38b0e7a547df58f499cecc1c50cd444"; - sha256 = "1yh88v6p1ingwydzr40jcva9gw58ihmgjndaf7h3sp0ldvl75ci2"; + rev = "af110b7f6080bdc4685cdd5551ba1f79a81910f1"; + sha256 = "1h2czb183lliib95jn4dxq8cn713s22dc4hd1cj19bzqy4j39qhi"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -413,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "8ed122e474a0316f8b967bb6c35a47e8dd383453"; - sha256 = "0zk12wd1xs668j3wfdd5vyj685irnjsksrmn2dln6vsyb7xpq3r5"; + rev = "fa78312b378a7d3a6cb1222d1df05c28238f888b"; + sha256 = "05j42c3h374hyqqb5m7dddyh4sn08cw64nji3fnv3rk63gm2r4if"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -521,12 +533,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-07-09"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "0b3967864c7d5cf94682f07d1cdb8afec3c8753f"; - sha256 = "0jpjarg6fjlkwwk69pl44f1r8racb0fzf5dqr58fgn31l7zcvrak"; + rev = "75b97dfdd641d530b86dee603308aea0079736e9"; + sha256 = "1rmlz74ssf9mpg4fbxinrmxnqcb4p37wi4pz96d6niiii0vj71b2"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -557,12 +569,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-15"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "3c3f118f8d48707f1890c2c212c083228aeac596"; - sha256 = "0nim2hd0pn910ymm87zwfcw5b7x64h3dsnqhc20yj0r3s5xjg6qi"; + rev = "9c3c84735c9bcfd62507d6e2a137f90b1ddaa98a"; + sha256 = "0g479ffpiqz15wwam4vwi8x0w7hbdnk2dxcwzryaf1cqnn6ip6in"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -678,12 +690,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-07-09"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "d2837688cb0de46712b602eb9fbd17c6c0a8047b"; - sha256 = "089vcjqhdbzld89w5rfw6rx2fnybc0xbaa3q6abpckyir175d7a7"; + rev = "fcb7c80bc6b3df11d5c0d8cde4f12aa9d3653cdd"; + sha256 = "18v1g8l11caqlag3d55vvn1v7k99600jzlzzmp6bv5pmi4lmhq0g"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -1751,12 +1763,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-04-28"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "9b016fd42ba37395d9299e1e811b282b29effb63"; - sha256 = "0x3rg1pxildm2mrfr28f4d41z4zzf6v2jng41nzylwm5r4c5r1gd"; + rev = "14aec3bde121c797f9131da0d4b18a932598bb8f"; + sha256 = "1mcn4dhwjay5c0y650y2rxz9acxwfsninwrvp20ssgi4gcw2vg76"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -1847,12 +1859,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-09"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "acbf54d357ddb2c558d7f536a8da409d6e357dff"; - sha256 = "0kvgfvabgg992309xw15slpk0klvzlcjdlnbvgva0bkwkybagnja"; + rev = "f29e8a461e05881c69953b41784a1aeb4b70a422"; + sha256 = "1nda02nd9v17yv6fawidg8c3haijysb9zc04sjy0v708h2nw8qhj"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2580,12 +2592,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-07-12"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "a3c62fc1d2bb9fffa14b42b97c100f148e96f15b"; - sha256 = "0mp4p5d2m51f716938pzm8xifh8nxlmspdxpwbzqgnkf1b1rcvz0"; + rev = "62f02aabce3b5af190cf113d5bdf4a8271a966c3"; + sha256 = "1cckxvr035vsall3891j60yc1a12p8q63rjnm7ac1wzdhh7d8c38"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2664,12 +2676,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-07-10"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "27fa218ca099a07eefbe9d5b5e57f06887b48b5f"; - sha256 = "0yi35p05f28dm6l1qk93chizachnk2ciybrnvqcnx0ry0cipd727"; + rev = "29e685953d362c723c55417eea2b795b5bcc2ef5"; + sha256 = "183511fy34sazpkaxcpr250id4zyxhs5mqws49b516sh0d875fjj"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2808,12 +2820,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-07-13"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "1db8e5588bfd2038efb690de5991746c8bf03543"; - sha256 = "00mpza33p3yybr3fgigx7gy8faj8f5ypdws9aymxs30a12p67d1q"; + rev = "2d61b880aba6e4e0b730303e0e980bf0afd73961"; + sha256 = "01az8gkhhvndnrjavk7jzi5wy03ybca97cbxpdimx2wpvxly484j"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3180,12 +3192,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "4a6eb9d52d544d378c82f17c448eb9c697cf448c"; - sha256 = "14hsyy23xb5p8lfna3kiarr0na1n1bykr8scwslczhpi9fwcgq85"; + rev = "7f9f1d328c218b041ce899def4923334a5355c14"; + sha256 = "1f7acjy3xhiz2yzkdp5x5f4p28zz583h7snyzrc2l8w7fwz600x9"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3238,6 +3250,18 @@ final: prev: meta.homepage = "https://github.com/kassio/neoterm/"; }; + neovim-ayu = buildVimPluginFrom2Nix { + pname = "neovim-ayu"; + version = "2021-07-17"; + src = fetchFromGitHub { + owner = "Shatur"; + repo = "neovim-ayu"; + rev = "755b4a379ef4812f9656fb3f59220cf3a45c2070"; + sha256 = "0irjjpfrl6i7hfvay6b187i7dkkjq40fdcrx53xxfk9qq47l1z13"; + }; + meta.homepage = "https://github.com/Shatur/neovim-ayu/"; + }; + neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; version = "2021-07-02"; @@ -3384,12 +3408,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-10"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "05814232c4369ef36961123de6ff3826936e9784"; - sha256 = "16z7kk8cvf52xnpkw8jvaaskd6zmah14va8cfgi52ckfl482w2pd"; + rev = "44ae0a84087135e23fb5a90c9726f8b161277652"; + sha256 = "0zhv06arl7x3wx20r26v3vc1i4909h657syrqbyh5k93n1hmc21j"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3408,7 +3432,7 @@ final: prev: nterm-nvim = buildVimPluginFrom2Nix { pname = "nterm-nvim"; - version = "2021-07-16"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; @@ -3504,12 +3528,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "cebafb95622205a414a6c10bf0e40d197cc652b1"; - sha256 = "1qd8gaigkyhkz5nrizc3jhwa69v4fcymd2446l0s24pv3kxc2an3"; + rev = "b90cbdef2d7eab5fa8b3693bb321305e4455f329"; + sha256 = "16n168z9gdy0p0yljpx3lv958ix1369qgqc65pjs9ib5sij03q2s"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3540,12 +3564,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-14"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "29879b29b63fcd315e247a110a505e6a337b584a"; - sha256 = "18ybvc2l07l91gkl3w63l58pm9q7bx2p0fmkyxpqb48cii98n4yj"; + rev = "ef97a9b17c655d8b603c5fa9abf6fbb623a1dad4"; + sha256 = "0lrna8ryw391dpvi64x3q2gj484mf5s6wlqqg6a52a5s3ganh41n"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3624,12 +3648,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-06-12"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "dd688e37458a6fdeb050942da8c1260389c2a99a"; - sha256 = "0q4bmp3wy0miaysldpfm6646r8c0llygfnlbmk5brs4la321hjld"; + rev = "1df774df358e70cbc9f74f34d38a82e756ceb001"; + sha256 = "1zf5i30g49f7ks6hhvr84ac3ka57lv96c124cpr1d4h9xld1n9q8"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3672,12 +3696,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9d49032a64d8a275123ad7f84e9c699d279307fe"; - sha256 = "18z22v8qn6jhg16hsrldqaqqp987w1nnqz0lhn0byzbsac62xwga"; + rev = "1729b502fa00df2fdcbfa118b404b8b8a8a2d6a3"; + sha256 = "1r4ajaxvf9kpfq42b81c08ixfqakiq8fibn89qar7sd4a7634dsg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3828,12 +3852,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-13"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "15e8a45517c596b9acd9406bcb6f650d6bfdb339"; - sha256 = "1m1bc5w1qw8cxjnhhanh7rw78d3zkdxm6vgldh22zhmvgj1cb7zl"; + rev = "4887eb7526004e069bd8898041a714c7eaad72e7"; + sha256 = "1abdjkiyyzgaw3lskjfb0lcilkp8qqlaqj8kyfmzf4w4mz9ijh4d"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3924,12 +3948,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark-nvim"; - version = "2021-06-18"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "1304235686bc682e744ba9691c7545e0b27762ea"; - sha256 = "0ygy9hl171qa9zp8gmj80azp4vxxn5ba3v19mgy36qf390jgrwc4"; + rev = "df80982b43ced71a286933e830b26faabb9a36e9"; + sha256 = "1hddmi543js7z77383ppvdray2dri5jn8lcqivk9xm5l8maz52cz"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; @@ -3984,12 +4008,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "d693133efb4a1f171d581dad8d399d6a3cd4b90a"; - sha256 = "1avcdfsq14nqbqrvlgz7cslaxi1ni5lsvz78dj5xc35ppgwyr1ci"; + rev = "b6a904b341c56c5386bdd5c991439a834d061874"; + sha256 = "1ja6k5cw6v5nhi91s643r6c38a15rgi4n8cb0k5pc5q252q8km04"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4429,12 +4453,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-14"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "da8fb66af44fe2472b58fbf0b83ad4fe2243aaea"; - sha256 = "0mkjb42ff0w80kbik6hwdx1hvhxlihq17fqypdagmxk58wn71z9y"; + rev = "a22eec84aaa5b31b5c708eed24a5c09f21ca46c0"; + sha256 = "14lwhdbpjrq2xyy9kfihjasvqg83bb13fl0r7aw95hngayx69l7k"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4766,12 +4790,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2021-06-28"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "03af68c1ecec4a01b4fe713393c1b3fa4dd21e77"; - sha256 = "15qja2ywi83qv365b19xrcw02j693bhrdn0wanxdhbqzpp9kwsb9"; + rev = "e5c60658d9aca5af479ef6371037cc6453a6b1eb"; + sha256 = "07l7acnhp9nwwkmybjs2fdprql5nanyxxn9z3wl59y8jx2ca44p7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -4779,12 +4803,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-04-13"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "afd60eef9edff543d4d05ac51d518fd501f2e413"; - sha256 = "115l3dp1i7pmfsqyqir5c73bprvsnnm737sbbz0dwibnlr5sd2q3"; + rev = "76277236829ca77dd41d285c794ab8878129e3f8"; + sha256 = "1vqxn02xy8j7ij4zm7x55zzch1bl8k6313l06mb60zxvw77i5a81"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5030,6 +5054,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; + telescope-fzf-native-nvim = buildVimPluginFrom2Nix { + pname = "telescope-fzf-native-nvim"; + version = "2021-07-06"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-fzf-native.nvim"; + rev = "fe8c8d8cf7ff215ac83e1119cba87c016070b27e"; + sha256 = "0kzxf3kzw45mlccp8z5zl3cfda4n5afymmdyir3kd248ll904jy1"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; + }; + telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-writer-nvim"; version = "2021-04-16"; @@ -5069,24 +5105,24 @@ final: prev: telescope-z-nvim = buildVimPluginFrom2Nix { pname = "telescope-z-nvim"; - version = "2021-03-09"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-z.nvim"; - rev = "c14b6335f42bdda5100f135f18632bf6421c5f0e"; - sha256 = "01y3b41ff00qi4g11pry73nd851dc5hjl039symhd2y0lf447j7h"; + rev = "27694fa19bc00cc24b436d671951f516a4a966a1"; + sha256 = "0g12nfmv2hllw0ylsy362mp1gyaf4ldyiza3jg74c66xwi2jj8i9"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-14"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "37a3a68a78e15900254ae5d9d4f9f0b5100a1735"; - sha256 = "1a5hsjsz62nb5hlrd0k8wbcnyxa3574jgipphs9s2llf6qfwkfh1"; + rev = "5b597e7709eec08331ce71b45193117f6fb5626b"; + sha256 = "1lwr3gayqj6h0ha749p5dfgihjlqydgaidcnblcvvj8vi10ick35"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5153,12 +5189,12 @@ final: prev: tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; - version = "2019-09-28"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "tomtom"; repo = "tlib_vim"; - rev = "a071b6d41b20069a3520e0d101194a752968973b"; - sha256 = "05swfvjyai32cbdpg10m3k2frkv017i1avf0nzilqavskvg04vi3"; + rev = "70c4e222464020edc2809c932b488daaf891eeef"; + sha256 = "1amx220nbh1s51z35pkhvl3110pbha5qj2rdgxvg8dbqha7py9fx"; }; meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; @@ -5250,12 +5286,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble-nvim"; - version = "2021-06-24"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "7de8bc46164ec1f787dee34b6843b61251b1ea91"; - sha256 = "1ybv7vdvyvyx09zwwx1vw91ids13g24as0ag0jnw6ck95f12r7mn"; + rev = "059ea2b999171f50019291ee776dd496799fdf3a"; + sha256 = "06v2jvlw8rjlarx89kfb7ys8y0jkm1f7c4vnws60nfbqgp9c9k98"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -5286,12 +5322,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight-nvim"; - version = "2021-07-13"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "f5718ddbd9bba3184493a4fc11cd38342966904f"; - sha256 = "1j532h0imw782rvhg75ryqmy5lm0clg32fs3a1cm84srx97l05fp"; + rev = "f722fa24411d0423a3d2daf6f1b5f8b11df9db2b"; + sha256 = "0k2vbhs960h346w37ky2mpv1syzjxi19zl9zmnvlsy6annqd892x"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -5958,12 +5994,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-11"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "e8fda02cd9ee8cbd4955a387cce3752584b85ac0"; - sha256 = "1l88pxfxjjfc0wfgkr2nj2x3dp3sj2xghyjzihafdp4nrynvygb8"; + rev = "ee390feaa3bc40de2afa32910ab09de287181146"; + sha256 = "0q2bnmi6yz7i7lx8i59gzk39fqzjc3y325qjhhyyahwb2xsazzcz"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6294,12 +6330,12 @@ final: prev: vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-05-13"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "4c2df59e37b6680e0ec17b543b11a405dc40262c"; - sha256 = "0knpfl0lwiy0w2f9qd3gz3yl03dqzn6fllv0isl0iz24csya6v2h"; + rev = "0a11dae811e6c8b939fe80aeb750469f8ca44d67"; + sha256 = "07lgjzi10h1gfvr2ij1pc4qxj63n4bg3jvj01ilj6yas56a3hk09"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -6738,12 +6774,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-12"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "1c2663f516c32f8453f542be10192a49ee844a93"; - sha256 = "01gh4p2d41khx5cb7hcpjp9gs5fkgil838rnik1gawiw7w83hnaa"; + rev = "58516a13c623e6b21be6fed1f6067eed67005949"; + sha256 = "0gzdsp1gz1wpw8z47v3sr9b0ma41qnz0r4iiq0jr84srr3817zpl"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7592,12 +7628,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2021-05-29"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "2b5565881b31ed4e7ac32b4903827ec9c164216d"; - sha256 = "13nzkqhyz8jydrwprw06jqcx3w37xv0qdq0809gx748kfvh1dznw"; + rev = "4e4404dffbd99159af9cfe816d13a6e69aadcee2"; + sha256 = "1a1k27gvsd2ssnw3w8b29z3q8z2w2jxgcwpx5gd6djk1id26rhb6"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -8421,12 +8457,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2021-04-15"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "2590324d7fdaf0c6311fad4ee2a2878acaaec42d"; - sha256 = "0ljlkzy2r8dzqkcl9pbgshr7swdcdbbxcgfvvmyxrw7swfx1srk9"; + rev = "b4aad6dc43660db554bba2942026fb9965f1a45e"; + sha256 = "04ckpl3q1k4l530fhf5srbklfqdz4rfrcapwsa92n4bwskfxbnsp"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -8733,12 +8769,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-07-11"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "e77399e64d6f54a623c52797973a23ecfe28b813"; - sha256 = "13c90zq8pxd1kfrk5f0zj6r48v86j4fnijss71j7ilb38mj4dyxq"; + rev = "f1b72d866d6564075a8b0da1f179c0b7de723131"; + sha256 = "1vfpf0mjwk519gdly44f0ixc5y4609j33fsjsfzwgcmp3xgmf081"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9190,12 +9226,12 @@ final: prev: vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2021-03-19"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "cf8aa913329991bfeaa1cabab4bbd8889b0f0790"; - sha256 = "0j0h95xhb5c59qyx8gc1yrcnsjxffbnycya6wnl7axd71iawwgh8"; + rev = "cd7286702319d676c622a5f5891dc68563bf6ad5"; + sha256 = "1xmcnhbny74hr0zciy55gq8c8agds2x1xvdsr1wrghkcr2k15w46"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -9639,8 +9675,8 @@ final: prev: src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "431f520553bfe721d1ef5db0bb23ec03a86c00a0"; - sha256 = "1a9j27404hi8s3v7h9kghl7xwgmcblbranlp6kclvvrl7wahvnhg"; + rev = "13fac7d1d820ee4d72196841800705f149af9868"; + sha256 = "0k9325pdh5fscj8nhqwj36vdz6lvcgf14r7mmimc7g6i7bxxfpmb"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 6c2063e0a97..0cf3222c9f3 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -479,6 +479,12 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + buildPhase = "make"; + meta.platforms = lib.platforms.all; + }); + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; preFixup = @@ -625,7 +631,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-hcbNjp9KLJO0RANOvtopvdiK0w9ESUXk0KOTPvVcCX4="; + cargoSha256 = "sha256-D54R7LK4CH5S7x0g+3K1EJ4b10P7wRAIkHYwCOFJtfg="; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 02280936740..8aaa0c8f31d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -484,6 +484,7 @@ nvim-lua/plenary.nvim nvim-lua/popup.nvim nvim-telescope/telescope-dap.nvim nvim-telescope/telescope-frecency.nvim +nvim-telescope/telescope-fzf-native.nvim@main nvim-telescope/telescope-fzf-writer.nvim nvim-telescope/telescope-fzy-native.nvim nvim-telescope/telescope-symbols.nvim @@ -595,6 +596,7 @@ samoshkin/vim-mergetool sbdchd/neoformat sebastianmarkow/deoplete-rust SevereOverfl0w/deoplete-github +Shatur/neovim-ayu shaunsingh/moonlight.nvim@pure-lua shaunsingh/nord.nvim sheerun/vim-polyglot @@ -637,6 +639,7 @@ steelsojka/completion-buffers steelsojka/pears.nvim stefandtw/quickfix-reflector.vim stephpy/vim-yaml +stevearc/aerial.nvim sunaku/vim-dasht sunjon/Shade.nvim svermeulen/vim-subversive diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index d9927638577..71f526525e4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,18 +1,22 @@ { lib, stdenv, fetchurl, ncurses, pcre, buildPackages }: -stdenv.mkDerivation rec { - pname = "zsh"; +let version = "5.8"; - src = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; - }; - documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; }; +in + +stdenv.mkDerivation { + pname = "zsh"; + inherit version; + + src = fetchurl { + url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; + sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; + }; buildInputs = [ ncurses pcre ]; diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix index ae0e5b89a61..b3b5233564a 100644 --- a/pkgs/tools/X11/runningx/default.nix +++ b/pkgs/tools/X11/runningx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 ]; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' cc -O2 -o RunningX $(pkg-config --cflags --libs x11) $src diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 5bd9c95d3a5..f461a5c30ed 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,23 +21,23 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0viiwimnk26jfi4ypkvclqqxw8anlmch10zscjw69d8x1pyqczcd"; + sha256 = "1h02pywzjn2d4p07xic1936w5qjbaz33qny8afrgzvgbqnqx7dvs"; }; aarch64-darwin = { url = "${baseUrl}/${name}-darwin-arm.tar.gz"; - sha256 = "sha256-EZbJgMzEZScvaqSKay5aDuayVaIK1zZUzqAHgT0czZk="; + sha256 = "0qrmrxzphslhq3xf01zh91v7fvqn0z4hv8rpd15qwq9q84d2c3gr"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "11113l8pyhq6vbsh79m5anh6ljss94zhnp33ghds9rn1gxa83hnb"; + sha256 = "0lz14d9gs6k0zbnyvrl6zyj8w7f6a5z7q95y48jkizc822rajhc3"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "347.0.0"; + version = "348.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 4021bc92e06..f3f7b32e119 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { homepage = "https://theunarchiver.com"; description = "An archive unpacker program"; longDescription = '' - The Unarchiver is an archive unpacker program with support for the popular \ - zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, \ - and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, \ - Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \ + The Unarchiver is an archive unpacker program with support for the popular + zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, + and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, + Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; license = licenses.lgpl21Plus; maintainers = with maintainers; [ peterhoeg ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index e9409221069..57d35633128 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, gtk3, pkg-config, intltool, libxslt, makeWrapper, - coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: + coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { version = "0.5.4.17"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/xarchiver \ - --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]} + --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unar gnutar bzip2 gzip lhasa coreutils ]} ''; meta = { diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index c289c3938ab..e36e20902df 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - phases = ["installPhase"]; + dontUnpack = true; installPhase = let env = bundlerEnv { diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index 257de05a898..26a9b3e24bd 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ python2Packages.python python2Packages.wrapPython ]; pythonPath = [ python2Packages.numpy python2Packages.opencv4 ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + dontConfigure = true; patchPhase = '' substituteInPlace facedetect \ diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 6c4160b06e3..93e13996f7f 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.17"; + version = "0.1.20"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xq2UjeZiKy9BjNQ9xnC7tppEwrEtg8ZN5BVDz1bUOmw="; + sha256 = "sha256-2CzpPzUylzDiP9rbjneRR6joa9UEgnDfJ4Ffa/orhkk="; }; - cargoSha256 = "sha256-Bf3fYHhpoX05AmTdwwdRU2YRfGVb1EmaGDm75i+Vs2w="; + cargoSha256 = "sha256-xDh7SF73Qnx/GeW43JDmF+qeljSHbWWq4unWdTmAO+c="; doInstallCheck = true; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index beedabe34ae..93f65f45d37 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -8,6 +8,7 @@ , Security , ansi2html , installShellFiles +, fetchpatch }: rustPlatform.buildRustPackage rec { @@ -21,6 +22,14 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-aJ7rL+EKa5zWmCmekVuRmdeOwTmVo0IQ+GJ8Ga4iTI0="; }; + patches = [ + # detect wezterm through TERM again which was removed in 0.23.1 + (fetchpatch { + url = "https://github.com/lunaryorn/mdcat/commit/a897b223904748a47c277f7c9a07d59e7d5c916b.patch"; + sha256 = "sha256-tSeNyrlqoGvlfQ3xMRkvqZ7HajMvPCIk7kyt/sVjmTo="; + }) + ]; + nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index e5b3f59db8c..e748515b051 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -1,30 +1,21 @@ -{ fetchurl, lib, stdenv, perl }: +{ fetchurl, lib, stdenv, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "namazu-2.0.21"; + pname = "namazu"; + version = "2.0.21"; src = fetchurl { - url = "http://namazu.org/stable/${name}.tar.gz"; + url = "http://namazu.org/stable/${pname}-${version}.tar.gz"; sha256 = "1xvi7hrprdchdpzhg3fvk4yifaakzgydza5c0m50h1yvg6vay62w"; }; - buildInputs = [ perl ]; + buildInputs = [ perl perlPackages.FileMMagic ]; + nativeBuildInputs = [ makeWrapper ]; - # First install the `File::MMagic' Perl module. - preConfigure = '' - ( cd File-MMagic && \ - perl Makefile.PL \ - LIB="$out/${perl.libPrefix}/${perl.version}" \ - INSTALLSITEMAN3DIR="$out/man" && \ - make && make install ) - export PERL5LIB="$out/${perl.libPrefix}/${perl.version}:$PERL5LIB" + postInstall = '' + wrapProgram $out/bin/mknmz --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.FileMMagic ]} ''; - # FIXME: The `tests/namazu-6' test fails on GNU/Linux, presumably because - # phrase searching is broken somehow. However, it doesn't fail on other - # platforms. - doCheck = !stdenv.isLinux; - meta = { description = "Full-text search engine"; @@ -39,6 +30,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; - broken = true; # File-MMagic is not compatible with our Perl version }; } diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 8b9cd18cd0a..1945e56b96e 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -1,23 +1,23 @@ -{ python2Packages, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -with python2Packages; - -buildPythonApplication rec { +buildGoModule rec { pname = "cloudmonkey"; - version = "5.3.3"; + version = "6.1.0"; - propagatedBuildInputs = [ argcomplete pygments ]; + src = fetchFromGitHub { + owner = "apache"; + repo = "cloudstack-cloudmonkey"; + rev = version; + sha256 = "sha256-OmVM6ayrtrLl+PADnkUnrssbsq1GZp2KiMBOXPgfi5Y="; + }; - doCheck = false; # upstream has no tests defined + runVend = true; - src = fetchPypi { - inherit pname version; - sha256 = "064yk3lwl272nyn20xxrh0qxzh3r1rl9015qqf2i4snqdzwd5cf7"; - }; + vendorSha256 = null; meta = with lib; { description = "CLI for Apache CloudStack"; - homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI"; + homepage = "https://github.com/apache/cloudstack-cloudmonkey"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e08de58269d..1c3366e81d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27934,6 +27934,8 @@ in wofi = callPackage ../applications/misc/wofi { }; + wofi-emoji = callPackage ../applications/misc/wofi-emoji { }; + wordnet = callPackage ../applications/misc/wordnet { inherit (darwin.apple_sdk.frameworks) Cocoa; }; |