git.iko.soy/typeable/nixpkgs
on master help sign in
Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: pkgs/development/tools/rust/cargo-expand/default.nix pkgs/tools/misc/blflash/default.nix

commit7507aed4e17fa6dd69626ae477c4f8d0ebe1eada authorJonathan Ringer <jonringer117@gmail.com> dateFri 21 May 2021, 19:49 (5 years ago) parent901fb5e422e6e5
18 files changed+69−68
pkgs/applications/audio/ardour/default.nix+6−6 pkgs/applications/audio/linuxsampler/default.nix+2−2 pkgs/applications/networking/browsers/brave/default.nix+2−2 pkgs/applications/networking/cluster/cni/default.nix+2−2 pkgs/applications/networking/cluster/kubelogin-oidc/default.nix+3−3 pkgs/development/libraries/grpc/default.nix+2−2 pkgs/development/python-modules/grpcio-tools/default.nix+2−2 pkgs/development/tools/bazelisk/default.nix+3−3 pkgs/development/tools/hobbes/default.nix+2−1 pkgs/development/tools/rust/cargo-expand/default.nix+3−3 pkgs/games/ckan/default.nix+2−2 pkgs/misc/vim-plugins/generated.nix+27−15 pkgs/misc/vim-plugins/vim-plugin-names+1 pkgs/servers/calibre-web/default.nix+2−1 pkgs/tools/misc/blflash/default.nix+3−3 pkgs/tools/networking/burpsuite/default.nix+2−2 pkgs/tools/text/gpt2tc/0002-fix-download-url.patch−11 pkgs/tools/text/gpt2tc/default.nix+5−8
pkgs/applications/audio/ardour/default.nix+6−6
@@ -8,7 +8,7 @@
88, curl
99, dbus
1010, doxygen
11−, ffmpeg_3
11+, ffmpeg
1212, fftw
1313, fftwSinglePrec
1414, flac
@@ -56,13 +56,13 @@
5656}:
5757stdenv.mkDerivation rec {
5858 pname = "ardour";
59− version = "6.5";
59+ version = "6.7";
6060
6161 # don't fetch releases from the GitHub mirror, they are broken
6262 src = fetchgit {
6363 url = "git://git.ardour.org/ardour/ardour.git";
6464 rev = version;
65− sha256 = "0sd38hchyr16biq9hcxha4ljy3pf0yhcgn90i5zfqcznnc57ildx";
65+ sha256 = "19jc29fjwgvqbg3gnmy50mrz8mh5x4nwddglasvwx83nc87qwllx";
6666 };
6767
6868 patches = [
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
8989 cppunit
9090 curl
9191 dbus
92− ffmpeg_3
92+ ffmpeg
9393 fftw
9494 fftwSinglePrec
9595 flac
@@ -148,8 +148,8 @@ stdenv.mkDerivation rec {
148148 sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
149149 patchShebangs ./tools/
150150 substituteInPlace libs/ardour/video_tools_paths.cc \
151− --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg_3}/bin/ffmpeg");' \
152− --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg_3}/bin/ffprobe");'
151+ --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
152+ --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
153153 '';
154154
155155 postInstall = ''
pkgs/applications/audio/linuxsampler/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "linuxsampler";
6− version = "2.1.1";
6+ version = "2.2.0";
77
88 src = fetchurl {
99 url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
10− sha256 = "1gijf50x5xbpya5dj3v2mzj7azx4qk9p012csgddp73f0qi0n190";
10+ sha256 = "sha256-xNFjxrrC0B8Oj10HIQ1AmI7pO34HuYRyyUaoB2MDmYw=";
1111 };
1212
1313 preConfigure = ''
pkgs/applications/networking/browsers/brave/default.nix+2−2
@@ -90,11 +90,11 @@ in
9090
9191stdenv.mkDerivation rec {
9292 pname = "brave";
93− version = "1.24.85";
93+ version = "1.24.86";
9494
9595 src = fetchurl {
9696 url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
97− sha256 = "jE9INGYz78Vyvps4ESimtH1rL4GdboAUtMx1p31XQGk=";
97+ sha256 = "VKUs8PPyAbuH91Zck0QTiFCEUOMDlLT4Itv4MXi4Ygg=";
9898 };
9999
100100 dontConfigure = true;
pkgs/applications/networking/cluster/cni/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoPackage rec {
44 pname = "cni";
5− version = "0.8.0";
5+ version = "0.8.1";
66
77 src = fetchFromGitHub {
88 owner = "containernetworking";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "16i59dhiq7pc7qs32cdk4yv4w9rjx4vvlw7fb6a6jhq6hxxjrgiw";
11+ sha256 = "sha256-vxwNHIc3rFi7HKIEZrBcr7Oxs2iUtFYcfJK7aXDUv3k=";
1212 };
1313
1414 goPackagePath = "github.com/containernetworking/cni";
pkgs/applications/networking/cluster/kubelogin-oidc/default.nix+3−3
@@ -2,18 +2,18 @@
22
33buildGoModule rec {
44 pname = "kubelogin";
5− version = "1.23.1";
5+ version = "1.23.2";
66
77 src = fetchFromGitHub {
88 owner = "int128";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-YK/QGx6QzSeyeZ61KgdYO3POJQFK1F6yJayd2gcRWS4=";
11+ sha256 = "sha256-Vj7qk1x4d94GgthmHhWbQvsfnZE1UL3Bdk5zjAb3vWs=";
1212 };
1313
1414 subPackages = ["."];
1515
16− vendorSha256 = "sha256-tnjgs8Ziqdo1ciVOWtL0D8puv2SZGqSHgo2SV7N8F0M=";
16+ vendorSha256 = "sha256-JsBseRIbStsX44rLsGAERFUSWUuLcNycRDAcOMconnE=";
1717
1818 # Rename the binary instead of symlinking to avoid conflict with the
1919 # Azure version of kubelogin
pkgs/development/libraries/grpc/default.nix+2−2
@@ -3,13 +3,13 @@
33}:
44
55stdenv.mkDerivation rec {
6− version = "1.37.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
6+ version = "1.38.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
77 pname = "grpc";
88 src = fetchFromGitHub {
99 owner = "grpc";
1010 repo = "grpc";
1111 rev = "v${version}";
12− sha256 = "0mjlz2cax5v37g7xnrbf5px88bm7xzl4a5pds112yk096d7wmxm5";
12+ sha256 = "0an903nh8lz3xlf79zsh2v55nrwnjzzavkjlrsl7j9aysgwmgn4r";
1313 fetchSubmodules = true;
1414 };
1515 patches = [
pkgs/development/python-modules/grpcio-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "grpcio-tools";
5− version = "1.37.1";
5+ version = "1.38.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "d775fb07cc6561174d6c86d11727a156c4ade969f7bf5edf623ffe2a428bee4e";
9+ sha256 = "c609678cf6faf4b467259757f848de4fbc7baca3c1e3f7b0e55c701c50fd94ae";
1010 };
1111
1212 outputs = [ "out" "dev" ];
pkgs/development/tools/bazelisk/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "bazelisk";
5− version = "1.8.1";
5+ version = "1.9.0";
66
77 src = fetchFromGitHub {
88 owner = "bazelbuild";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-w2YCqFkZLsTddj9OPOIdFPgXcXapCGWkc5RaH7RHg24=";
11+ sha256 = "sha256-APHRNCJNQ4cheY+wBB8q4fcOOL6SFeg5SflvnrxjYhI=";
1212 };
1313
14− vendorSha256 = "sha256-IkW13y51NhKflAeHLu8k7DxRqYVnfMHSnfFuT6H/flo=";
14+ vendorSha256 = "sha256-+B+5GQTEiCwLCoGB5uIIJEWJRjylgt9txcsJCXcOAQs=";
1515
1616 doCheck = false;
1717
pkgs/development/tools/hobbes/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }:
1+{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib, libxml2 }:
22
33stdenv.mkDerivation {
44 name = "hobbes";
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
2020 ncurses
2121 readline
2222 zlib
23+ libxml2
2324 ];
2425
2526 doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R.
pkgs/development/tools/rust/cargo-expand/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-expand";
5− version = "1.0.6";
5+ version = "1.0.7";
66
77 src = fetchFromGitHub {
88 owner = "dtolnay";
99 repo = pname;
1010 rev = version;
11− sha256 = "sha256-6FjFG4RYvmsV/W7OMxj1ZWvruwUeP9Nvsdiv8toZmTk=";
11+ sha256 = "sha256-8YppfgYa5Sd/3nPCMCgaM3A93ND0vU5eUoCW02uDkiM=";
1212 };
1313
14− cargoSha256 = "sha256-C9lpA2n7EI7Ga3Nnj80dkvbZmqjuxf0wjoQUEr0N8FE=";
14+ cargoSha256 = "sha256-0lrz8awAtLuLWE6Prmi07iGfYVmNZIETv3QL55CPYHQ=";
1515
1616 buildInputs = lib.optional stdenv.isDarwin libiconv;
1717
pkgs/games/ckan/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "ckan";
5− version = "1.30.0";
5+ version = "1.30.2";
66
77 src = fetchurl {
88 url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
9− sha256 = "sha256-wih5NRzeOy4WMXQ3yV9W/m2x7B2C5T0F78TbpsngigQ=";
9+ sha256 = "sha256-ggmUsJb3xKpI3ygTmzR5f3na/oU4OEa3r3edjlN5R+Q=";
1010 };
1111
1212 dontUnpack = true;
pkgs/misc/vim-plugins/generated.nix+27−15
@@ -327,6 +327,18 @@ final: prev:
327327 meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/";
328328 };
329329
330+ bracey-vim = buildVimPluginFrom2Nix {
331+ pname = "bracey-vim";
332+ version = "2021-05-11";
333+ src = fetchFromGitHub {
334+ owner = "turbio";
335+ repo = "bracey.vim";
336+ rev = "457933c107db65ff7e2695e07209a9a2934544b7";
337+ sha256 = "1x8c8l9x4i9n2rlh3a8zha0ni85v04p32w7yciwxp7ddlwzf3lwh";
338+ };
339+ meta.homepage = "https://github.com/turbio/bracey.vim/";
340+ };
341+
330342 brainfuck-vim = buildVimPluginFrom2Nix {
331343 pname = "brainfuck-vim";
332344 version = "2021-01-28";
@@ -405,8 +417,8 @@ final: prev:
405417 src = fetchFromGitHub {
406418 owner = "ms-jpq";
407419 repo = "chadtree";
408− rev = "a54a87e651ca985b0d10e293f824f3493778b64e";
409− sha256 = "1cn1knxldl0qqv8p125fqa1fpn3n7cfq7lw9nfj8giaxpr8bag7f";
420+ rev = "6769987c13e313497e0fe98a59ccee0e70388927";
421+ sha256 = "1xaddhij0f652rx2k5iar8892ly84nslw8j74l7srfxs7l91kpyi";
410422 };
411423 meta.homepage = "https://github.com/ms-jpq/chadtree/";
412424 };
@@ -1895,12 +1907,12 @@ final: prev:
18951907
18961908 hologram-nvim = buildVimPluginFrom2Nix {
18971909 pname = "hologram-nvim";
1898− version = "2021-05-20";
1910+ version = "2021-05-21";
18991911 src = fetchFromGitHub {
19001912 owner = "edluffy";
19011913 repo = "hologram.nvim";
1902− rev = "7466e360040f14a828fe07cfa7fb6089d50f618e";
1903− sha256 = "1gjns7dkyzl8yj0vq3103r0f6wjk1fjryz7xa8gi67rchbrxrls4";
1914+ rev = "593a458d04f7457669280373d98e41195c106d13";
1915+ sha256 = "0diq42zdr9l8qw198c5y4jy5siab3cwh4ncsb5z111m28n6a6i5c";
19041916 };
19051917 meta.homepage = "https://github.com/edluffy/hologram.nvim/";
19061918 };
@@ -2628,12 +2640,12 @@ final: prev:
26282640
26292641 mkdx = buildVimPluginFrom2Nix {
26302642 pname = "mkdx";
2631− version = "2021-05-01";
2643+ version = "2021-05-21";
26322644 src = fetchFromGitHub {
26332645 owner = "SidOfc";
26342646 repo = "mkdx";
2635− rev = "84c9a59087e74d6bd7761cd4a920d9390c2a65f9";
2636− sha256 = "0qf4q5yh5f9kzxc96aq925ppj304hjnb4xxzjijc38jpvsmchjba";
2647+ rev = "b45099a18e88cd61c93a073e2b15cc6025e4774e";
2648+ sha256 = "0yawlfnghbkr3bcqqcf3znsdjjbh13a46dhkn4sj108adc9c4y56";
26372649 };
26382650 meta.homepage = "https://github.com/SidOfc/mkdx/";
26392651 };
@@ -3148,8 +3160,8 @@ final: prev:
31483160 src = fetchFromGitHub {
31493161 owner = "mcchrish";
31503162 repo = "nnn.vim";
3151− rev = "cf62f64c8ec1e92fb8e46c23e3b89d8621551e4b";
3152− sha256 = "0c49170891ar7439fyp1phki46pyw8iinszpyaj0gf0pwmqhsdhg";
3163+ rev = "065bf84b0b86266b267adfc2584e67eabef49815";
3164+ sha256 = "1v2jckl4gaai77rqnv1hwv4bb0d6vyk7hy63nlyy3fcnc1z1ic8v";
31533165 };
31543166 meta.homepage = "https://github.com/mcchrish/nnn.vim/";
31553167 };
@@ -3396,12 +3408,12 @@ final: prev:
33963408
33973409 nvim-lspconfig = buildVimPluginFrom2Nix {
33983410 pname = "nvim-lspconfig";
3399− version = "2021-05-19";
3411+ version = "2021-05-21";
34003412 src = fetchFromGitHub {
34013413 owner = "neovim";
34023414 repo = "nvim-lspconfig";
3403− rev = "d23816b7b00028375e53dba2aa30f2b56573cf54";
3404− sha256 = "0m5fgjjks15vzqscgvl9m2di8clxizc8ky3lwlw9j8m4zy8jh8kw";
3415+ rev = "2f26391ccf88cd4adff8f11e96412a3536624bd7";
3416+ sha256 = "0y8r879lcpwjnk9rcrafkdh59gcxzpvid0rm80db22vpp6a9l9rq";
34053417 };
34063418 meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
34073419 };
@@ -7559,8 +7571,8 @@ final: prev:
75597571 src = fetchFromGitHub {
75607572 owner = "ojroques";
75617573 repo = "vim-oscyank";
7562− rev = "fc88da94f3cd85e0e44778484b678c4d144275fe";
7563− sha256 = "0flc8lxmhv99bisxxip5f6p4196i5215f5fa86mmqs6anff5pfyr";
7574+ rev = "20fade09069cd35602387c2e7d2a7cd0f6cff8b0";
7575+ sha256 = "1ym87hd85l67976dxk919mdwab8fi8iq8azqk4mpa75gzl2ia7wl";
75647576 };
75657577 meta.homepage = "https://github.com/ojroques/vim-oscyank/";
75667578 };
pkgs/misc/vim-plugins/vim-plugin-names+1
@@ -684,6 +684,7 @@ travitch/hasksyn
684684tremor-rs/tremor-vim@main
685685triglav/vim-visual-increment
686686troydm/zoomwintab.vim
687+turbio/bracey.vim
687688tversteeg/registers.nvim@main
688689tweekmonster/wstrip.vim
689690twerth/ir_black
pkgs/servers/calibre-web/default.nix+2−1
@@ -21,7 +21,8 @@ python3.pkgs.buildPythonApplication rec {
2121 --replace "singledispatch>=3.4.0.0,<3.5.0.0" "" \
2222 --replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \
2323 --replace "unidecode>=0.04.19,<1.2.0" "unidecode>=0.04.19" \
24− --replace "cps = calibreweb:main" "calibre-web = calibreweb:main"
24+ --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
25+ --replace "Babel>=1.3, <2.9" "Babel>=1.3, <=2.9"
2526 '';
2627
2728 patches = [
pkgs/tools/misc/blflash/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "blflash";
5− version = "0.3.2";
5+ version = "0.3.3";
66
77 src = fetchFromGitHub {
88 owner = "spacemeowx2";
99 repo = "blflash";
1010 rev = "v${version}";
11− sha256 = "sha256-+2ncK1ibtQwlBREw4Yiqj4vFvAcZqjkoTBtBdAAUoRg=";
11+ sha256 = "sha256-hPScmivtugtZm848Itzg4Tb9rppZny+rKi3IBuUxxQY=";
1212 };
1313
14− cargoSha256 = "sha256-hgymSNivcNT9aXws20sBrk76ToDnCQh/dqfUHBzK1Ls=";
14+ cargoSha256 = "sha256-/y3R8B2TOf8jeB9tcewoA9EGN6kj/EPMTjU6rfTF5Vc=";
1515
1616 meta = with lib; {
1717 description = "An bl602 serial flasher written in Rust";
pkgs/tools/networking/burpsuite/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "burpsuite";
5− version = "2021.4.2";
5+ version = "2021.5.1";
66
77 src = fetchurl {
88 name = "burpsuite.jar";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
1111 "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
1212 ];
13− sha256 = "034c9d0a7e0b5e7b1b286949c6b31b475ff2a15e75f1230ccc07e236fc61d2aa";
13+ sha256 = "sha256-nPz6IZpXCyg6cg2nuyqK2f5BI4dNb5tA2NriH3ZC198=";
1414 };
1515
1616 dontUnpack = true;
pkgs/tools/text/gpt2tc/0002-fix-download-url.patchdeleted−11
@@ -1,11 +0,0 @@
1−diff --git a/download_model.sh b/download_model.sh
2−index 9cb401f..ad1dc62 100755
3−--- a/download_model.sh
4−+++ b/download_model.sh
5−@@ -13,5 +13,5 @@ mkdir -p models/$model
6− for filename in checkpoint encoder.json hparams.json model.ckpt.data-00000-of-00001 model.ckpt.index model.ckpt.meta vocab.bpe; do
7− fetch=$model/$filename
8− echo "Fetching $fetch"
9−- curl --output models/$fetch https://storage.googleapis.com/gpt-2/models/$fetch
10−+ curl --output models/$fetch https://openaipublic.blob.core.windows.net/gpt-2/models/$fetch
11− done
pkgs/tools/text/gpt2tc/default.nix+5−8
@@ -2,20 +2,17 @@
22
33stdenv.mkDerivation rec {
44 pname = "gpt2tc";
5− version = "2020-12-30";
5+ version = "2021-04-24";
66
77 src = fetchurl {
8− url = "https://bellard.org/nncp/gpt2tc-${version}.tar.gz";
9− hash = "sha256-KFcl7E6iGx50JaJI1jwzKAdkrkbNngPbrEA/ZSyG+uY=";
8+ url = "https://bellard.org/libnc/gpt2tc-${version}.tar.gz";
9+ hash = "sha256-kHnRziSNRewifM/oKDQwG27rXRvntuUUX8M+PUNHpA4=";
1010 };
1111
1212 patches = [
1313 # Add a shebang to the python script so that nix detects it as such and
1414 # wraps it properly. Otherwise, it runs in shell and freezes the system.
1515 ./0001-add-python-shebang.patch
16−
17− # Update the source URL for the models because the old one is down.
18− ./0002-fix-download-url.patch
1916 ];
2017
2118 nativeBuildInputs = [ autoPatchelfHook ];
@@ -24,11 +21,11 @@ stdenv.mkDerivation rec {
2421 (python3.withPackages (p: with p; [ numpy tensorflow ]))
2522 ];
2623
27− dontBuild = true;
28−
2924 installPhase = ''
3025 runHook preInstall
3126
27+ install -D -m755 -t $out/lib libnc${stdenv.hostPlatform.extensions.sharedLibrary}
28+ addAutoPatchelfSearchPath $out/lib
3229 install -D -m755 -t $out/bin gpt2tc
3330 install -T -m755 download_model.sh $out/bin/gpt2-download-model
3431 install -T -m755 gpt2convert.py $out/bin/gpt2-convert