diff options
Diffstat (limited to 'nixpkgs/pkgs/misc')
162 files changed, 1237 insertions, 760 deletions
diff --git a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix index ead87f6fab43..664fa8fcb88d 100644 --- a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix +++ b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix @@ -48,7 +48,7 @@ let enableParallelBuilding = false; meta = with lib; { - homepage = https://github.com/ARM-software/arm-trusted-firmware; + homepage = "https://github.com/ARM-software/arm-trusted-firmware"; description = "A reference implementation of secure world software for ARMv8-A"; license = licenses.bsd3; maintainers = [ maintainers.lopsided98 ]; diff --git a/nixpkgs/pkgs/misc/base16-shell-preview/default.nix b/nixpkgs/pkgs/misc/base16-shell-preview/default.nix index 72b7de3b9a27..15e0596e4103 100644 --- a/nixpkgs/pkgs/misc/base16-shell-preview/default.nix +++ b/nixpkgs/pkgs/misc/base16-shell-preview/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Browse and preview Base16 Shell themes in your terminal"; - homepage = https://github.com/nvllsvm/base16-shell-preview; + homepage = "https://github.com/nvllsvm/base16-shell-preview"; license = licenses.mit; maintainers = [ maintainers.rencire ]; }; diff --git a/nixpkgs/pkgs/misc/beep/default.nix b/nixpkgs/pkgs/misc/beep/default.nix index b98560992e33..40a8849ba3f1 100644 --- a/nixpkgs/pkgs/misc/beep/default.nix +++ b/nixpkgs/pkgs/misc/beep/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "beep-1.3"; src = fetchurl { - url = http://www.johnath.com/beep/beep-1.3.tar.gz; + url = "http://www.johnath.com/beep/beep-1.3.tar.gz"; sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { description = "The advanced PC speaker beeper"; - homepage = http://www.johnath.com/beep/; + homepage = "http://www.johnath.com/beep/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/misc/calaos/installer/default.nix b/nixpkgs/pkgs/misc/calaos/installer/default.nix index 618bc6d85059..81f00d59f698 100644 --- a/nixpkgs/pkgs/misc/calaos/installer/default.nix +++ b/nixpkgs/pkgs/misc/calaos/installer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Calaos Installer, a tool to create calaos configuration"; - homepage = https://www.calaos.fr/; + homepage = "https://www.calaos.fr/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ tiramiseb ]; diff --git a/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix b/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix index 6534d300e824..3151bace5587 100644 --- a/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix +++ b/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; - homepage = http://www.freedesktop.org/wiki/Software/cups-pk-helper/; + homepage = "http://www.freedesktop.org/wiki/Software/cups-pk-helper/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/misc/cups/default.nix b/nixpkgs/pkgs/misc/cups/default.nix index 6786623fee3e..f229ced8936d 100644 --- a/nixpkgs/pkgs/misc/cups/default.nix +++ b/nixpkgs/pkgs/misc/cups/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://cups.org/; + homepage = "https://cups.org/"; description = "A standards-based printing system for UNIX"; license = licenses.gpl2; # actually LGPL for the library and GPL for the rest maintainers = with maintainers; [ matthewbauer ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index 4464b5ba11b3..5faf6a2198b6 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 CUPS wrapper driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 2df3cfe67334..985de63637c6 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 LPR driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfreeRedistributable; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix index bf0f4ef82799..141e3f9e6123 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brlaser"; - version = "5"; + version = "6"; src = fetchFromGitHub { owner = "pdewacht"; repo = "brlaser"; rev = "v${version}"; - sha256 = "133fx49wkg1v8r4kcishd035hlsscv8kc2q4jnln5qmyhpyygjyy"; + sha256 = "1995s69ksq1fz0vb34v0ndiqncrinbrlpmp70rkl6az7kag99s80"; }; nativeBuildInputs = [ cmake ]; @@ -34,13 +34,19 @@ stdenv.mkDerivation rec { Brother DCP-7065DN Brother DCP-7080 Brother DCP-L2500D + Brother DCP-L2520D Brother DCP-L2540DW - Brother HL-1110 series - Brother HL-1200 series - Brother HL-L2300D series - Brother HL-L2320D series - Brother HL-L2340D series - Brother HL-L2360D series + Brother HL-1110 + Brother HL-1200 + Brother HL-2030 + Brother HL-2140 + Brother HL-2220 + Brother HL-2270DW + Brother HL-5030 + Brother HL-L2300D + Brother HL-L2320D + Brother HL-L2340D + Brother HL-L2360D Brother MFC-1910W Brother MFC-7240 Brother MFC-7360N @@ -49,7 +55,7 @@ stdenv.mkDerivation rec { Brother MFC-L2710DW Lenovo M7605D ''; - homepage = https://github.com/pdewacht/brlaser; + homepage = "https://github.com/pdewacht/brlaser"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ StijnDW ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index f101ffef95b5..de93a5a7f8bb 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -47,7 +47,7 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.steveej ]; @@ -79,7 +79,7 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.steveej ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix b/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix index adc4ead94b79..dbc6390ef498 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/canon/default.nix @@ -216,7 +216,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "CUPS Linux drivers for Canon printers"; - homepage = http://www.canon.com/; + homepage = "http://www.canon.com/"; license = licenses.unfree; maintainers = with maintainers; [ kylesferrazza diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 364a7336bf30..323163bed331 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series."; - homepage = http://support-th.canon-asia.com/contents/TH/EN/0100712901.html; + homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index a09311a8292d..2cb3fe01ddb6 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series. (MP520 drivers also work for MX700.)"; - homepage = http://support-asia.canon-asia.com/content/EN/0100084101.html; + homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ jerith666 ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 8866b425ca8f..679d89069948 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series."; - homepage = https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072; + homepage = "https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ chpatrick ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 0c91b782117d..e9fac1c73e2f 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { BJNP protocol. This back-end allows Cups to print over the network to a Canon printer. The design is based on reverse engineering of the protocol. ''; - homepage = http://cups-bjnp.sourceforge.net; + homepage = "http://cups-bjnp.sourceforge.net"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix b/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix index c2b912007d88..eccbae601043 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS Linux drivers and SDK for DYMO printers"; - homepage = http://www.dymo.com/; + homepage = "http://www.dymo.com/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix b/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix index ad8b0089a871..9aaae31488d3 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "7.89"; src = fetchurl { - url = http://business.toshiba.com/downloads/KB/f1Ulds/15178/TOSHIBA_ColorMFP_CUPS.tar; + url = "http://business.toshiba.com/downloads/KB/f1Ulds/15178/TOSHIBA_ColorMFP_CUPS.tar"; sha256 = "0qz4r7q55i0adf4fv3aqnfqgi2pz3jb1jixkqm9x6nk4vanyjf4r"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation { TOSHIBA e-STUDIO6540C, TOSHIBA e-STUDIO6550C, TOSHIBA e-STUDIO6560C, TOSHIBA e-STUDIO6570C and TOSHIBA e-STUDIO7506AC. ''; - homepage = http://business.toshiba.com/support/downloads/index.html; + homepage = "http://business.toshiba.com/support/downloads/index.html"; license = licenses.unfree; maintainers = [ maintainers.jpotier ]; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index 23651a57df8c..30d737871047 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { DocuCentre-VI C2271/C3370/C3371/C4471/C5571/C6671/C7771 DocuPrint 3205 d/3208 d/3505 d/3508 d/4405 d/4408 d ''; - homepage = https://onlinesupport.fujixerox.com; + homepage = "https://onlinesupport.fujixerox.com"; license = licenses.unfree; maintainers = with maintainers; [ delan ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix index 0dcd518de842..9b612c43a000 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print"; - homepage = http://ccp.niftiestsoftware.com; + homepage = "http://ccp.niftiestsoftware.com"; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix b/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix index 701d4b6a1002..194ef6cc3272 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother HL1110 printer driver"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix b/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix index 001a3c1eac09..9dabf053fd66 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother hl3140cw printer driver"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix b/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix index 653f72a0b610..a291f1662883 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother hl-l2340dw printer driver"; license = licenses.unfree; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 90f9a8e943ab..0a55ee0c8bbf 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -60,11 +60,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother HL-L2390DW combined print driver"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128"; maintainers = [ maintainers.samueldr ]; }; } diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index c7484e6d30b0..23ee927a3bfc 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW CUPS wrapper driver"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; maintainers = [ stdenv.lib.maintainers.yochai ]; }; } diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index befafd855bcf..31b5c1dbd370 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW LPR driver"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; maintainers = [ stdenv.lib.maintainers.yochai ]; }; } diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 4ec9e3fc6c8e..8a5c9644512e 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother MFC-J6510DW CUPS wrapper driver"; license = with licenses; gpl2; platforms = with platforms; linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; maintainers = with maintainers; [ ramkromberg ]; }; } diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index b12ef18e46c4..46ce7abb28e6 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brother MFC-J6510DW LPR driver"; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; - homepage = http://www.brother.com/; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; + homepage = "http://www.brother.com/"; license = with licenses; unfree; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 1673c2d5c5c8..27cb40a9e4fc 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 91110104bc96..24d3e5cab7fd 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN LPR driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = [ "i686-linux" ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index b58e7b4faa44..8a2ce7edf26b 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.xeji ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index b4b16563610a..0dc9eed2ac00 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW lpr driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.xeji ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index f2303a45a2f3..f2143df321cf 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.enzime ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index c2209806724a..74571611b441 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW lpr driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.enzime ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index 50f3b583e42f..d82c0ad9a86a 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 0e088401c0a0..9e3c529e8988 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW LPR printer driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; platforms = [ "i686-linux" ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 8c906db642e1..308be5337d09 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -104,8 +104,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unified Linux Driver for Samsung printers and scanners"; - homepage = http://www.bchemnet.com/suldr; - downloadPage = http://www.bchemnet.com/suldr/driver/; + homepage = "http://www.bchemnet.com/suldr"; + downloadPage = "http://www.bchemnet.com/suldr/driver/"; license = licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix index 9135441a6e7d..b7e75c2a16a9 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -87,8 +87,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unified Linux Driver for Samsung printers and scanners"; - homepage = http://www.bchemnet.com/suldr; - downloadPage = http://www.bchemnet.com/suldr/driver/; + homepage = "http://www.bchemnet.com/suldr"; + downloadPage = "http://www.bchemnet.com/suldr/driver/"; license = licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 5dc397930706..c3c3613bbda8 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; - homepage = http://www.samsung.com/; + homepage = "http://www.samsung.com/"; license = licenses.unfree; platforms = platforms.linux; broken = true; # libscmssc.so and libmfp.so can't find their library dependencies at run-time diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix index f81fa27503fd..755003e4d300 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; - homepage = http://www.samsung.com/; + homepage = "http://www.samsung.com/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ joko ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix b/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix index e227de086de6..c65ca401d60f 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CUPS drivers for SPL (Samsung Printer Language) printers"; - homepage = http://splix.ap2c.org; + homepage = "http://splix.ap2c.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau peti ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix b/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix index 87a023af1ca7..67df20df4911 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "CUPS filter for thermal printer Zjiang ZJ-58"; - homepage = https://github.com/klirichek/zj-58; + homepage = "https://github.com/klirichek/zj-58"; platforms = platforms.linux; maintainers = with maintainers; [ makefu ]; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/misc/cups/filters.nix b/nixpkgs/pkgs/misc/cups/filters.nix index 76f68e507506..217f0c7f0da3 100644 --- a/nixpkgs/pkgs/misc/cups/filters.nix +++ b/nixpkgs/pkgs/misc/cups/filters.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { doCheck = false; # fails 4 out of 6 tests meta = { - homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; + homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/documentation-highlighter/default.nix b/nixpkgs/pkgs/misc/documentation-highlighter/default.nix index a9fbcc178bb8..72f1da6b0de5 100644 --- a/nixpkgs/pkgs/misc/documentation-highlighter/default.nix +++ b/nixpkgs/pkgs/misc/documentation-highlighter/default.nix @@ -2,7 +2,7 @@ runCommand "documentation-highlighter" { meta = { description = "Highlight.js sources for the Nix Ecosystem's documentation."; - homepage = https://highlightjs.org; + homepage = "https://highlightjs.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.grahamc ]; diff --git a/nixpkgs/pkgs/misc/doge/default.nix b/nixpkgs/pkgs/misc/doge/default.nix index 37acfbf4a8ab..37a3b4be7063 100644 --- a/nixpkgs/pkgs/misc/doge/default.nix +++ b/nixpkgs/pkgs/misc/doge/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/thiderman/doge; + homepage = "https://github.com/thiderman/doge"; description = "wow very terminal doge"; license = licenses.mit; maintainers = with maintainers; [ Gonzih ]; diff --git a/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix b/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix index 448bac92ae80..95eb59f7167c 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix @@ -49,7 +49,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://www.openprinting.org/driver/epson-201106w; + homepage = "https://www.openprinting.org/driver/epson-201106w"; description = "Epson printer driver (BX535WD, BX630FW, BX635FWD, ME940FW, NX530, NX635, NX635, SX535WD, WorkForce 545, WorkForce 645"; longDescription = '' This software is a filter program used with the Common UNIX Printing diff --git a/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix index 0cc5537180bd..e06a0c911624 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { drivers = [ pkgs.${name} ]; }; ''; - downloadPage = https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f; + downloadPage = "https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f"; license = with lib.licenses; [ lgpl21 epson ]; maintainers = [ lib.maintainers.jorsn ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix b/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix index fc854c007962..6a9782715d21 100644 --- a/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix @@ -47,7 +47,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://www.openprinting.org/driver/epson-201207w; + homepage = "https://www.openprinting.org/driver/epson-201207w"; description = "Epson printer driver (L110, L210, L300, L350, L355, L550, L555)"; longDescription = '' This software is a filter program used with the Common UNIX Printing diff --git a/nixpkgs/pkgs/misc/drivers/gutenprint/bin.nix b/nixpkgs/pkgs/misc/drivers/gutenprint/bin.nix index 6cf754192f86..4adb96e1299e 100644 --- a/nixpkgs/pkgs/misc/drivers/gutenprint/bin.nix +++ b/nixpkgs/pkgs/misc/drivers/gutenprint/bin.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { name = "cups-gutenprint-binary-5.0.1"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb; + url = "https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb"; sha256 = "0an5gba6r6v54r53s2gj2fjk8fzpl4lrksjas2333528b0k8gbbc"; } else throw "TODO"; # get from openprint.com -> drivers -> gutenprint diff --git a/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix b/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix index 7c8750905d9c..96c0968882d3 100644 --- a/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix +++ b/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ghostscript and cups printer drivers"; - homepage = https://sourceforge.net/projects/gimp-print/; + homepage = "https://sourceforge.net/projects/gimp-print/"; license = licenses.gpl2; platforms = platforms.linux; isGutenprint = true; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix b/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix index 3b03c300db3f..452c2c425c1d 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/3.16.11.nix @@ -181,8 +181,8 @@ python2Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = http://hplipopensource.com/; - downloadPage = https://sourceforge.net/projects/hplip/files/hplip/; + homepage = "http://hplipopensource.com/"; + downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix b/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix index ab1794c12514..80cd39b92334 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix @@ -213,8 +213,8 @@ python2Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = https://developers.hp.com/hp-linux-imaging-and-printing; - downloadPage = https://sourceforge.net/projects/hplip/files/hplip/; + homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; + downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/nixpkgs/pkgs/misc/drivers/hplip/default.nix index 4678442abd99..b1853e28589c 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/default.nix @@ -220,8 +220,8 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = https://developers.hp.com/hp-linux-imaging-and-printing; - downloadPage = https://sourceforge.net/projects/hplip/files/hplip/; + homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; + downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix b/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix index 492488f675f2..cb78bd3498a9 100644 --- a/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix +++ b/nixpkgs/pkgs/misc/drivers/m33-linux/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M3D-Linux; + homepage = "https://github.com/donovan6000/M3D-Linux"; description = "A Linux program that can communicate with the Micro 3D printer"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix b/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix index 2dd32a93219d..e5b3b5bab228 100644 --- a/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix +++ b/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/jgeumlek/MoltenGamepad; + homepage = "https://github.com/jgeumlek/MoltenGamepad"; description = "Flexible Linux input device translator, geared for gamepads"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; diff --git a/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix b/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix index cd322bf8fdb7..74b7c68d38e7 100644 --- a/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.openprinting.org/driver/Postscript-Lexmark/; + homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/"; description = "Lexmark Postscript Drivers"; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix b/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix index b977b2c0c15e..4de6e54cd5fb 100644 --- a/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix +++ b/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/kozec/sc-controller; + homepage = "https://github.com/kozec/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix index 4b19932450ec..ca5607b53072 100644 --- a/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix +++ b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix @@ -27,7 +27,7 @@ buildPythonApplication { meta = with stdenv.lib; { description = "A standalone Steam controller driver"; - homepage = https://github.com/ynsta/steamcontroller; + homepage = "https://github.com/ynsta/steamcontroller"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/drivers/sundtek/default.nix b/nixpkgs/pkgs/misc/drivers/sundtek/default.nix index 5b1641a098df..b94a09782845 100644 --- a/nixpkgs/pkgs/misc/drivers/sundtek/default.nix +++ b/nixpkgs/pkgs/misc/drivers/sundtek/default.nix @@ -46,6 +46,6 @@ in maintainers = [ maintainers.simonvandel ]; platforms = platforms.unix; license = licenses.unfree; - homepage = https://support.sundtek.com/index.php/topic,1573.0.html; + homepage = "https://support.sundtek.com/index.php/topic,1573.0.html"; }; } diff --git a/nixpkgs/pkgs/misc/drivers/utsushi/default.nix b/nixpkgs/pkgs/misc/drivers/utsushi/default.nix index ad7659d060a3..294bb8a0203e 100644 --- a/nixpkgs/pkgs/misc/drivers/utsushi/default.nix +++ b/nixpkgs/pkgs/misc/drivers/utsushi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2 -, imagemagick, sane-backends, tesseract4, udev, libusb}: +, imagemagick, sane-backends, tesseract4, udev, libusb1}: stdenv.mkDerivation rec { pname = "utsushi"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { imagemagick sane-backends udev.dev - libusb.dev + libusb1.dev ]; NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable"; diff --git a/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix b/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix index e2f2bcc2f24b..eb0511b0c4ec 100644 --- a/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix +++ b/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation { }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ]; + nativeBuildInputs = [ pkgconfig scons.py2 ]; + buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; meta = with stdenv.lib; { - homepage = https://pingus.seul.org/~grumbel/xboxdrv/; + homepage = "https://pingus.seul.org/~grumbel/xboxdrv/"; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; maintainers = [ ]; diff --git a/nixpkgs/pkgs/misc/drivers/xow/default.nix b/nixpkgs/pkgs/misc/drivers/xow/default.nix new file mode 100644 index 000000000000..8702c480457d --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/xow/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, libusb1 }: + +stdenv.mkDerivation rec { + pname = "xow"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "medusalix"; + repo = "xow"; + rev = "v${version}"; + sha256 = "1xkwcx2gqip9v2h3zjmrn7sgcck3midl5alhsmr3zivgdipamynv"; + }; + + makeFlags = [ + "BUILD=RELEASE" + "VERSION=${version}" + "BINDIR=${placeholder ''out''}/bin" + "UDEVDIR=${placeholder ''out''}/lib/udev/rules.d" + "MODLDIR=${placeholder ''out''}/lib/modules-load.d" + "MODPDIR=${placeholder ''out''}/lib/modprobe.d" + "SYSDDIR=${placeholder ''out''}/lib/systemd/system" + ]; + enableParallelBuilding = true; + buildInputs = [ libusb1 ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/medusalix/xow"; + description = "Linux driver for the Xbox One wireless dongle"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.jansol ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/misc/drivers/xp-pen-g430/default.nix b/nixpkgs/pkgs/misc/drivers/xp-pen-g430/default.nix new file mode 100644 index 000000000000..c382239f26a6 --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/xp-pen-g430/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }: +stdenv.mkDerivation rec { + pname = "xp-pen-G430"; + version = "20190820"; + + src = fetchzip { + url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip"; + sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby"; + } + /Linux_Pentablet_V1.3.0.0.tar.gz; + + nativeBuildInputs = [ + autoPatchelfHook + wrapQtAppsHook + ]; + + buildInputs = [ + libusb1 + libX11 + libXtst + qtbase + libglvnd + stdenv.cc.cc.lib + ]; + + installPhase = '' + mkdir -p $out/bin + cp {Pentablet_Driver,config.xml} "$out"/bin + ''; + + meta = with stdenv.lib; { + homepage = "https://www.xp-pen.com/download-46.html"; + description = "Driver for the XP-PEN G430 drawing tablet"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix b/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix index a21584afa4c2..3b7b42990af4 100644 --- a/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix +++ b/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-doxygen=no" ]; meta = { - homepage = http://dvdhrm.github.io/xwiimote; + homepage = "http://dvdhrm.github.io/xwiimote"; description = "Userspace utilities to control connected Nintendo Wii Remotes"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/nixpkgs/pkgs/misc/emulators/atari++/default.nix b/nixpkgs/pkgs/misc/emulators/atari++/default.nix index 2e6ccd0a4918..80765f458f80 100644 --- a/nixpkgs/pkgs/misc/emulators/atari++/default.nix +++ b/nixpkgs/pkgs/misc/emulators/atari++/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: -with stdenv.lib; stdenv.mkDerivation rec{ pname = "atari++"; - version = "1.81"; + version = "1.83"; src = fetchurl { - url = "http://www.xl-project.com/download/atari++_${version}.tar.gz"; - sha256 = "1sv268dsjddirhx47zaqgqiahy6zjxj7xaiiksd1gjvs4lvf3cdg"; + url = "http://www.xl-project.com/download/${pname}_${version}.tar.gz"; + sha256 = "04fm2ic2qi4a52mi72wcaxyrpll4k8vvchx3qrik8rhg3jrxgm47"; }; buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ]; @@ -16,8 +15,8 @@ stdenv.mkDerivation rec{ patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++" ''; - meta = { - homepage = http://www.xl-project.com/; + meta = with stdenv.lib; { + homepage = "http://www.xl-project.com/"; description = "An enhanced, cycle-accurated Atari emulator"; longDescription = '' The Atari++ Emulator is a Unix based emulator of the Atari eight diff --git a/nixpkgs/pkgs/misc/emulators/atari800/default.nix b/nixpkgs/pkgs/misc/emulators/atari800/default.nix index 38dc54ea9d7b..bb6323d18e01 100644 --- a/nixpkgs/pkgs/misc/emulators/atari800/default.nix +++ b/nixpkgs/pkgs/misc/emulators/atari800/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub, autoreconfHook , unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: with stdenv.lib; stdenv.mkDerivation rec{ pname = "atari800"; - version = "4.0.0"; + version = "4.2.0"; - src = fetchurl { - url = "mirror://sourceforge/atari800/atari800/${version}/${pname}-${version}.tar.gz"; - sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88"; + src = fetchFromGitHub { + owner = "atari800"; + repo = "atari800"; + rev = "ATARI800_${replaceChars ["."] ["_"] version}"; + sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ]; configureFlags = [ @@ -23,10 +27,8 @@ stdenv.mkDerivation rec{ "--enable-riodevice" ]; - preConfigure = "cd src"; - meta = { - homepage = http://atari800.sourceforge.net/; + homepage = "https://atari800.github.io/"; description = "An Atari 8-bit emulator"; longDescription = '' Atari800 is the emulator of Atari 8-bit computer systems and diff --git a/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix index 6c47109fb65c..18c78c84d6cf 100644 --- a/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix +++ b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A frontend for arcade cabinets and media PCs"; - homepage = http://attractmode.org; + homepage = "http://attractmode.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/misc/emulators/blastem/default.nix b/nixpkgs/pkgs/misc/emulators/blastem/default.nix index 0d4c7ab7216a..f4cef93141da 100644 --- a/nixpkgs/pkgs/misc/emulators/blastem/default.nix +++ b/nixpkgs/pkgs/misc/emulators/blastem/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.retrodev.com/blastem/; + homepage = "https://www.retrodev.com/blastem/"; description = "The fast and accurate Genesis emulator"; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; license = stdenv.lib.licenses.gpl3; diff --git a/nixpkgs/pkgs/misc/emulators/bsod/default.nix b/nixpkgs/pkgs/misc/emulators/bsod/default.nix index 8575d654febf..56b85227cda4 100644 --- a/nixpkgs/pkgs/misc/emulators/bsod/default.nix +++ b/nixpkgs/pkgs/misc/emulators/bsod/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bsod-0.1"; src = fetchurl { - url = https://www.vanheusden.com/bsod/bsod-0.1.tgz; + url = "https://www.vanheusden.com/bsod/bsod-0.1.tgz"; sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { microsoft windows experience. Bsod displays the famous windows xp blue screen of death on the console. Errors and drivers causing the error are selected randomly from a large set of examples."; - homepage = http://www.vanheusden.com/bsod/; + homepage = "http://www.vanheusden.com/bsod/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; diff --git a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix index 127770328707..fc5d4c813882 100644 --- a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modular ComputerCraft emulator"; - homepage = https://github.com/CCEmuX/CCEmuX; + homepage = "https://github.com/CCEmuX/CCEmuX"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; }; diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/base.nix b/nixpkgs/pkgs/misc/emulators/cdemu/base.nix index e587151d3e72..f493faaac54f 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/base.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/base.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation ({ Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed. ''; - homepage = http://cdemu.sourceforge.net/; + homepage = "http://cdemu.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ bendlas ]; diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix index df25fb96eb1c..9723e53a8fdb 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides a Virtual (SCSI) HBA"; - homepage = http://cdemu.sourceforge.net/about/vhba/; + homepage = "http://cdemu.sourceforge.net/about/vhba/"; platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ bendlas ]; diff --git a/nixpkgs/pkgs/misc/emulators/citra/default.nix b/nixpkgs/pkgs/misc/emulators/citra/default.nix index ca6ad37b5aae..efe4770a7b00 100644 --- a/nixpkgs/pkgs/misc/emulators/citra/default.nix +++ b/nixpkgs/pkgs/misc/emulators/citra/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: +{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: -stdenv.mkDerivation { +mkDerivation { pname = "citra"; - version = "2019-10-05"; + version = "2020-03-21"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "35690e3ac7a340d941d3bf56080cf5aa6187c5c3"; - sha256 = "11a4mdjabn3qrh0nn4pjl5fxs9nhf1k27wd486csfx88q2q9jvq8"; + rev = "8722b970c52f2c0d8e82561477edb62a53ae9dbb"; + sha256 = "0c1zn1f84h4f6n6p0aqz905yvv5qpdmkj2z58yla6bfgbzabfyrj"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/misc/emulators/darcnes/default.nix b/nixpkgs/pkgs/misc/emulators/darcnes/default.nix index bdec34e396f7..3ea98c571e8d 100644 --- a/nixpkgs/pkgs/misc/emulators/darcnes/default.nix +++ b/nixpkgs/pkgs/misc/emulators/darcnes/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin darcnes"; meta = { - homepage = https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/; + homepage = "https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/"; description = "Sega Master System, Game Gear, SG-1000, NES, ColecoVision and Apple II emulator"; # Prohibited commercial use, credit required. license = stdenv.lib.licenses.free; diff --git a/nixpkgs/pkgs/misc/emulators/desmume/default.nix b/nixpkgs/pkgs/misc/emulators/desmume/default.nix index d5d63cc26944..27c1a2cb9c31 100644 --- a/nixpkgs/pkgs/misc/emulators/desmume/default.nix +++ b/nixpkgs/pkgs/misc/emulators/desmume/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { roms. DeSmuME is also able to emulate nearly all of the commercial nds rom titles which other DS Emulators aren't. ''; - homepage = http://www.desmume.com ; + homepage = "http://www.desmume.com"; license = licenses.gpl1Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/dlx/default.nix b/nixpkgs/pkgs/misc/emulators/dlx/default.nix index ad111a615142..215f2ee46f9c 100644 --- a/nixpkgs/pkgs/misc/emulators/dlx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/dlx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.davidviner.com/dlx.php; + homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix index cc49ef2aa1dc..b460aa7a485b 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,17 +1,44 @@ -{ stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib -, libGLU, libGL , gettext, libpthreadstubs, libXrandr, libXext, readline -, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev -, wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml -, libpulseaudio ? null }: +{ stdenv +, lib +, fetchpatch +, pkgconfig +, cmake +, bluez +, ffmpeg +, libao +, gtk2 +, glib +, libGLU +, libGL +, gettext +, libpthreadstubs +, libXrandr +, libXext +, readline +, openal +, libXdmcp +, portaudio +, fetchFromGitHub +, libusb1 +, libevdev +, wxGTK30 +, soundtouch +, miniupnpc +, mbedtls +, curl +, lzo +, sfml +, libpulseaudio ? null +}: stdenv.mkDerivation rec { pname = "dolphin-emu"; version = "5.0"; src = fetchFromGitHub { - owner = "dolphin-emu"; - repo = "dolphin"; - rev = version; + owner = "dolphin-emu"; + repo = "dolphin"; + rev = version; sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; }; @@ -44,15 +71,45 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake bluez ffmpeg libao libGLU libGL gtk2 glib - gettext libpthreadstubs libXrandr libXext readline openal - libevdev libXdmcp portaudio libusb libpulseaudio - libevdev libXdmcp portaudio libusb libpulseaudio - wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ]; + nativeBuildInputs = [ + pkgconfig + cmake + ]; + + buildInputs = [ + bluez + ffmpeg + libao + libGLU + libGL + gtk2 + glib + gettext + libpthreadstubs + libXrandr + libXext + readline + openal + libevdev + libXdmcp + portaudio + libpulseaudio + libevdev + libXdmcp + portaudio + libusb1 + libpulseaudio + wxGTK30 + soundtouch + miniupnpc + mbedtls + curl + lzo + sfml + ]; meta = with lib; { - homepage = https://dolphin-emu.org/; + homepage = "https://dolphin-emu.org/"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; maintainers = with maintainers; [ MP2E ashkitten ]; diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index e6e19e812428..aa77356600be 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext -, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama +, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml , vulkan-loader ? null, libpulseaudio ? null @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-11608"; + version = "5.0-11824"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "69ee15e5ef369d51681540e6714f02554e3bd8a6"; - sha256 = "1svi9mnddhjcv64xh3y9l68k3rix7wimq8b0mqf5hp7qrda07lx8"; + rev = "1b97f081b8eff9012132a4124537968bdb0e03e0"; + sha256 = "1v96hcn34040vjsw83k8p0r0nb8rrdcz80h4ngirxzm36b3l7w6m"; }; enableParallelBuilding = true; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo - portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml + portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase ] ++ lib.optionals stdenv.isLinux [ bluez udev libevdev alsaLib vulkan-loader diff --git a/nixpkgs/pkgs/misc/emulators/dosbox/default.nix b/nixpkgs/pkgs/misc/emulators/dosbox/default.nix index 5b770a6471ab..b70f0e058c07 100644 --- a/nixpkgs/pkgs/misc/emulators/dosbox/default.nix +++ b/nixpkgs/pkgs/misc/emulators/dosbox/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://www.dosbox.com/; + homepage = "http://www.dosbox.com/"; description = "A DOS emulator"; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; diff --git a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix index 722f6b25429a..af83d4b9f34b 100644 --- a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix +++ b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; - homepage = https://emulationstation.org; + homepage = "https://emulationstation.org"; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/epsxe/default.nix b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix index 81202008db19..493cf4c26287 100644 --- a/nixpkgs/pkgs/misc/emulators/epsxe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://epsxe.com/; + homepage = "http://epsxe.com/"; description = "Enhanced PSX (PlayStation 1) emulator"; license = licenses.unfree; maintainers = with maintainers; [ yegortimoshenko ]; diff --git a/nixpkgs/pkgs/misc/emulators/fakenes/default.nix b/nixpkgs/pkgs/misc/emulators/fakenes/default.nix index 704cef52e5e4..d7c8a185a090 100644 --- a/nixpkgs/pkgs/misc/emulators/fakenes/default.nix +++ b/nixpkgs/pkgs/misc/emulators/fakenes/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "fakenes-0.5.9b3"; src = fetchurl { - url = mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz; + url = "mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz"; sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { patches = [ ./build.patch ]; meta = { - homepage = http://fakenes.sourceforge.net/; + homepage = "http://fakenes.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/fceux/default.nix b/nixpkgs/pkgs/misc/emulators/fceux/default.nix index 58a6a1dd4422..0d4b4cd35762 100644 --- a/nixpkgs/pkgs/misc/emulators/fceux/default.nix +++ b/nixpkgs/pkgs/misc/emulators/fceux/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "A Nintendo Entertainment System (NES) Emulator"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.scubed2 ]; - homepage = http://www.fceux.com/; + homepage = "http://www.fceux.com/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix index 079af05e794d..583e692e1336 100644 --- a/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/nspire-emus/firebird; + homepage = "https://github.com/nspire-emus/firebird"; description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ pneumaticat ]; diff --git a/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix b/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix index a3a379eb2cfd..e2334a62a134 100644 --- a/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix +++ b/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://fuse-emulator.sourceforge.net/; + homepage = "http://fuse-emulator.sourceforge.net/"; description = "ZX Spectrum emulator"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix b/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix index 4120ec7ba6aa..a9449808d527 100644 --- a/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix +++ b/nixpkgs/pkgs/misc/emulators/gens-gs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gens-gs-7"; src = fetchurl { - url = http://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz; + url = "http://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz"; sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; meta = with stdenv.lib; { - homepage = https://segaretro.org/Gens/GS; + homepage = "https://segaretro.org/Gens/GS"; description = "A Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/misc/emulators/gxemul/default.nix b/nixpkgs/pkgs/misc/emulators/gxemul/default.nix index 04c5b441f013..e742fde90ac9 100644 --- a/nixpkgs/pkgs/misc/emulators/gxemul/default.nix +++ b/nixpkgs/pkgs/misc/emulators/gxemul/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { and serial controllers. The emulation is working well enough to allow several unmodified "guest" operating systems to run. ''; - homepage = http://gxemul.sourceforge.net/; + homepage = "http://gxemul.sourceforge.net/"; }; } diff --git a/nixpkgs/pkgs/misc/emulators/hatari/default.nix b/nixpkgs/pkgs/misc/emulators/hatari/default.nix index 278d8d8dc5f3..db1a6664c542 100644 --- a/nixpkgs/pkgs/misc/emulators/hatari/default.nix +++ b/nixpkgs/pkgs/misc/emulators/hatari/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib SDL cmake ]; meta = { - homepage = http://hatari.tuxfamily.org/; + homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff b/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff index 5821a9c130b0..745bba5d518d 100644 --- a/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff +++ b/nixpkgs/pkgs/misc/emulators/higan/0001-change-flags.diff @@ -1,26 +1,25 @@ -diff -Naur higan_v105-source.old/higan/GNUmakefile higan_v105-source.new/higan/GNUmakefile ---- higan_v105-source.old/higan/GNUmakefile 2017-10-07 01:34:22.000000000 -0300 -+++ higan_v105-source.new/higan/GNUmakefile 2017-10-17 00:02:40.580957396 -0200 -@@ -26,7 +26,7 @@ - flags += -fopenmp - link += -fopenmp - ifeq ($(binary),application) -- flags += -march=native -+ flags += - link += -Wl,-export-dynamic - link += -lX11 -lXext - else ifeq ($(binary),library) -diff -Naur higan_v105-source.old/nall/GNUmakefile higan_v105-source.new/nall/GNUmakefile ---- higan_v105-source.old/nall/GNUmakefile 2017-09-23 18:34:22.000000000 -0300 -+++ higan_v105-source.new/nall/GNUmakefile 2017-10-17 00:03:33.568916550 -0200 -@@ -40,8 +40,8 @@ - objcflags := -x objective-c -std=c11 - cppflags := -x c++ -std=c++14 - objcppflags := -x objective-c++ -std=c++14 --flags := --link := -+flags := $(CXXFLAGS) -+link := $(LDFLAGS) +diff -Naur higan-110-old/higan/GNUmakefile higan-110-new/higan/GNUmakefile +--- higan-110-old/higan/GNUmakefile 2020-04-15 11:06:00.279935557 -0300 ++++ higan-110-new/higan/GNUmakefile 2020-04-15 11:08:32.982417291 -0300 +@@ -11,7 +11,7 @@ + include $(nall.path)/GNUmakefile - # compiler detection - ifeq ($(compiler),) + ifeq ($(platform),local) +- flags += -march=native ++ flags += + endif + + ifeq ($(platform),windows) +diff -Naur higan-110-old/nall/GNUmakefile higan-110-new/nall/GNUmakefile +--- higan-110-old/nall/GNUmakefile 2020-04-15 11:06:00.396935154 -0300 ++++ higan-110-new/nall/GNUmakefile 2020-04-15 11:10:37.738011488 -0300 +@@ -127,7 +127,8 @@ + + # linux settings + ifeq ($(platform),linux) +- options += -ldl ++ flags += $(CXXFLAGS) ++ options += $(LDFLAGS) -ldl + endif + + # bsd settings diff --git a/nixpkgs/pkgs/misc/emulators/higan/default.nix b/nixpkgs/pkgs/misc/emulators/higan/default.nix index c1e64d26b476..e735bdb38eed 100644 --- a/nixpkgs/pkgs/misc/emulators/higan/default.nix +++ b/nixpkgs/pkgs/misc/emulators/higan/default.nix @@ -1,85 +1,135 @@ -{ stdenv, fetchurl -, p7zip, pkgconfig +{ stdenv, fetchFromGitHub +, pkgconfig , libX11, libXv , udev -, libGLU, libGL, SDL +, libGLU, libGL, SDL2 , libao, openal, libpulseaudio +, alsaLib , gtk2, gtksourceview -, runtimeShell }: +, runtimeShell +# Darwin dependencies +, libicns, Carbon, Cocoa, OpenGL, OpenAL}: -with stdenv.lib; +let + inherit (stdenv.lib) optionals; +in stdenv.mkDerivation rec { pname = "higan"; - version = "106"; - sourceName = "higan_v${version}-source"; + version = "110"; - src = fetchurl { - urls = [ "https://download.byuu.org/${sourceName}.7z" ]; - sha256 = "063dzp9wrdnbvagraxi31xg0154y2gf67rrd0mnc8h104cgzjr35"; - curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... + src = fetchFromGitHub { + owner = "higan-emu"; + repo = "higan"; + rev = "v${version}"; + sha256 = "11rvm53c3p2f6zk8xbyv2j51xp8zmqnch7zravhj3fk590qrjrr2"; }; patches = [ ./0001-change-flags.diff ]; - postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp"; + postPatch = '' + sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp - buildInputs = - [ p7zip pkgconfig libX11 libXv udev libGLU libGL - SDL libao openal libpulseaudio gtk2 gtksourceview ]; - - unpackPhase = '' - 7z x $src - sourceRoot=${sourceName} + for file in icarus/GNUmakefile higan/target-higan/GNUmakefile; do + substituteInPlace "$file" \ + --replace 'sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns' \ + 'png2icns out/$(name).app/Contents/Resources/$(name).icns data/$(name).png' + done ''; + nativeBuildInputs = [ pkgconfig ] + ++ optionals stdenv.isDarwin [ libicns ]; + + buildInputs = [ SDL2 libao ] + ++ optionals stdenv.isLinux [ alsaLib udev libpulseaudio openal + gtk2 gtksourceview libX11 libXv + libGLU libGL ] + ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ]; + buildPhase = '' - make compiler=c++ -C icarus - make compiler=c++ -C higan + make compiler=c++ -C higan openmp=true target=higan + make compiler=c++ -C genius openmp=true + make compiler=c++ -C icarus openmp=true ''; - # Now the cheats file will be distributed separately - installPhase = '' - install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps - install -m 755 icarus/out/icarus $out/bin/ - install -m 755 higan/out/higan $out/bin/ - install -m 644 higan/data/higan.desktop $out/share/applications/ - install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png - install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png + installPhase = (if stdenv.isDarwin then '' + mkdir "$out" + mv higan/out/higan.app "$out"/ + mv icarus/out/icarus.app "$out"/ + mv genius/out/genius.app "$out"/ + '' else '' + install -dm 755 "$out"/bin "$out"/share/applications "$out"/share/pixmaps + + install -m 755 higan/out/higan -t "$out"/bin/ + install -m 644 higan/target-higan/resource/higan.desktop \ + -t $out/share/applications/ + install -m 644 higan/target-higan/resource/higan.svg \ + $out/share/pixmaps/higan-icon.svg + install -m 644 higan/target-higan/resource/higan.png \ + $out/share/pixmaps/higan-icon.png + + install -m 755 icarus/out/icarus -t "$out"/bin/ + install -m 644 icarus/data/icarus.desktop -t $out/share/applications/ + install -m 644 icarus/data/icarus.svg $out/share/pixmaps/icarus-icon.svg + install -m 644 icarus/data/icarus.png $out/share/pixmaps/icarus-icon.png + + install -m 755 genius/out/genius -t "$out"/bin/ + install -m 644 genius/data/genius.desktop -t $out/share/applications/ + install -m 644 genius/data/genius.svg $out/share/pixmaps/genius-icon.svg + install -m 644 genius/data/genius.png $out/share/pixmaps/genius-icon.png + '') + '' + mkdir -p "$out"/share/higan "$out"/share/icarus cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - higan/systems/* $out/share/higan/ + higan/System/ "$out"/share/higan/ + cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ + icarus/Database icarus/Firmware $out/share/icarus/ ''; - fixupPhase = '' + fixupPhase = let + dest = if stdenv.isDarwin + then "\\$HOME/Library/Application Support/higan" + else "\\$HOME/higan"; + in '' # A dirty workaround, suggested by @cpages: # we create a first-run script to populate - # the local $HOME with all the auxiliary - # stuff needed by higan at runtime + # $HOME with all the stuff needed at runtime + mkdir -p "$out"/bin cat <<EOF > $out/bin/higan-init.sh #!${runtimeShell} - cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ + cp --recursive --update $out/share/higan/System/ "${dest}"/ EOF chmod +x $out/bin/higan-init.sh ''; - meta = { - description = "An open-source, cycle-accurate Nintendo multi-system emulator"; + meta = with stdenv.lib; { + description = "An open-source, cycle-accurate multi-system emulator"; longDescription = '' - higan (formerly bsnes) is a multi-system game console emulator. + higan is a multi-system game console emulator. The purpose of higan is to + serve as hardware documentation in source code form: it is meant to be as + accurate and complete as possible, with code that is easy to read and + understand. + It currently supports the following systems: - - Nintendo's Famicom, Super Famicom (with subsystems: - Super Game Boy, BS-X Satellaview, Sufami Turbo); - Game Boy, Game Boy Color, Game Boy Advance; - - Sega's Master System, Game Gear, Mega Drive; - - NEC's PC Engine, SuperGrafx; - - Bandai's WonderSwan, WonderSwan Color. + - Famicom + Famicom Disk System + - Super Famicom + Super Game Boy + - Game Boy + Game Boy Color + - Game Boy Advance + Game Boy Player + - SG-1000 + SC-3000 + - Master System + Game Gear + - Mega Drive + Mega CD + - PC Engine + SuperGrafx + - MSX + MSX2 + - ColecoVision + - Neo Geo Pocket + Neo Geo Pocket Color + - WonderSwan + WonderSwan Color + SwanCrystal + Pocket Challenge V2 ''; - homepage = https://byuu.org/emulation/higan/; + homepage = "https://byuu.org/higan/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } +# TODO: Qt and GTK3+ support diff --git a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix index da6a7c8bf2f3..0b6fb0dea54d 100644 --- a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix +++ b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; - homepage = https://www.carpeludum.com/kega-fusion/; + homepage = "https://www.carpeludum.com/kega-fusion/"; maintainers = with maintainers; [ abbradar ]; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" ]; diff --git a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix index cb64c30be495..6a2f94e77e6c 100644 --- a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for accessing discs and disc image files"; - homepage = http://www.seasip.info/Unix/LibDsk/; + homepage = "http://www.seasip.info/Unix/LibDsk/"; license = licenses.gpl2Plus; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/mame/default.nix b/nixpkgs/pkgs/misc/emulators/mame/default.nix index 995fd72a6e22..695937606128 100644 --- a/nixpkgs/pkgs/misc/emulators/mame/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mame/default.nix @@ -1,14 +1,17 @@ { stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama +, libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: +with stdenv; + let majorVersion = "0"; - minorVersion = "219"; + minorVersion = "220"; desktopItem = makeDesktopItem { name = "MAME"; - exec = "mame${stdenv.lib.optionalString stdenv.is64bit "64"}"; + exec = "mame${lib.optionalString stdenv.is64bit "64"}"; desktopName = "MAME"; genericName = "MAME is a multi-purpose emulation framework"; categories = "System;Emulator;"; @@ -23,17 +26,26 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "048ar1j2vsrvqqc3spy9qcch2lbxn0ycd9lv4ig5wfnvjkdjdvgr"; + sha256 = "0ddmq3lagk7f1wkgybckcci4sigcqn1gzafggnnqjzq2q8viww0c"; }; hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" "-Wno-error=missing-braces" ]; - makeFlags = [ "TOOLS=1" ]; + makeFlags = [ + "TOOLS=1" + "USE_LIBSDL=1" + ] + ++ lib.optionals stdenv.cc.isClang [ "CC=clang" "CXX=clang++" ] + ; dontWrapQtApps = true; - buildInputs = [ SDL2 SDL2_ttf alsaLib qtbase libXinerama ]; + buildInputs = + [ SDL2 SDL2_ttf qtbase libXinerama ] + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ] + ; nativeBuildInputs = [ python pkgconfig which makeWrapper installShellFiles ]; # by default MAME assumes that paths with stock resources @@ -58,16 +70,18 @@ in mkDerivation { installManPage ${dest}/docs/man/*.1 ${dest}/docs/man/*.6 mv artwork plugins samples ${dest} - + '' + lib.optionalString stdenv.isLinux '' mkdir -p $out/share ln -s ${desktopItem}/share/applications $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Is a multi-purpose emulation framework"; - homepage = https://www.mamedev.org/; + homepage = "https://www.mamedev.org/"; license = with licenses; [ bsd3 gpl2Plus ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.unix; + # makefile needs fixes for install target + badPlatforms = [ "aarch64-linux" ]; maintainers = with maintainers; [ gnidorah ]; }; } diff --git a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix index 777c9f043f40..feedfc2603e7 100644 --- a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mednafen"; - version = "1.22.2"; + version = "1.24.1"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "159gvzrf4as1fp74czzc14vamhd6s3hlnvwglfgdd5j6d6n37m7s"; + sha256 = "1rszcy5lgfrw0f9b62sd69kgz1xziki3d55vpqh6k9jdmwzxyym4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/nixpkgs/pkgs/misc/emulators/mgba/default.nix index 597737646615..5611b344cb1c 100644 --- a/nixpkgs/pkgs/misc/emulators/mgba/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mgba/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mgba.io; + homepage = "https://mgba.io"; description = "A modern GBA emulator with a focus on accuracy"; longDescription = '' diff --git a/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix b/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix index ee3aab1834ab..621559627a75 100644 --- a/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Nintendo 64 Emulator"; license = licenses.gpl2Plus; - homepage = http://www.mupen64plus.org/; + homepage = "http://www.mupen64plus.org/"; maintainers = [ maintainers.sander ]; platforms = [ "x86_64-linux" ]; }; diff --git a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix index 20c7c39312a5..5050df007f6a 100644 --- a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix +++ b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://0ldsk00l.ca/nestopia/; + homepage = "http://0ldsk00l.ca/nestopia/"; description = "NES emulator with a focus on accuracy"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix index 6ac6f93750e5..68b464f4d358 100644 --- a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix @@ -6,16 +6,17 @@ , freetype, tcl, zlib }: -stdenv.mkDerivation { +with stdenv.lib; +stdenv.mkDerivation rec { pname = "openmsx"; - version = "git-2017-11-02"; + version = "0.15.0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; - rev = "eeb74206ae347a3b17e9b99f91f2b4682c5db22c"; - sha256 = "170amj7k6wjhwx6psbplqljvckvhxxbv3aw72jrdxl1fb8zlnq3s"; + rev = "RELEASE_0_15_0"; + sha256 = "1lv5kdw0812mkf7k20z2djzk0pbs792xq2mibbnz9rfjf02whi7l"; fetchSubmodules = true; }; @@ -35,13 +36,13 @@ stdenv.mkDerivation { # for providing support to Nixpkgs :) TCL_CONFIG="${tcl}/lib/"; - meta = with stdenv.lib; { + meta = { description = "A MSX emulator"; longDescription = '' OpenMSX is an emulator for the MSX home computer system. Its goal is to emulate all aspects of the MSX with 100% accuracy. ''; - homepage = https://openmsx.org; + homepage = "https://openmsx.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix b/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix index 1035061d0570..ae608f563128 100644 --- a/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix +++ b/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Playstation 1 emulator"; - homepage = https://pcsxr.codeplex.com/; + homepage = "https://pcsxr.codeplex.com/"; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix index b976c1e8c27d..b2aa81124dae 100644 --- a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix @@ -16,14 +16,14 @@ mkDerivation rec { pname = "ppsspp"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "17sym0vk72lzbh9a1501mhw98c78x1gq7k1fpy69nvvb119j37wa"; + sha256 = "0ivi0dcfxwa4nz19amki80qacnjhqr42f0ihyby1scxafl3nq55c"; }; postPatch = '' diff --git a/nixpkgs/pkgs/misc/emulators/qmc2/default.nix b/nixpkgs/pkgs/misc/emulators/qmc2/default.nix index 660eba5fd03c..1242a1ef11ac 100644 --- a/nixpkgs/pkgs/misc/emulators/qmc2/default.nix +++ b/nixpkgs/pkgs/misc/emulators/qmc2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Qt frontend for MAME/MESS"; - homepage = https://qmc2.batcom-it.net; + homepage = "https://qmc2.batcom-it.net"; license = licenses.gpl2; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix index b1d01e12b626..0ebd2b82a9a9 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix @@ -22,7 +22,7 @@ let makeFlags = [ "platform=${{ linux = "unix"; - darwin = "unix"; + darwin = "osx"; windows = "win"; }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}" "ARCH=${{ @@ -51,7 +51,7 @@ let meta = with stdenv.lib; { inherit (a) description license; broken = a.broken or false; - homepage = https://www.libretro.com/; + homepage = "https://www.libretro.com/"; maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix index 02d098654321..a91e2de85934 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { preFixup = "rm $out/bin/retroarch-cg2glsl"; meta = { - homepage = https://libretro.com; + homepage = "https://libretro.com"; description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/misc/emulators/retrofe/default.nix b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix index 44571de3489d..d2c904723b1e 100644 --- a/nixpkgs/pkgs/misc/emulators/retrofe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { version = "0.6.169"; src = fetchhg { - url = https://bitbucket.org/teamretro/retrofe; + url = "https://bitbucket.org/teamretro/retrofe"; rev = "8793e03"; sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; }; @@ -70,7 +70,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A frontend for arcade cabinets and media PCs"; - homepage = http://retrofe.com; + homepage = "http://retrofe.com"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix index 674222dc3555..4e022b2868fa 100644 --- a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix +++ b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix @@ -1,22 +1,22 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig, git -, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 +{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git +, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python3 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib }: let - majorVersion = "0.0.6"; - gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) + majorVersion = "0.0.8"; + gitVersion = "9300-341fdf7eb"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in -stdenv.mkDerivation { +mkDerivation { pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; - rev = "790962425cfb893529f72b3ef0dd1424fcc42973"; - sha256 = "154ys29b9xdws3bp4b7rb3kc0h9hd49g2yf3z9268cdq8aclahaa"; + rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd"; + sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1"; }; preConfigure = '' @@ -36,14 +36,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ - qt5.qtbase qt5.qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python27 + qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python3 ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; maintainers = with maintainers; [ abbradar nocent ]; diff --git a/nixpkgs/pkgs/misc/emulators/stella/default.nix b/nixpkgs/pkgs/misc/emulators/stella/default.nix index c2d98cda060d..72dc48c1f4d0 100644 --- a/nixpkgs/pkgs/misc/emulators/stella/default.nix +++ b/nixpkgs/pkgs/misc/emulators/stella/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, SDL2 }: +{ stdenv, fetchFromGitHub, pkgconfig, SDL2 }: with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "4.6.1"; + version = "6.1.1"; - src = fetchurl { - url = "mirror://sourceforge/project/stella/stella/${version}/${pname}-${version}-src.tar.gz"; - sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1"; + src = fetchFromGitHub { + owner = "stella-emu"; + repo = "stella"; + rev = version; + sha256 = "1iwhslrkq887v035j68lhblybww8r792515rp2m5qzmdgnjzsvbb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL2 ]; + + enableParallelBuilding = true; meta = { description = "An open-source Atari 2600 VCS emulator"; @@ -23,7 +27,7 @@ stdenv.mkDerivation rec { maintained by Stephen Anthony. As of its 3.5 release, Stella is officially donationware. ''; - homepage = http://stella.sourceforge.net/; + homepage = "http://stella-emu.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/uae/default.nix b/nixpkgs/pkgs/misc/emulators/uae/default.nix index 313b61b393e4..7b52430aa015 100644 --- a/nixpkgs/pkgs/misc/emulators/uae/default.nix +++ b/nixpkgs/pkgs/misc/emulators/uae/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/; + homepage = "http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/"; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/misc/emulators/vbam/default.nix b/nixpkgs/pkgs/misc/emulators/vbam/default.nix index e44b45dbb4bc..2aae72b3e206 100644 --- a/nixpkgs/pkgs/misc/emulators/vbam/default.nix +++ b/nixpkgs/pkgs/misc/emulators/vbam/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "A merge of the original Visual Boy Advance forks"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; - homepage = http://vba-m.com/; + homepage = "https://vba-m.com/"; platforms = stdenv.lib.platforms.linux; badPlatforms = [ "aarch64-linux" ]; }; diff --git a/nixpkgs/pkgs/misc/emulators/vice/default.nix b/nixpkgs/pkgs/misc/emulators/vice/default.nix index cb083c0aa0d8..ca3149785a4d 100644 --- a/nixpkgs/pkgs/misc/emulators/vice/default.nix +++ b/nixpkgs/pkgs/misc/emulators/vice/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "vice-3.1"; src = fetchurl { - url = mirror://sourceforge/vice-emu/vice-3.1.tar.gz; + url = "mirror://sourceforge/vice-emu/vice-3.1.tar.gz"; sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; - homepage = http://www.viceteam.org; + homepage = "http://www.viceteam.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/wine/default.nix b/nixpkgs/pkgs/misc/emulators/wine/default.nix index 727eb2700671..368e2845ca40 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/default.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/default.nix @@ -9,7 +9,6 @@ { lib, stdenv, callPackage, wineRelease ? "stable", wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32", - libtxc_dxtn_Name ? "libtxc_dxtn_s2tc", pngSupport ? false, jpegSupport ? false, tiffSupport ? false, @@ -63,7 +62,6 @@ let wine-build = build: release: in if wineRelease == "staging" then callPackage ./staging.nix { - inherit libtxc_dxtn_Name; wineUnstable = wine-build wineBuild "unstable"; } else diff --git a/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 06b3a950ba09..0e3eb2ce6986 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.0"; - url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q"; + version = "5.5"; + url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; + sha256 = "1z7mvl6fgk7cg8vmy157r8azcz89srnckbzvsc6cva7a1fdi7qx0"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "054m2glvav29qnlgr3p36kahyv3kbxzba82djzqpc7cmsrin0d3f"; + sha256 = "0wcj73xcxsk5897m5fg14cjir2md167m09jjjv9z9n6157bfr9fw"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/misc/emulators/wine/staging.nix b/nixpkgs/pkgs/misc/emulators/wine/staging.nix index df979c68a47f..5c2469f8f44e 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/staging.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, wineUnstable, libtxc_dxtn_Name }: +{ stdenv, callPackage, wineUnstable }: with callPackage ./util.nix {}; @@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert stdenv.lib.getVersion wineUnstable == patch.version; stdenv.lib.overrideDerivation wineUnstable (self: { - buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs; + buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; name = "${self.name}-staging"; diff --git a/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix b/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix index 76606edf53c3..444ef29b7843 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; license = stdenv.lib.licenses.lgpl21; - homepage = https://github.com/Winetricks/winetricks; + homepage = "https://github.com/Winetricks/winetricks"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix b/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix index 2416ddd65b7a..4e90a524aa7a 100644 --- a/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; + homepage = "https://bitbucket.org/auria/wxmupen64plus/wiki/Home"; }; } diff --git a/nixpkgs/pkgs/misc/emulators/yabause/default.nix b/nixpkgs/pkgs/misc/emulators/yabause/default.nix index abceb752b2f8..d29d7b1e7b8e 100644 --- a/nixpkgs/pkgs/misc/emulators/yabause/default.nix +++ b/nixpkgs/pkgs/misc/emulators/yabause/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source Sega Saturn emulator"; - homepage = https://yabause.org/; + homepage = "https://yabause.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/zsnes/default.nix b/nixpkgs/pkgs/misc/emulators/zsnes/default.nix index 55fe49895c9f..142a49b8d181 100644 --- a/nixpkgs/pkgs/misc/emulators/zsnes/default.nix +++ b/nixpkgs/pkgs/misc/emulators/zsnes/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { description = "A Super Nintendo Entertainment System Emulator"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; - homepage = http://www.zsnes.com; + homepage = "http://www.zsnes.com"; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/misc/frescobaldi/default.nix b/nixpkgs/pkgs/misc/frescobaldi/default.nix index abf4970c616d..830d5bea36a0 100644 --- a/nixpkgs/pkgs/misc/frescobaldi/default.nix +++ b/nixpkgs/pkgs/misc/frescobaldi/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }: buildPythonApplication rec { - name = "frescobaldi-${version}"; + pname = "frescobaldi"; version = "3.1.1"; src = fetchFromGitHub { @@ -28,7 +28,7 @@ buildPythonApplication rec { ]; meta = with lib; { - homepage = http://frescobaldi.org/; + homepage = "https://frescobaldi.org/"; description = ''Frescobaldi is a LilyPond sheet music text editor''; longDescription = '' Powerful text editor with syntax highlighting and automatic completion, diff --git a/nixpkgs/pkgs/misc/ghostscript/default.nix b/nixpkgs/pkgs/misc/ghostscript/default.nix index 37974e41080f..161ee8471bc9 100644 --- a/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { passthru = { inherit version; }; meta = { - homepage = https://www.ghostscript.com/; + homepage = "https://www.ghostscript.com/"; description = "PostScript interpreter (mainline version)"; longDescription = '' diff --git a/nixpkgs/pkgs/misc/gnash/default.nix b/nixpkgs/pkgs/misc/gnash/default.nix index 56dfe2f19f87..5a4eb1e7f331 100644 --- a/nixpkgs/pkgs/misc/gnash/default.nix +++ b/nixpkgs/pkgs/misc/gnash/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://savannah.gnu.org/projects/gnash; + homepage = "https://savannah.gnu.org/projects/gnash"; description = "A flash (SWF) player and browser plugin"; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/nixpkgs/pkgs/misc/gnuk/generic.nix b/nixpkgs/pkgs/misc/gnuk/generic.nix index e592b945a408..c7bbb3b530d7 100644 --- a/nixpkgs/pkgs/misc/gnuk/generic.nix +++ b/nixpkgs/pkgs/misc/gnuk/generic.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.fsij.org/pages/gnuk; + homepage = "http://www.fsij.org/pages/gnuk"; description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/misc/jackaudio/default.nix b/nixpkgs/pkgs/misc/jackaudio/default.nix index f6eaa553bb26..d50075607627 100644 --- a/nixpkgs/pkgs/misc/jackaudio/default.nix +++ b/nixpkgs/pkgs/misc/jackaudio/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = https://jackaudio.org; + homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; diff --git a/nixpkgs/pkgs/misc/jackaudio/jack1.nix b/nixpkgs/pkgs/misc/jackaudio/jack1.nix index 39c0d7d50c78..2b5d0d960caf 100644 --- a/nixpkgs/pkgs/misc/jackaudio/jack1.nix +++ b/nixpkgs/pkgs/misc/jackaudio/jack1.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JACK audio connection kit"; - homepage = https://jackaudio.org; + homepage = "https://jackaudio.org"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/misc/lguf-brightness/default.nix b/nixpkgs/pkgs/misc/lguf-brightness/default.nix index 297ca955e86d..02ce011c59df 100644 --- a/nixpkgs/pkgs/misc/lguf-brightness/default.nix +++ b/nixpkgs/pkgs/misc/lguf-brightness/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Adjust brightness for LG UltraFine 4K display (cross platform)"; - homepage = https://github.com/periklis/lguf-brightness; + homepage = "https://github.com/periklis/lguf-brightness"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ periklis ]; platforms = with platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/misc/logging/beats/6.x.nix b/nixpkgs/pkgs/misc/logging/beats/6.x.nix index a0a29f95abab..d3f284a2ddbb 100644 --- a/nixpkgs/pkgs/misc/logging/beats/6.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/6.x.nix @@ -16,7 +16,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; meta = with stdenv.lib; { - homepage = https://www.elastic.co/products/beats; + homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/nixpkgs/pkgs/misc/logging/beats/7.x.nix index adcbdddfc3ad..cdc8417a9c14 100644 --- a/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -16,7 +16,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; meta = with stdenv.lib; { - homepage = https://www.elastic.co/products/beats; + homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/long-shebang/default.nix b/nixpkgs/pkgs/misc/long-shebang/default.nix index 5af75be690cb..753e1f490bb4 100644 --- a/nixpkgs/pkgs/misc/long-shebang/default.nix +++ b/nixpkgs/pkgs/misc/long-shebang/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation { meta = { description = "A tool for #! scripts with more than one argument"; - homepage = https://github.com/shlevy/long-shebang; + homepage = "https://github.com/shlevy/long-shebang"; license = stdenv.lib.licenses.mit; diff --git a/nixpkgs/pkgs/misc/mxt-app/default.nix b/nixpkgs/pkgs/misc/mxt-app/default.nix index d701bd654d21..a5a621435ee3 100644 --- a/nixpkgs/pkgs/misc/mxt-app/default.nix +++ b/nixpkgs/pkgs/misc/mxt-app/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Command line utility for Atmel maXTouch devices"; - homepage = https://github.com/atmel-maxtouch/mxt-app; + homepage = "https://github.com/atmel-maxtouch/mxt-app"; license = licenses.bsd2; maintainers = [ maintainers.colemickens ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/riscv-pk/default.nix b/nixpkgs/pkgs/misc/riscv-pk/default.nix index e724869b235c..3e1f63e5e300 100644 --- a/nixpkgs/pkgs/misc/riscv-pk/default.nix +++ b/nixpkgs/pkgs/misc/riscv-pk/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { meta = { description = "RISC-V Proxy Kernel and Bootloader."; - homepage = https://github.com/riscv/riscv-pk; + homepage = "https://github.com/riscv/riscv-pk"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.riscv; maintainers = [ stdenv.lib.maintainers.shlevy ]; diff --git a/nixpkgs/pkgs/misc/rkdeveloptool/default.nix b/nixpkgs/pkgs/misc/rkdeveloptool/default.nix index e877629bcb03..8ce4fd8e14c7 100644 --- a/nixpkgs/pkgs/misc/rkdeveloptool/default.nix +++ b/nixpkgs/pkgs/misc/rkdeveloptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rkdeveloptool"; - version = "1.3"; + version = "unstable-2019-07-01"; src = fetchFromGitHub { owner = "rockchip-linux"; repo = "rkdeveloptool"; - rev = "081d237ad5bf8f03170c9d60bd94ceefa0352aaf"; - sha256 = "05hh7j3xgb8l1k1v2lis3nvlc0gp87ihzg6jci7m5lkkm5qgv3ji"; + rev = "6e92ebcf8b1812da02663494a68972f956e490d3"; + sha256 = "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ libusb1 ]; meta = with stdenv.lib; { - homepage = https://github.com/rockchip-linux/rkdeveloptool; + homepage = "https://github.com/rockchip-linux/rkdeveloptool"; description = "A tool from Rockchip to communicate with Rockusb devices"; license = licenses.gpl2; maintainers = [ maintainers.lopsided98 ]; diff --git a/nixpkgs/pkgs/misc/sailsd/default.nix b/nixpkgs/pkgs/misc/sailsd/default.nix index 49d86491aa01..0dca07010980 100644 --- a/nixpkgs/pkgs/misc/sailsd/default.nix +++ b/nixpkgs/pkgs/misc/sailsd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simulator daemon for autonomous sailing boats"; - homepage = https://github.com/sails-simulator/sailsd; + homepage = "https://github.com/sails-simulator/sailsd"; license = licenses.gpl3; longDescription = '' Sails is a simulator designed to test the AI of autonomous sailing diff --git a/nixpkgs/pkgs/misc/scrcpy/default.nix b/nixpkgs/pkgs/misc/scrcpy/default.nix index 6e5822b5a6ff..c47825f90108 100644 --- a/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display and control Android devices over USB or TCP/IP"; - homepage = https://github.com/Genymobile/scrcpy; + homepage = "https://github.com/Genymobile/scrcpy"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ deltaevo lukeadams ]; diff --git a/nixpkgs/pkgs/misc/screensavers/alock/default.nix b/nixpkgs/pkgs/misc/screensavers/alock/default.nix index 59d5a146e165..c9340b2503e8 100644 --- a/nixpkgs/pkgs/misc/screensavers/alock/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/alock/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "alock-${date}"; src = fetchgit { - url = https://github.com/Arkq/alock; + url = "https://github.com/Arkq/alock"; rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/Arkq/alock; + homepage = "https://github.com/Arkq/alock"; description = "Simple screen lock application for X server"; longDescription = '' alock locks the X server until the user enters a password diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix index d25f253bd005..36f898195703 100644 --- a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; - homepage = https://github.com/pavanjadhaw/betterlockscreen; + homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ eyjhb ]; diff --git a/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index b36f8bf98def..71a248bcfa12 100644 --- a/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; - homepage = https://electricsheep.org/; + homepage = "https://electricsheep.org/"; maintainers = with maintainers; [ nand0p fpletz ]; platforms = platforms.linux; license = licenses.gpl1; diff --git a/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix index ae61291b0879..5ffe5f722651 100644 --- a/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; - homepage = https://gitlab.com/Ma27/i3lock-pixeled; + homepage = "https://gitlab.com/Ma27/i3lock-pixeled"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; diff --git a/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix b/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix index 9763949cf982..4d257650338c 100644 --- a/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/the-cavalry/light-locker; + homepage = "https://github.com/the-cavalry/light-locker"; description = "A simple session-locker for LightDM"; longDescription = '' A simple locker (forked from gnome-screensaver) that aims to diff --git a/nixpkgs/pkgs/misc/screensavers/pipes/default.nix b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix index fb80f9922ce9..211b7614f3b8 100644 --- a/nixpkgs/pkgs/misc/screensavers/pipes/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pipeseroni/pipes.sh; + homepage = "https://github.com/pipeseroni/pipes.sh"; description = "Animated pipes terminal screensaver"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; diff --git a/nixpkgs/pkgs/misc/screensavers/slock/default.nix b/nixpkgs/pkgs/misc/screensavers/slock/default.nix index 9dadd085067d..7df635c10c7a 100644 --- a/nixpkgs/pkgs/misc/screensavers/slock/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/slock/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://tools.suckless.org/slock; + homepage = "https://tools.suckless.org/slock"; description = "Simple X display locker"; longDescription = '' Simple X display locker. This is the simplest X screen locker. diff --git a/nixpkgs/pkgs/misc/screensavers/vlock/default.nix b/nixpkgs/pkgs/misc/screensavers/vlock/default.nix index ae89bbd53cc6..83d82e2b3b34 100644 --- a/nixpkgs/pkgs/misc/screensavers/vlock/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/vlock/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "vlock-2.2.2"; src = fetchurl { - url = mirror://debian/pool/main/v/vlock/vlock_2.2.2.orig.tar.gz; + url = "mirror://debian/pool/main/v/vlock/vlock_2.2.2.orig.tar.gz"; sha256 = "1b9gv7hmlb8swda5bn40lp1yki8b8wv29vdnhcjqfl6ir98551za"; }; diff --git a/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index f18099d3840e..2c39ed599e28 100644 --- a/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screen locker for the X Window System"; - homepage = http://sillycycle.com/xlockmore.html; + homepage = "http://sillycycle.com/xlockmore.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix b/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix index a278e6dc949f..cff03f3bed04 100644 --- a/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Forward freedesktop.org Idle Inhibition Service calls to Xss"; - homepage = https://github.com/timakro/xssproxy; + homepage = "https://github.com/timakro/xssproxy"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ benley ]; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix b/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix index 1aa1f347ab45..ca4623e30687 100644 --- a/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/aanatoly/xtrlock-pam; + homepage = "https://github.com/aanatoly/xtrlock-pam"; description = "PAM based X11 screen locker"; license = "unknown"; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/nixpkgs/pkgs/misc/solfege/default.nix b/nixpkgs/pkgs/misc/solfege/default.nix index 08397c8406f6..aea4da3eaeb8 100644 --- a/nixpkgs/pkgs/misc/solfege/default.nix +++ b/nixpkgs/pkgs/misc/solfege/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Ear training program"; - homepage = http://www.solfege.org/; + homepage = "http://www.solfege.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/misc/sound-of-sorting/default.nix b/nixpkgs/pkgs/misc/sound-of-sorting/default.nix index 1072bac7816a..07e50c8379e5 100644 --- a/nixpkgs/pkgs/misc/sound-of-sorting/default.nix +++ b/nixpkgs/pkgs/misc/sound-of-sorting/default.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchgit -, SDL2, wxGTK }: +{ stdenv, fetchFromGitHub, SDL2, wxGTK } : -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "sound-of-sorting"; - version = "unstable-2015-07-21"; + version = "2017-12-23"; - src = fetchgit { - url = "https://github.com/bingmann/sound-of-sorting.git"; - rev = "05db428c796a7006d63efdbe314f976e0aa881d6"; - sha256 = "0m2f1dym3hcar7784sjzkbf940b28r02ajhkjgyyw7715psifb8l"; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "bingmann"; + repo = "sound-of-sorting"; + rev = "5884a357af5775fb57d89eb028d4bf150760db75"; + sha256 = "01bpzn38cwn9zlydzvnfz9k7mxdnjnvgnbcpx7i4al8fha7x9lw8"; }; - buildInputs = with stdenv.lib; + buildInputs = [ wxGTK SDL2 ]; preConfigure = '' export SDL_CONFIG=${SDL2.dev}/bin/sdl2-config ''; - meta = with stdenv.lib;{ + meta = with stdenv.lib; { description = "Audibilization and Visualization of Sorting Algorithms"; - homepage = http://panthema.net/2013/sound-of-sorting/; + homepage = "http://panthema.net/2013/sound-of-sorting/"; license = with licenses; gpl3; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/nixpkgs/pkgs/misc/stabber/default.nix b/nixpkgs/pkgs/misc/stabber/default.nix index d0d3fbdf2d73..17ef047ede73 100644 --- a/nixpkgs/pkgs/misc/stabber/default.nix +++ b/nixpkgs/pkgs/misc/stabber/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Stubbed XMPP Server"; - homepage = https://github.com/boothj5/stabber; + homepage = "https://github.com/boothj5/stabber"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ hschaeidt ]; diff --git a/nixpkgs/pkgs/misc/talkfilters/default.nix b/nixpkgs/pkgs/misc/talkfilters/default.nix index 8154e417e065..a622eca7795b 100644 --- a/nixpkgs/pkgs/misc/talkfilters/default.nix +++ b/nixpkgs/pkgs/misc/talkfilters/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; - homepage = http://www.hyperrealm.com/talkfilters/talkfilters.html; + homepage = "http://www.hyperrealm.com/talkfilters/talkfilters.html"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; platforms = with stdenv.lib.platforms; unix; diff --git a/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 0d10b44ab1e1..23c513ea175c 100644 --- a/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -1,6 +1,5 @@ -{ fetchgit +{ lib , fetchFromGitHub -, lib , pkgs , reattach-to-user-namespace , stdenv @@ -30,7 +29,7 @@ let ... }: addRtp "${rtpPath}/${path}" rtpFilePath a (stdenv.mkDerivation (a // { - name = namePrefix + pluginName; + pname = namePrefix + pluginName; inherit pluginName unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; @@ -56,54 +55,66 @@ in rec { battery = mkDerivation { pluginName = "battery"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-battery"; - rev = "09be78c35ee84f858f724442b94ad045ade23eb0"; - sha256 = "0gm6qiay0k5b3yzrabfmh4inyh9r6rfhja2l3r4cixcvc8sgvh8l"; + version = "unstable-2019-07-04"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-battery"; + rev = "f8b8e8451990365e0c98c38c184962e4f83b793b"; + sha256 = "1bhdzsx3kdjqjmm1q4j8937lrpkzf71irr3fqhdbddsghwrrmwim"; }; }; continuum = mkDerivation { pluginName = "continuum"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-continuum"; - rev = "90f4a00c41de094864dd4e29231253bcd80d4409"; - sha256 = "1hviqz62mnq5h4vgcy9bl5004q18yz5b90bnih0ibsna877x3nbc"; + version = "unstable-2018-02-23"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-continuum"; + rev = "1531b3770a7cf7373d15fedd239c5331b99342d1"; + sha256 = "1w3f7gzvv1k25yfr6d1snr2z88p8f87cahrbaslmyphdxpy0fa4m"; }; dependencies = [ resurrect ]; }; copycat = mkDerivation { pluginName = "copycat"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-copycat"; - rev = "6f9b9cd2d93872cef60e3ea7f7ae89598569ed25"; - sha256 = "12dgn5wnzrhd6sqa64w875ld3lrrny8xvdq6b6lzxyain9q49mrf"; + version = "unstable-2020-01-09"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-copycat"; + rev = "77ca3aab2aed8ede3e2b941079b1c92dd221cf5f"; + sha256 = "1bchwzhai8k5rk32n4lrmh56rw944jqxr8imjk74hyaa7bbn81ds"; }; }; cpu = mkDerivation { pluginName = "cpu"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-cpu"; - rev = "12f7a74e25bf59701456e2c0d98b39bb19ec7039"; - sha256 = "0qxn8ngg297980lj6w8ih2m8m8bxxdbcz5hsjmlia92h5rdkm5kl"; + version = "unstable-2020-04-05"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-cpu"; + rev = "8858050756e1fc3c081d37894b441f05ea893a67"; + sha256 = "1bydzrnd9y5y46hjr844p4ylx2dpijn6pv3w94yyvwbyswmirhff"; }; }; - ctrlw = mkDerivation { + ctrlw = mkDerivation rec { pluginName = "ctrlw"; - src = fetchgit { - url = "https://github.com/eraserhd/tmux-ctrlw"; - rev = "b456977125c640cd587b786c6a79cb5c7b0f900d"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "eraserhd"; + repo = "tmux-ctrlw"; + rev = "v${version}"; sha256 = "1kv5pqfjczd6z7i9jf6j5xmcai50l9bn5p2p1w1l5fi6cj8cz1k1"; }; }; fpp = mkDerivation { pluginName = "fpp"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-fpp"; + version = "unstable-2016-03-08"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-fpp"; rev = "ca125d5a9c80bb156ac114ac3f3d5951a795c80e"; sha256 = "1b89s6mfzifi7s5iwf22w7niddpq28w48nmqqy00dv38z4yga5ws"; }; @@ -116,18 +127,22 @@ in rec { fzf-tmux-url = mkDerivation { pluginName = "fzf-tmux-url"; rtpFilePath = "fzf-url.tmux"; - src = fetchgit { - url = "https://github.com/wfxr/tmux-fzf-url"; - rev = "ecd518eec1067234598c01e655b048ff9d06ef2f"; - sha256 = "0png8hdv91y2nivq5vdii2192mb2qcrkwwn69lzxrdnbfa27qrgv"; + version = "unstable-2019-12-02"; + src = fetchFromGitHub { + owner = "wfxr"; + repo = "tmux-fzf-url"; + rev = "2baa410bf7a0f6ceb62a83770baf90d570406ac0"; + sha256 = "0rjzzlmxgjrr8g19bg2idcqr9ny07mrq2s39vndg24n0m7znh3fz"; }; }; gruvbox = mkDerivation { pluginName = "gruvbox"; rtpFilePath = "gruvbox-tpm.tmux"; - src = fetchgit { - url = "https://github.com/egel/tmux-gruvbox"; + version = "unstable-2019-05-05"; + src = fetchFromGitHub { + owner = "egel"; + repo = "tmux-gruvbox"; rev = "6149fd8b5d6924925b4d5aa6935039780e94f3d6"; sha256 = "1ykr4yardavd0x7yfrnshd4b0gi8p31pji7i79ib0nss134zncpb"; }; @@ -135,26 +150,32 @@ in rec { logging = mkDerivation { pluginName = "logging"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-logging"; - rev = "b2706119cd587230beae02980d3d7fa2d5afebe9"; - sha256 = "1w1ymscfbz87lypaxgjdva1rg7jw2jyf7nnfgyngghw9m1l2xk2c"; + version = "unstable-2019-04-19"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-logging"; + rev = "b085ad423b5d59a2c8b8d71772352e7028b8e1d0"; + sha256 = "0p0sawysalhi8k2a5hdxniqx6kb24kd8rnvfzkjqigzid5ik37js"; }; }; net-speed = mkDerivation { pluginName = "net-speed"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-net-speed"; - rev = "536d2bdd053a3bdfcc5cf7680c0dba76127c95ca"; - sha256 = "1bly5f40dgiym378jkfwm7qag9xl6qvziqiqnj65yblqd5py325z"; + version = "unstable-2018-12-02"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-net-speed"; + rev = "58abb615971cb617821e2e7e41c660334f55a92d"; + sha256 = "1aj06gdhzcxsydjzf21n9kyxigwf38kh2rg8hh7gnjk260ydqlrc"; }; }; maildir-counter = mkDerivation { pluginName = "maildir-counter"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-maildir-counter"; + version = "unstable-2016-11-25"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-maildir-counter"; rev = "9415f0207e71e37cbd870c9443426dbea6da78b9"; sha256 = "0dwvqhiv9bjwr01hsi5c57n55jyv5ha5m5q1aqgglf4wyhbnfms4"; }; @@ -162,8 +183,10 @@ in rec { online-status = mkDerivation { pluginName = "online-status"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-online-status"; + version = "unstable-2018-11-30"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-online-status"; rev = "ea86704ced8a20f4a431116aa43f57edcf5a6312"; sha256 = "1hy3vg8v2sir865ylpm2r4ip1zgd4wlrf24jbwh16m23qdcvc19r"; }; @@ -171,28 +194,33 @@ in rec { open = mkDerivation { pluginName = "open"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-open"; - rev = "f99d3189c445188eae5fa9bfeabc95df16deca92"; - sha256 = "13q3zd5jv7akkjjwhgimmfylrvalxdn54fnpfb14g6xam6h8808m"; + version = "unstable-2019-12-02"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-open"; + rev = "cedb4584908bd8458fadc8d3e64101d3cbb48d46"; + sha256 = "10s0xdhmg0dhpj13ybcq72pw3xgb2dq5v5h2mwidzqyh9g17wndh"; }; }; pain-control = mkDerivation { pluginName = "pain-control"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-pain-control"; - rev = "731667692da46d51a6a9dffb4c43384a5d68ff28"; - sha256 = "1ihpl5wgjmhfgcrasgnydd7vpsar865sx2whra19gpfm4bglmdzl"; + version = "unstable-2020-02-18"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-pain-control"; + rev = "2db63de3b08fc64831d833240749133cecb67d92"; + sha256 = "0w7a6n4n86ysiqcqj12j2hg9r5fznvbp3dz8pzas9q1k3avlk0zk"; }; }; - plumb = mkDerivation { + plumb = mkDerivation rec { pluginName = "plumb"; + version = "0.1.1"; src = fetchFromGitHub { owner = "eraserhd"; repo = "tmux-plumb"; - rev = "v0.1.1"; + rev = "v${version}"; sha256 = "1c6k4fdl0az9811r6k164mgd4w5la75xr6x7nabmy046xc0z5i2r"; }; postInstall = '' @@ -202,26 +230,32 @@ in rec { prefix-highlight = mkDerivation { pluginName = "prefix-highlight"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-prefix-highlight"; - rev = "34f7125ae46e5123bedad03e08027332d1186186"; - sha256 = "16z8sm8pifg1m9lmv0z50fb0ws9mk5zqs7a1ddl2bfwkqi7yc0c0"; + version = "unstable-2020-03-26"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-prefix-highlight"; + rev = "1db6e735aad54503b076391d791c56e1af213917"; + sha256 = "0ws9blzg00zhz548m51cm6zbrkqlz7jazkr5029vka1f6qk36x0g"; }; }; resurrect = mkDerivation { pluginName = "resurrect"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-resurrect"; - rev = "7c77c70483b818d331e46c4cf64c716ded09a152"; - sha256 = "08gjxwdmfy16xpgi87rp9dj5338imqsy392pixf7xcnr05413ap1"; + version = "unstable-2020-03-21"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-resurrect"; + rev = "327c0481ad20c429b4e692e092659f8b3346b08f"; + sha256 = "0nxfqazww36wwv49dzd39kq4jfls20834hf1458sf5pvmv5cmbyw"; }; }; sensible = mkDerivation { pluginName = "sensible"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-sensible"; + version = "unstable-2017-09-05"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-sensible"; rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5"; sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx"; }; @@ -232,8 +266,10 @@ in rec { sessionist = mkDerivation { pluginName = "sessionist"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-sessionist"; + version = "unstable-2017-12-03"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-sessionist"; rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89"; sha256 = "030q2mmj8akbc26jnqn8n7fckg1025p0ildx4wr401b6p1snnlw4"; }; @@ -241,15 +277,18 @@ in rec { sidebar = mkDerivation { pluginName = "sidebar"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-sidebar"; - rev = "23014524cab53f8d36373983500fe05a527a444d"; - sha256 = "1w363587isdip1r81h0vkp5163lpa83lvasg8l04h43sbip2y6i8"; + version = "unstable-2018-11-30"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-sidebar"; + rev = "aacbdb45bc5ab69db448a72de4155d0b8dbac677"; + sha256 = "1bp90zbv19kbbiik0bgb893ybss1jqsnk3353a631993xjwsih7c"; }; }; sysstat = mkDerivation { pluginName = "sysstat"; + version = "unstable-2017-12-12"; src = fetchFromGitHub { owner = "samoshkin"; repo = "tmux-plugin-sysstat"; @@ -260,6 +299,7 @@ in rec { tmux-colors-solarized = mkDerivation { pluginName = "tmuxcolors"; + version = "unstable-2019-07-14"; src = fetchFromGitHub { owner = "seebi"; repo = "tmux-colors-solarized"; @@ -270,8 +310,10 @@ in rec { urlview = mkDerivation { pluginName = "urlview"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-urlview"; + version = "unstable-2016-01-06"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-urlview"; rev = "b84c876cffdd22990b4ab51247e795cbd7813d53"; sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn"; }; @@ -284,19 +326,23 @@ in rec { vim-tmux-navigator = mkDerivation { pluginName = "vim-tmux-navigator"; rtpFilePath = "vim-tmux-navigator.tmux"; - src = fetchgit { - url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; - sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv"; + version = "unstable-2019-12-10"; + src = fetchFromGitHub { + owner = "christoomey"; + repo = "vim-tmux-navigator"; + rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306"; + sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac"; }; }; yank = mkDerivation { pluginName = "yank"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-yank"; - rev = "feb9611b7d1c323ca54cd8a5111a53e3e8265b59"; - sha256 = "1ywbm09jfh6cm2m6gracmdc3pp5p2dwraalbhfaafqaydjr22qc3"; + version = "unstable-2019-12-02"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-yank"; + rev = "648005db64d9bf3c4650eff694ecb6cf3e42b0c8"; + sha256 = "1zg9k8yk1iw01vl8m44w4sv20lln4l0lq9dafc09lxmgxm9dllj4"; }; }; diff --git a/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix b/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix index 9e3be1101a63..a089488b0e02 100644 --- a/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix +++ b/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-pkcs11"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "0gqbbxh1y2vcznxw96xn1wpcvg613zzzrbbfrqbw3p7spbn65yfq"; + sha256 = "0ydd88jc4pyf1v7008h2gf0napv6xpw4jn5w87slj9fphjdkwjiz"; }; patches = lib.singleton ( diff --git a/nixpkgs/pkgs/misc/uboot/default.nix b/nixpkgs/pkgs/misc/uboot/default.nix index 29dfb6558a9f..06da268ff533 100644 --- a/nixpkgs/pkgs/misc/uboot/default.nix +++ b/nixpkgs/pkgs/misc/uboot/default.nix @@ -80,7 +80,7 @@ let dontStrip = true; meta = with lib; { - homepage = http://www.denx.de/wiki/U-Boot/; + homepage = "http://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; license = licenses.gpl2; maintainers = with maintainers; [ dezgeg samueldr lopsided98 ]; diff --git a/nixpkgs/pkgs/misc/urbit/default.nix b/nixpkgs/pkgs/misc/urbit/default.nix index a0b6be3a418c..031b65a1ef61 100644 --- a/nixpkgs/pkgs/misc/urbit/default.nix +++ b/nixpkgs/pkgs/misc/urbit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An operating function"; - homepage = https://urbit.org; + homepage = "https://urbit.org"; license = licenses.mit; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/misc/vim-plugins/deprecated.json b/nixpkgs/pkgs/misc/vim-plugins/deprecated.json index 2c02982f6c60..218a1ab622fd 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/deprecated.json +++ b/nixpkgs/pkgs/misc/vim-plugins/deprecated.json @@ -9,7 +9,7 @@ }, "vundle": { "date": "2020-03-27", - "new": "Vundle.vim" + "new": "Vundle-vim" }, "youcompleteme": { "date": "2020-03-27", diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 0093bc78c418..f506efda449c 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -1,6 +1,5 @@ # This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! { lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let packages = ( self: { @@ -39,23 +38,23 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2020-01-03"; + version = "2020-04-06"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "e5bd3f1439f95a33cb8692f1d49f570eb626c70a"; - sha256 = "0i1h1syk008xwwph5kz0jg8rn0b6l1jmdx6hlxq6nr32r5kifhni"; + rev = "3643fa185ebe3bf35cf690a4b3b90d36e36405b0"; + sha256 = "09lpg223l1s8zpsmbg1r18cnr7r3np32nsv185qgcv889mlildqn"; }; }; alchemist-vim = buildVimPluginFrom2Nix { pname = "alchemist-vim"; - version = "2020-01-10"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "slashmili"; repo = "alchemist.vim"; - rev = "a5158d2e731afe3bca25a6a76eb706ff34e155b0"; - sha256 = "0r1xiw0f46if7whxan2asi1klyijlyaf61p0xg5v81nnh64w6lhs"; + rev = "9fc2594deea196897997c31e68056b7977f13495"; + sha256 = "1mnghdw3yhqh1lzjqfrmwrvnx391dkayfzkgcpx7sx01hnvqc9ib"; }; }; @@ -83,12 +82,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2020-02-09"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "8da127b946b519a271a73dc6f337e97190a958c9"; - sha256 = "0df6nhc39xnxll2smxyj6fxqvkq7v2s44cs2n4zzdg80w1wswkgd"; + rev = "ad76abd6bccfa1a5195d20f7964c6393fe1a9524"; + sha256 = "098jnybc11cxv2q8396hx9r814i5793y7a9kdl4ambpbvhm86vad"; }; }; @@ -127,12 +126,12 @@ let ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; - version = "2020-03-03"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "vmchale"; repo = "ats-vim"; - rev = "045fa53f1e0699e980c5c7cd85ecf237ae527ff0"; - sha256 = "1rpqy40kw0cn2h02ly71syvwz5j77xfmrs4mijkn7k0dxgamhy5s"; + rev = "a17576687217a2e8066356cc211afb99b5de65e8"; + sha256 = "0dv60za39v2w5d9mbk1r263fqpv11bdfyqp39b0snw40f0kh92z0"; }; }; @@ -171,12 +170,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-03-13"; + version = "2020-03-26"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "fa05cbe493224dc132eb623025e94a5e29fdcccd"; - sha256 = "062pi6dqxg3dfbb4qw5fg9d9jh6zpbrznkg1sim2j1c8g67mlpfl"; + rev = "4ad0ce02b8efa3c6e014e224a34b67b927d31c88"; + sha256 = "0crg0gph8wmb412yvknh6ic42i3p5hd8c736rv61v52b2g0dgwxm"; }; }; @@ -270,12 +269,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-01-27"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "364e803cfae22a9ef6d7543631495ba8644f3cce"; - sha256 = "0rfy490584qrqa01p3yp7wzgqxn69vbdg37fydj43ah8i1vj3w76"; + rev = "00ba51adaa5c2e6100a57e452fb6f5b6f1548f7a"; + sha256 = "0jmy81l726in57l89874lmfbgqz2gir81xa0np9c7rqypwrwg5r1"; }; }; @@ -367,14 +366,25 @@ let }; }; + coc-fzf = buildVimPluginFrom2Nix { + pname = "coc-fzf"; + version = "2020-04-04"; + src = fetchFromGitHub { + owner = "antoinemadec"; + repo = "coc-fzf"; + rev = "e4f640215a55f1e3447aa872de7a4d83d003964c"; + sha256 = "1q78qw6nagd0wis6ixg7y290692a9fsrjmrv9cdiv7l8q4whqync"; + }; + }; + coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-03-11"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "8a8517c44589cef8c7061e6d352f77627b5a79b4"; - sha256 = "1qg3mk43wl8shx66nydykdr1vsfx4n5lmgngndwnjjkf1csppg9q"; + rev = "54dba825875c6bd9e5a77121662d40c96bcedd99"; + sha256 = "007j7kkhp8j7l65frkbmvldfjq2jirpz60n6ascjsy5vq471i7n4"; }; }; @@ -389,17 +399,6 @@ let }; }; - coc-fzf = buildVimPluginFrom2Nix { - pname = "coc-fzf"; - version = "2020-03-06"; - src = fetchFromGitHub { - owner = "antoinemadec"; - repo = "coc-fzf"; - rev = "ca394b48ac9c78ce95d6cdf3807927a7b6bcfcbe"; - sha256 = "1nsqdp2zma7rlzynm58z43vk5hyrcz8kn7ak32979p4a3fvdyj5c"; - }; - }; - coc-highlight = buildVimPluginFrom2Nix { pname = "coc-highlight"; version = "2019-10-18"; @@ -413,12 +412,12 @@ let coc-html = buildVimPluginFrom2Nix { pname = "coc-html"; - version = "2020-02-10"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-html"; - rev = "2221768187a1bb87af44715bce563bc7fc6917ab"; - sha256 = "04rial5fvyq68qj66ys33sgw7020r81jjsxsycm6y0shn8pjd33y"; + rev = "8ae5d2832761b5868f69c67f33ce26f9edb26c65"; + sha256 = "1rf9qfimnbxjr5s55pzm8npixan5cz2v17g4j34f18i9ky6yyk0b"; }; }; @@ -435,23 +434,23 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2020-02-27"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "4c5124b38f1b2a252bf4713cce67a1bb0cf04b5d"; - sha256 = "1ygr4dpbjgy3872fc9kaivgbplkyc9l9wmifxkapp9s9ll11c7l0"; + rev = "e4dd6b744f7eb356afa8db7b958bdf5910b5ec6f"; + sha256 = "0fndkbmi84qgqfj6ny04wm05mnrvrg36bb04vk7zj90k8a51xrrr"; }; }; coc-jest = buildVimPluginFrom2Nix { pname = "coc-jest"; - version = "2019-06-17"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-jest"; - rev = "a893464148ab205ef717f543e205c0ae6cb05009"; - sha256 = "0d83cmpiq2x0v7bbnyka30pp1rl33idb6zfisahc25ycnkh32212"; + rev = "3fac1864ef1af87ee096f0ab6514a4b890363231"; + sha256 = "1z2sbzr84gh935553g6bfkpx7s4i37s200a1s9dqay9cq92jh7hy"; }; }; @@ -479,23 +478,23 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-03-20"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "a4a82cd0ea5fb71399ca02c03456e9862a54eec8"; - sha256 = "1cj05rzzwacf0c2gk0zhb5ln6pywyc35p2walna80ncpyniyk6k2"; + rev = "675477fc9c95d87000eee343e7e478db5519654b"; + sha256 = "1x66hp1hxlyacijj1gbffa6cqv8lg6mralxa6rkqyby6wgiydswy"; }; }; coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; - version = "2020-01-11"; + version = "2020-04-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-neco"; - rev = "e203327ff80c56fc51d85f73df9049455edf1a56"; - sha256 = "1snfb92pahdfkch0cwhd0pcmia35al518351np2hq8dhbs7fc02n"; + rev = "fe130c2c3b883f8b58f70f15bf36c73923faa3d9"; + sha256 = "1yzh3p1xx6k6rnr9skdvy5lsb7hz4kh2y537ill8a7770y936vn8"; }; }; @@ -512,12 +511,12 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2019-11-29"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "f2c5959b0e8a5658017c9dcb57f03d86c3a7c484"; - sha256 = "1c2vvjvji5wkmxlm5mi5q4px2x9fslkqsw4vii3kjc7cz2w4fnhk"; + rev = "77e32b628e9b5fc6732f8b43ba6aca36a2e3f305"; + sha256 = "13hfmdy0r4mlsvzvj0n0ik2dsxwkn58fkfqv6dgfxdc55nxwgkv0"; }; }; @@ -567,12 +566,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-03-17"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "881de16a72440c2db7ecc0a68ae0d32a2e5e6864"; - sha256 = "12dwr6r30b78rhj2b19x2l48ri7qzvl2ggr9x6189fhbz4h25rs5"; + rev = "62aa65069c92bf7753bb122559e8807ec304a6f4"; + sha256 = "1fb884c841hpzhzv26fsq5yli3k5vk8yjq0l55zvlg3a2mxfpj6z"; }; }; @@ -644,34 +643,34 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-03-21"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "54bea1ec1ab44802a155f876a4d1cc2c44b2bc42"; - sha256 = "0npjc7c3x9mdqc6asav1f2wwv4p6lb5hk7c1p9b7m3vjg21w0k22"; + rev = "17fdfd9462bdc6780ab3087ca9293411ca147490"; + sha256 = "1rwpjj24v1px8pkj21g36cl1nir6c4lhrsslf3i6hk41xa8jw64z"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2020-03-17"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "8072352a371261a922f30a89a6b5c6b07123da84"; - sha256 = "1nb33ndl0pzxw30ibs6p4qaa781cni93ffgypcc69wg4b2r4341a"; + rev = "314df846b6bc2be9b7c808ed949a1fd693bba402"; + sha256 = "14fmyrfmyk66wbfnbb2iwy7azjk10d8gyrv5p950aagmv8shif52"; }; }; coc-vimtex = buildVimPluginFrom2Nix { pname = "coc-vimtex"; - version = "2019-06-20"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vimtex"; - rev = "842b37bb4078863ca5f070731e21effad14f5d58"; - sha256 = "07w1rp6jxn7q99p6gb28azgial71frjpx06ciz49yib8816rzim9"; + rev = "0a4f8ee29afc4e1dcfdc8846f116a1db32fa9867"; + sha256 = "0z9kxm40kr8a5sa06vkg7xaai2n54y21xfkrsx774zzdkcrrkizk"; }; }; @@ -708,6 +707,17 @@ let }; }; + coc-nvim = buildVimPluginFrom2Nix { + pname = "coc-nvim"; + version = "2020-04-10"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc.nvim"; + rev = "09853cf2808904ed6eb93b207b5cec8dd69bfa34"; + sha256 = "0i5jciwparwx1zgisa6l40xmamafl6syykb2hc953q1hfl24z9a5"; + }; + }; + colorizer = buildVimPluginFrom2Nix { pname = "colorizer"; version = "2018-06-16"; @@ -865,12 +875,12 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-03-07"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "c16efc107e8bccd927f71bc2815d48f3bf94f1b8"; - sha256 = "133yivm5wp4m7sx62mcjr0vy7br6gcrh0k25nszy3vpdnnyc1mh6"; + rev = "4375ab9cc1fe0077c36a9aba5dd7145ce4a2fa6f"; + sha256 = "03cl55s4f2qa8hwag2w38gfc7mpp6jhy0vx7qsmkn24cqk1jvv2k"; }; }; @@ -898,12 +908,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-02-27"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "f962b9908f48f823b817b7fd61ce9d706bbb41fd"; - sha256 = "1sv2g6sx9ap71937ky8iysck9q32mracmanc0vnyvffvqy7jwksf"; + rev = "ceea32bb05ec33512c556054b91aff9c1d89f1cb"; + sha256 = "0jfp9xvsin2p9zdd5hsrhkm6rjwdmf130xmis3zpm3n53nh88xh8"; }; }; @@ -942,23 +952,23 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-03-21"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "c3206a06508a197650ee4e1d85da39ff24e3a56b"; - sha256 = "1yy6j5zpja8jr1j8sghwc1l0fkb47r8cvv36ckf75x9x5gpylb5m"; + rev = "7a71d54b725344dad92939901f319223411dc102"; + sha256 = "01wk4id1gffp7d88r5znwsay0wqkssdbw1rc3wjaax9a604j0v1j"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-03-08"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "cb0e2fdb75a2d37e75972933c25dd2781d8e6ebb"; - sha256 = "13miw4z14fj11afs8x5yxcbpn4an8vhvx8k3rl3xrvn1hq5jhwqx"; + rev = "1c240e64703b67e0c7fcfb51b59d2bc276b668f5"; + sha256 = "049xx1al44yj3r3wsqwi4z861dkcw06cgfw1czaiiy696dah5fn2"; }; }; @@ -998,12 +1008,12 @@ let deoplete-fish = buildVimPluginFrom2Nix { pname = "deoplete-fish"; - version = "2020-01-02"; + version = "2020-04-04"; src = fetchFromGitHub { owner = "ponko2"; repo = "deoplete-fish"; - rev = "4d27bfeff0269ae66e88645613a2b18ffae7a969"; - sha256 = "1l84dywfvgxclhicwdkdcqr0hicmish44c456g7vcdfqq97qvzp1"; + rev = "c4cfb934bb6ec69d7f1aff9d376b7d436bba5c93"; + sha256 = "19a6j4qsqljz1pmrn4fx8v1bhlfpqdq821fc2ibjd9h98f6dzi5p"; }; }; @@ -1043,11 +1053,11 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-03-10"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "29187f9d71ea415afa71e9e416ffcf32619aa65f"; + rev = "34e48ef9569536bee335d4e36849e739e31b8aeb"; sha256 = "1xlgfngaahbnwk6bfnmzv63jdz70w0lvqzpa5zbsyb5p52p4a58i"; fetchSubmodules = true; }; @@ -1121,12 +1131,12 @@ let deoplete-tabnine = buildVimPluginFrom2Nix { pname = "deoplete-tabnine"; - version = "2019-10-16"; + version = "2020-03-29"; src = fetchFromGitHub { owner = "tbodt"; repo = "deoplete-tabnine"; - rev = "a05c97b966b78a9d5cb97b9c2d7e1ec2d6962160"; - sha256 = "1ni16151rknkq66967bwy82xs4pr9xgl5zb7dv447lhl8m3f096g"; + rev = "eef0e2340e19aea05fe5759b7da3b13cadd375c4"; + sha256 = "0q10zcjhjgak3w365pagd4ym5mmj3yd1lfsxv0d4wr4lp9a51sd7"; }; }; @@ -1154,12 +1164,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-03-21"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "1439c621dc94016c504e1732ce8270081a42768f"; - sha256 = "1c8qx839zmf52cfazlbbnlhxw6cvnsr3ds0rclawgycbl4s1qy8f"; + rev = "eb2307cfa84280041bc294e2091cee40a9183db8"; + sha256 = "1zhz2d37gsbc2v2pz4k5m58r9d70x3ngbzcm6kxarm0farismxqg"; }; }; @@ -1198,23 +1208,23 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-03-06"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "cd9beff92b52990d991a0b6a0f4d20aa600e570c"; - sha256 = "14z9di1x0zbq1d4vvpn8pvnp3fscdv7iqyymaiavw096nvj3d1cc"; + rev = "31533d9c6c2723dfb4cf5691c83f330a3a0ccddd"; + sha256 = "1ygm4g90zv009iqv8k8n4930a7gpij5jxbz7dqq2dfyj4jn37rkf"; }; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2020-03-15"; + version = "2020-04-07"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "c5804257c6b38c5537b71ac91ed051c70eaeb5e5"; - sha256 = "147cqfwzaxwc1fzvynwdvx1cvx6zziamcayrvacqxs7vzjnz8lx7"; + rev = "8aff78a03357bf573abcec407a543762f281b7d3"; + sha256 = "015sfz2j0mfnfpm6zf8jnh0lm8943cpccjlbj7ks1dsvs36m056i"; fetchSubmodules = true; }; }; @@ -1288,12 +1298,12 @@ let fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2020-02-02"; + version = "2020-03-23"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "4bc15cb4db274ed2b10bbdde414d2b2ab1f7cb00"; - sha256 = "1y4yfw15g1l7f1v3kynr7ynga8g30rvwmy80dnfpg7v4a5jaf4f1"; + rev = "5872cbe9d921eb3ec79dce14a1f492f44c1cbaaf"; + sha256 = "07mls0yczg2cmia2jn0s2rvgwl07yxlm4hyvjd941p1knvn88x8q"; }; }; @@ -1377,12 +1387,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-03-17"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "d4d36b412bdc53e8bdaf0e2714a2227f51781d68"; - sha256 = "0wbq8ckgzw867qqwjzm48jnbgp7yjl1vim7nsyk1wjm2d8z0xjm9"; + rev = "f86ef1bce602713fe0b5b68f4bdca8c6943ecb59"; + sha256 = "0h3mlc4lvnlzg7pfrr09vrfn93lglzfp5ca6bl4jhsi63xw7x3ad"; }; }; @@ -1410,12 +1420,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-03-20"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "63b7813cac0e67cba1ace94b42ef1af291e35e47"; - sha256 = "1p4blbngaxdlacmrqiyxw8y4d0jiws104np68d31mfnvqghylcdy"; + rev = "54553c5c915856d389a071aae5a2dba827727b7d"; + sha256 = "0dpwvyf3vrrdiy0w2hplf656c8b1yqlcv495r7bz9ksbyqhsp70f"; }; }; @@ -1474,6 +1484,17 @@ let }; }; + gruvbox-community = buildVimPluginFrom2Nix { + pname = "gruvbox-community"; + version = "2020-02-24"; + src = fetchFromGitHub { + owner = "gruvbox-community"; + repo = "gruvbox"; + rev = "f5711c15480b83378bde13306fa997057c0c81cd"; + sha256 = "0vx289a7av31dxm58c6kmfdnsrwnq1rzj5rwci2pqjdac8ds2qm0"; + }; + }; + gundo-vim = buildVimPluginFrom2Nix { pname = "gundo-vim"; version = "2020-01-15"; @@ -1838,14 +1859,25 @@ let }; }; + lightline-bufferline = buildVimPluginFrom2Nix { + pname = "lightline-bufferline"; + version = "2020-02-14"; + src = fetchFromGitHub { + owner = "mengelbrecht"; + repo = "lightline-bufferline"; + rev = "17683bc5802de7f295f2583a15461e2bc662f98b"; + sha256 = "1rlamxwk2gm9pyxl9vym9w6rhgimzqa2hjghy3qdqwvif6w8ir6l"; + }; + }; + lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-03-16"; + version = "2020-04-06"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "893bd90787abfec52a2543074e444fc6a9e0cf78"; - sha256 = "0cgzkyhpr1p184yc9b3m259i5mnwdyj5zg80idywvv2gh8phw2y7"; + rev = "b8976d2e549b417e5d1c1594fb9034b749976cc0"; + sha256 = "1w86bg63qvigdva1g8w4lba63ghlsxfbjb0rqsxyxg6w7m9k6lhd"; }; }; @@ -2016,12 +2048,12 @@ let neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2019-11-18"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "5be295ef60f0e3234164ef822a7471389a7035c5"; - sha256 = "1y73hyb82vs3wcbv02k9n4krvmyn1yhp1mh88jslhcniql2nnj2a"; + rev = "4fbc3f5f3a2b2d5299c388e2f1ffef04fcaf87ba"; + sha256 = "0lk5p2aihalcarsjnvn1yidgv0xqp1bk29wywsbp8ni964s0si39"; }; }; @@ -2071,12 +2103,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-03-08"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "1fe306e5feeb9423fd5c78b8623e38998bb149ae"; - sha256 = "1bixsgdraf3kzn8h3fv4a4jw58kd5r09binhjsx8622sla3j3pzy"; + rev = "d10e53956161176c7f8a1ef2899880d5384f47b0"; + sha256 = "0zv27bln0n687s0xm19nrk16i58hmxdhy26jmjh335zji0ydx27v"; }; }; @@ -2093,23 +2125,23 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-02-24"; + version = "2020-03-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "aed6074642363d0c97da5cd86e1b23027479df84"; - sha256 = "1smfyghn7sxdqx867145xyjranvrjaa8s9fp1wvyzb3s3jfwh3mk"; + rev = "2e72985f712f0d5cb707beba151555a1f0003630"; + sha256 = "1lvm37q9zq4a077f2zm9dfp8zfg5d3853bmlih6sc8d6i477kcmb"; }; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-03-07"; + version = "2020-04-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "8870feb5ab31e1acf8d80a3619f4ce47abf51a54"; - sha256 = "1q7sb4adpxkzdzyx7rlmkqzi612nsjkcs489m16j2jc20wsc2d9a"; + rev = "3aaf5e763410f57916227da407fd90726e19a612"; + sha256 = "0zkw2q2s7756p4xgf49v4lj8lrzw35x81h1wzia7d9k92d7ivwca"; }; }; @@ -2126,12 +2158,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-03-16"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "ee8bba435bed2ecadafb97ff00c2b7b07eedc1b4"; - sha256 = "190k2b0nzkkpakkfwbhmnh5q0b9vj882lvvnzw6dyiq5w5z59pxb"; + rev = "964745a9a8c2a61b876f3082fedcb321c415ab5e"; + sha256 = "0pmim51nj2c4njp5b9wihmg208chwc1vrq83ccff0hbmdc1djr60"; }; }; @@ -2181,12 +2213,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-02-20"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7"; - sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k"; + rev = "f767dd34a0bda0a6db8efa43257c90981947f0ab"; + sha256 = "0m02yxs235jznf2y1hr6zj04fb3igra4lb8crgl3slsvdw3zndb1"; }; }; @@ -2225,12 +2257,12 @@ let NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; - version = "2019-12-12"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "chrisbra"; repo = "NrrwRgn"; - rev = "8a2930141ada6719aae6c53bf4e4a8dfc3f8dbed"; - sha256 = "0mns43i7jj0kragylfhpawbkd9wwky8fbyvwx33406193ymyn3y3"; + rev = "f8b5c3c649fc12dd1181564f29ebc6c51e231126"; + sha256 = "1xh2ds1y5gj07ycw3b5lw7av92q39wwrq13mz8j37jmnhw0ppbl4"; }; }; @@ -2280,12 +2312,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-03-21"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "4fe58ec4e1fa3500c7ef98464174bf6c4cb8ce67"; - sha256 = "1xyqbr0f2pgvbbk0cpg92pswavff910hy8rjkm05grhqw43vkzcg"; + rev = "b6dc2ae6a95051e93486224481b80cb5b446dcc3"; + sha256 = "0nc47nig0bvbp3m246gjv06a32ysz20nmxs6pzga1klzm4mim5vl"; }; }; @@ -2302,12 +2334,12 @@ let nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2019-11-25"; + version = "2020-04-08"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "83c6f4e61aa73e2a53796ea6690fb7e5e64db50a"; - sha256 = "0yswx77gwxsac4aw2hkx0krjz4jh7pj5bgpvshynj5dlp34ip0m0"; + rev = "b710bf4daccb603a423754794fb446e5fbb59576"; + sha256 = "16ma42niwsc066s991idfbwvm0dvwqwdr2zfkc3av10hyimxnzbb"; }; }; @@ -2412,12 +2444,12 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2019-11-06"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "82ff416ce99cc9f69b1af54b8832eaf6cdbeaea6"; - sha256 = "1297h9jipfx2xw5dqh1286g2syv5c18g15644lqn11s62skqxd16"; + rev = "25070c47cae8c7a9d62c8c09a1339e761448fbc4"; + sha256 = "1x2a1wnxs2qmv2zqgq2bmwskdp1i4ga0yjxjyziyr96p48m7dcjp"; }; }; @@ -2489,12 +2521,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2020-03-17"; + version = "2020-04-04"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "49b00ee08176636384c98690a4719565372f68b9"; - sha256 = "0lsmrmjrhyi1rm4sp3hs9lhs8v8ff50zc1gy4bg6gsxw4c1ghl3q"; + rev = "ac80025b868bb6e52b9dda893246ee5f992612de"; + sha256 = "1pvw8d53dgm580r9n2qcx0w56g4kanvd00ny6c6l71hxw9lixnlb"; }; }; @@ -2610,12 +2642,12 @@ let riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; - version = "2020-02-17"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "gu-fan"; repo = "riv.vim"; - rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3"; - sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5"; + rev = "e26c3e8dce4c1332e802cde84f83e61ec8a13986"; + sha256 = "1da3iwrpy08rayrsf8v0ml4khlp9j5i4cffpv9j3iyalcbhk2m9g"; }; }; @@ -2643,12 +2675,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-03-06"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "255a81f091a08786e004f215651227a2fef3a64c"; - sha256 = "0kn0yhh2cmd6h5wwz5y8v9j3mqb8ywmzzmdhglr6wmdlr7bkk75g"; + rev = "ce5f2b1c881de1b2101924dc5a19046399d74db2"; + sha256 = "0zjzn091js0i76klk9al4gw1l2ads132mjl0nrdhbvl7ilypdajh"; }; }; @@ -2718,6 +2750,17 @@ let }; }; + SimpylFold = buildVimPluginFrom2Nix { + pname = "SimpylFold"; + version = "2017-06-13"; + src = fetchFromGitHub { + owner = "tmhedberg"; + repo = "SimpylFold"; + rev = "aa0371d9d708388f3ba385ccc67a7504586a20d9"; + sha256 = "1gjv78x2cgh79a04l411kdhkm53f93czs54p07kadpa9659z93ss"; + }; + }; + sky-color-clock-vim = buildVimPluginFrom2Nix { pname = "sky-color-clock-vim"; version = "2018-11-03"; @@ -2753,12 +2796,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2020-03-06"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "17b7f8cba9cc83ee684f72cc6f354f0677c0acf5"; - sha256 = "0rb9dx0lvqvfqyiizfjf812zi0ladjiq5hxjc15rgiw13ivxix0d"; + rev = "58fc865f83b600ee8906fe35d02749dec6659607"; + sha256 = "0rv9a6gzn5q2ajsyfvsrybn7hyskckfa7wad4jr8xaylccn5r7x7"; }; }; @@ -2817,6 +2860,17 @@ let }; }; + splitjoin-vim = buildVimPluginFrom2Nix { + pname = "splitjoin-vim"; + version = "2020-04-08"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "splitjoin.vim"; + rev = "4aeb3b59c8a2d080960d17318498652e93e33776"; + sha256 = "0gvchss74q4z54008hs8nylsr8xgz02wqshh7fqx3jbyhwb0zzms"; + }; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch-vim"; version = "2014-09-21"; @@ -3095,12 +3149,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-03-18"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "fc2e986f34dc6b21e80d54845a7b538003129feb"; - sha256 = "0h76726rnqrdvmm9bpgnrli66rg18b2snw077wz0zvcz7g0l9a24"; + rev = "5a43fa177d6650cfb3224a3989f15e83999afa7f"; + sha256 = "187hznxcrvb1j8dj2rrdlk3f1cfx0d0l3fnfabh1da0m9cjg4xbh"; }; }; @@ -3150,12 +3204,12 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-10-27"; + version = "2020-04-01"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "22b3d81f9b7146ddf1bd05c1b2f9407af14d3ed7"; - sha256 = "12z5a4zkrajzdyf31a5l7hlyif5ywj8pab25x98hwqjs38x8lklf"; + rev = "c6f7ca14554196ae15a5fef9e568d69f04b9ff56"; + sha256 = "1hx9rgx44dhc449r0j6azkp1bm20n9c3fyb112w277a2jvf0a2c5"; }; }; @@ -3392,23 +3446,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-03-20"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "119477060d55bb5de173b28f310d430af5593618"; - sha256 = "0hgq13iigpk8cy0lyamaz135019qbxc5nckgv0363ilhk4k5ilrd"; + rev = "a100e8967163d36ed624a71a313ce31cdd2b1151"; + sha256 = "0nissvkwxqncwaw73kwk4fjnr0l43c7vj98l398pn3bkj8kgpns9"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-02-17"; + version = "2020-04-01"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "9772475fcc24bee50c884aba20161465211520c8"; - sha256 = "1nbwwaky9j4w9qjsbgg2a9zl3f2i9zjqqbh1lmz4z9m1mixj6djp"; + rev = "3fb676b8729a98817f561ef1554c0ad1a514c96a"; + sha256 = "18bfw09ywmw10jiv37iw2ijf46jhj2yw5wndqdgn7k42gy1wk7p6"; }; }; @@ -3458,12 +3512,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-03-18"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "80bda05d0f5383af0a09b9ca4a2918a23d372f60"; - sha256 = "1dgqz73cprn2s3xpdfpyjq7bmwjpdrz8b3kf6mwkajgxjl89sv7m"; + rev = "555c956db3bdd8ae6f1aa5af1c5fd37eac749e6a"; + sha256 = "0dhxa9jrhahqs1wh41115w8r3xcczbjpvnj65ldzs7q9vc4n12xq"; }; }; @@ -3502,12 +3556,12 @@ let vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; - version = "2020-02-09"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "4afbd45238da56898013546c609d72818fc97a1b"; - sha256 = "0gfqd927pxqszafbycns9f08sw6kl3z6xijvw2l0hgb5zrvfc5lg"; + rev = "8cf4b2175dd61416c2fe7d3234324a6c59d678de"; + sha256 = "1iga1xdzygnr9rhv0kw01nr3vahl2d486p06slmri2vy8ngzym0q"; }; }; @@ -3579,23 +3633,23 @@ let vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; - version = "2019-02-14"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "alvan"; repo = "vim-closetag"; - rev = "9f13011738e11d6f926a641d774635fa415f1b6e"; - sha256 = "0fm9h1i5jfyq3hkl41jsr2hvcskwh7hhg5m0yxbl57bnigapcz3p"; + rev = "90cf416c03ed841ad7f3d44f4d6f3192f216176a"; + sha256 = "0kxba7s0s66m2k4j1v8iwq6m5j9843ha67br03dg7d9ya4qiyyw9"; }; }; vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-03-20"; + version = "2020-04-01"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "d6676620f7a85fa49e8893cad041df59497fd845"; - sha256 = "01wrlq9h2wzngi8qna0zrwycrp0iqp7qsijyby287zbckrs25rnd"; + rev = "d3d8b8b6d73da3e1b19089f98a85901f0b652e2f"; + sha256 = "0r20cl6i4k7r2y5d8i3dbrxmn01mlnww2qgvjgmafa8nqd16gl57"; }; }; @@ -3744,23 +3798,34 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2020-01-02"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "59cc0a16970b92afa1c99182c60e35e01cdaa409"; - sha256 = "0v3jhp33058cl7raqp59704m5ljsibpi9vs1hsiwwxf2pgdjii3f"; + rev = "62646c502fac1455318933b9ea13ec5899ba7c84"; + sha256 = "0qpgx81xpwr3ab3ardp820aqifvxh2jsk1qw94p26q6iiab7kdcv"; + }; + }; + + vim-dasht = buildVimPluginFrom2Nix { + pname = "vim-dasht"; + version = "2019-09-29"; + src = fetchFromGitHub { + owner = "sunaku"; + repo = "vim-dasht"; + rev = "9c7484eaea26b8dd1edd8af21a38cee6c4ef4f49"; + sha256 = "1rjckipy7b4ygwvc1hbc24da1x3pwklbkfljrz16znlcm2y5q72k"; }; }; vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-03-08"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "ebaf80de4b4e12cc8ee068ad2f134f0b23ea039d"; - sha256 = "1lq2fqhca2dm55pa0rlq9l7acfif8vlkjd04hagxjbpa9ja348kl"; + rev = "58e57b6eeb407dba7ff6e607342c08c32b6fd398"; + sha256 = "0czkkhj2s9vjis5h4gajvnqc1nraxyqhyvzk2ndffhnzxvylhd5w"; }; }; @@ -3777,12 +3842,12 @@ let vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2019-05-14"; + version = "2020-03-31"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "7049f5061ee48301fc00ea69f2473325d43bf5cb"; - sha256 = "1x65adb2xfscbyx8w3wl1av9c0jqlch0kpch49jxyvcbmxdlgf65"; + rev = "5bf29d8a41b4ec93e6c04b9d4a6c626b408c27c5"; + sha256 = "0nvhsj12gsjgncpmvg8b1qz675ghfcsib5gj22p7j4l4brih563r"; }; }; @@ -3887,12 +3952,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-03-11"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "088cfc407460dea7b81c10b29db23843f85e7919"; - sha256 = "1w9w4arzlbjhd5kcvyv5fykq9djc4n4j1nc75qqlzsfggbjjwhbk"; + rev = "47d05df7fb41493821b0b3e3db72d5faeae3aecd"; + sha256 = "10r9h359bla9gy48kvf2681r7gzk7klwrf488xc1rjzhgd41ila1"; }; }; @@ -4008,12 +4073,12 @@ let vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2019-04-03"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "ce9ac790430699d346aa074d7f339f2e738284e3"; - sha256 = "1dlpmsads32c8v49dqgnz1d06bh0aikgl1xq2whiimm2va9vfjng"; + rev = "0c7cf6dc038223b44e3c0a702fe2acf997768e8a"; + sha256 = "14k1b7gjj1sh40qsf4wxbn0dymmc4jvsrd9pacsr6li273aiy6gq"; }; }; @@ -4063,12 +4128,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-03-22"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "0e35c9bbc78159318e7b7ffd228f09a96afb8fde"; - sha256 = "098fz3lmfysv6gr5cjwgqsdzxjxygwc0x4ak1sxj3h6djys5x66b"; + rev = "85e2c73830b6bb01ce7fc3a926d2b25836a253eb"; + sha256 = "1zbw8cnjl9m59grr65kfkgi8p4850rjp24f1plp4jhidjmsfhv7x"; }; }; @@ -4118,12 +4183,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-03-12"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "0e509fb0ac56b24203800a1fab35162c8da9c9b4"; - sha256 = "0m1vqbgsch4vxs5y8kk03mys2qdzsfik5n0gxp1hl8a7fb3dlqsm"; + rev = "b7db78b258aa9925f3c86968b348413732964b3b"; + sha256 = "0933b60bma8xs7cmw1p2npfzyqmpww3frmcg51dsg2hsg9rq213q"; }; }; @@ -4151,12 +4216,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-03-20"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "50d52bafa00448ca8cde2b0e05b0fe71c9397762"; - sha256 = "1c8dwllscwxiqp409zy7ajwz84bn8g7p9gldqrhx8i9l7q382z0w"; + rev = "b995086646f29de25acbe7df2c08cc196c4641d7"; + sha256 = "12s04gnnkkmhlm36gxpy18ngxj88b9p5b6vzdq662gmwl3wk98nc"; }; }; @@ -4515,12 +4580,23 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-03-14"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "05f9953fcaccc18a8f5c1ee9db06ac2b26662347"; - sha256 = "1l9rpymz6xb9x0kd8p90hyl4yjn59sf590kmi18cvr4piaqa796y"; + rev = "496c44d89281d1e13c9bb4c75a2e69daba48b47b"; + sha256 = "09xr8pbx27qpffcr0j1857cpyxgkv5xay6mgpzvynpxq21xrmm3q"; + }; + }; + + vim-kitty-navigator = buildVimPluginFrom2Nix { + pname = "vim-kitty-navigator"; + version = "2019-11-04"; + src = fetchFromGitHub { + owner = "knubie"; + repo = "vim-kitty-navigator"; + rev = "c32357892f10117291461631d51a6bfd20e72b9a"; + sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; }; }; @@ -4581,12 +4657,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2019-11-11"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "fba44d7bab381b2107f9c6db0322282910e98267"; - sha256 = "1scv9zscvywr40rw6z1v4vsgq8j8mfvp1hxs6ana22wbm0qdwkrf"; + rev = "47186eb47f543becc34a048a37298954d89bf7c8"; + sha256 = "0265614sa2d2s3xpzfliq159v7bmdvlc9yyw5c89pqv4b86gjxzf"; }; }; @@ -4636,12 +4712,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-03-22"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "3dd7a19e8689847956266e0be1bbfb4ca12da746"; - sha256 = "0dj1b8v9iz67m833x1z3s7jac0jpfxgs43ylc6m0v3al67qcb0mj"; + rev = "4da362f49254774fa5ad407ea3b2407db0147590"; + sha256 = "0wlgj485dy4sb3hbwi8kp69d8iw2zh5xny09xv2zk174dsvp7xxx"; }; }; @@ -4986,14 +5062,25 @@ let }; }; + vim-pico8-syntax = buildVimPluginFrom2Nix { + pname = "vim-pico8-syntax"; + version = "2016-10-30"; + src = fetchFromGitHub { + owner = "justinj"; + repo = "vim-pico8-syntax"; + rev = "dbdd92fad0533eeaeaea844815d4de11e9507ce7"; + sha256 = "0say0bb74rdbabgsf7rrbm8x841pmgh80fwr6kn94fgphr3vhm0s"; + }; + }; + vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-01-27"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "c3b6b7c2971da730d66f6955d5c467db8dae536b"; - sha256 = "088jyadfssgyyfb588vahskszbxm1vygp5dxkky7njs6v3g8lk5v"; + rev = "e718868e85e2a32410144dfcdc3ba1303719450d"; + sha256 = "1znaapjdz9nwgvr5il6rck82mz4dhj1nan87w2216xwpp53w61fb"; }; }; @@ -5065,12 +5152,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-03-15"; + version = "2020-03-30"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "2decf51f19834434e34f1a8d79056b7014120ca3"; - sha256 = "1hph6w6mrlma96ys1nk9v46hscmplkpp2y7xq1ld2bnfs4wab3v8"; + rev = "9fdf92846fbeb8445e535cf0c5bdb4b1dce4a506"; + sha256 = "0w98zcjvb64fhd6ahy3cqrs4y7zacak9nzpkkhr03l6zzbqb5kz4"; }; }; @@ -5096,6 +5183,17 @@ let }; }; + vim-python-pep8-indent = buildVimPluginFrom2Nix { + pname = "vim-python-pep8-indent"; + version = "2020-03-20"; + src = fetchFromGitHub { + owner = "Vimjas"; + repo = "vim-python-pep8-indent"; + rev = "60ba5e11a61618c0344e2db190210145083c91f8"; + sha256 = "1blyhkykfnf4pgfq9hn9l8pq0iqdvig9m4zd8qq9aa9rlm8f0kzh"; + }; + }; + vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; version = "2019-12-20"; @@ -5175,12 +5273,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-02-13"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "fbf85d106a2c3979ed43d6332b8c26a72542754d"; - sha256 = "02k6l6wykw7i26fz2avjrpgml79hy4rrr2x9106g84nc5vimswn0"; + rev = "3db19e235bff9e6f6e0941836f67416dc761be32"; + sha256 = "045b2gcmbm5kc4c3kalkjc36ck9llrbxjj2amga0041svgzb79sy"; }; }; @@ -5329,12 +5427,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2020-02-26"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "73449cc1bf3375ce6f92a1018821cdd0ae91959d"; - sha256 = "1wsrgchjxhircgdvwphvswnl7jq5b63l360wnjjlmcff6nvwhm77"; + rev = "a81139239d6447b1c021e4873e6a14b47f32b65a"; + sha256 = "0wavkm9k2vm23nm5bmc3lpm6cac7mihzjcyk4r77qgdgmnnxkm49"; }; }; @@ -5373,23 +5471,23 @@ let vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2019-01-11"; + version = "2020-03-27"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "17ac70ef00982b7b4865e2ff0efc34a4a5b59cab"; - sha256 = "1agfxwl3n8kz4zwqmsirwr1zzafi069xinv10q79jkczayfpcfq0"; + rev = "b80367fefc2188c9d6c4a9eb1830360b09e13476"; + sha256 = "0qq81hcavmaq76r38qfy1cxlmhj0aswbd41k2k9fyzilzq4r0bg8"; }; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-03-19"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "6e6b69fd5c12d4645225e7a3ba7d9f3414d83d25"; - sha256 = "0hc914c74dy22nm9bx2qd37py8f2xf3ylnfr3v4lvbxpnlpahjjc"; + rev = "b62dfce8449d8a8196720ddd3cfecbca8bb7fe45"; + sha256 = "1c8r8hw4yqdnmn4nx37vdrjwc725qqr5rbzzxq8wl0min5c4lq1c"; }; }; @@ -5461,23 +5559,23 @@ let vim-stylishask = buildVimPluginFrom2Nix { pname = "vim-stylishask"; - version = "2019-01-14"; + version = "2020-04-05"; src = fetchFromGitHub { owner = "alx741"; repo = "vim-stylishask"; - rev = "cf7ca48708da6d1b18d98fa158f9571af05f6043"; - sha256 = "0wnjl74cf26p138nndj827149psddqins5wicqdzxi2lxijgxhny"; + rev = "dcc12c724cec7f8aee7ad197752710eaa3bfd12c"; + sha256 = "09k1n6r9gy3jikss84y141dqqsgc1a1ia89jj0367an53pfl6dn2"; }; }; vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-01-22"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "634791f5f61aaf49ce16df2698f99a2847f6318e"; - sha256 = "0hr794fn7b5zka3whk3hwh4hznv6y3a19ffsdbgdywr70wwb5grf"; + rev = "4a2020248c8a09950b7e1a2cd864ffb88826572c"; + sha256 = "0pqrb3hz1hjl42khn4691s3ajlswk6nms43hdbglj679y28bkzfi"; }; }; @@ -5560,12 +5658,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-03-21"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "janko"; repo = "vim-test"; - rev = "b302a325116d8708dc0721b7cd97ff59536f4e75"; - sha256 = "099dzadzhfkhf92lv5cmfk0iawbp40v1rz9xxp462hxxcn3p3c97"; + rev = "692b4b879520299ceffeaebb9b28173b75bf48da"; + sha256 = "0lkng56y1wi29jp595jx5vib9zmnsagjczsdl434dn3hakm76plq"; }; }; @@ -5769,12 +5867,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-02-26"; + version = "2020-04-06"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "32fa278c458d8790a2604a71f3ac3d2500112040"; - sha256 = "0v7asrgbqz70jq4avpi72338fcrs81bgapyvar18l43k6vgb867a"; + rev = "4b8e769b52922a17de4ef0ddb7aeacc18386a246"; + sha256 = "1xjcz3dzwxlpaw8pz8mjn1cfp9822c8yvjwws6m4bzalqr0a14a4"; }; }; @@ -5822,6 +5920,17 @@ let }; }; + vim-which-key = buildVimPluginFrom2Nix { + pname = "vim-which-key"; + version = "2020-03-16"; + src = fetchFromGitHub { + owner = "liuchengxu"; + repo = "vim-which-key"; + rev = "4b70b443ba5838b165f90e26f9ed628d7d05e11d"; + sha256 = "197rp20hngrq7qdlii0ai4vb81dlilah0q1wlil8hv3qcf4az7qr"; + }; + }; + vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; version = "2019-11-22"; @@ -5989,12 +6098,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-03-21"; + version = "2020-04-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8c59031d50feeec8b4f3549f70f82564975265f0"; - sha256 = "16a7qpp19gci8hq8h2999pwv0gd6x0mqgifv325mlb0jj5lxy7m1"; + rev = "bd83ce759828c2bd0e210476717384002b9309ee"; + sha256 = "086j0grj6pqidcl3gaxqcc7njgnzv5z4gshrlisr996dfzyrab2v"; }; }; @@ -6033,12 +6142,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-03-17"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "e7b362fffe3a5d1f21bd560d0455e19ff8192997"; - sha256 = "15nmls0m5hajh4k1kjibp299hdhyyjkcax44fmkjq51xlfb1nhc9"; + rev = "5399f850c4c0a1224051e84f6a6cee93055e4e6a"; + sha256 = "13lh8wbyi9gwdn4mj5c88w4jp9jfi2zzxzdlccra67yrb1n3qymj"; }; }; @@ -6143,24 +6252,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-03-21"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "4d3f69a3a5f56bae9475a96c3291ffdcbd9ff0b1"; - sha256 = "0f3dq4lrm9xzh780fd471b7ddibfzb9vfq1k6gn53pmqpiw6a498"; + rev = "d5c60217a27bba799b0ed5a2f16c61ea0a9b314e"; + sha256 = "1km829m6aa3pfgq6p0p0gb102w1b5w454iy8smz1zwipsc84zgp7"; fetchSubmodules = true; }; }; YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-03-18"; + version = "2020-04-06"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "cf4a76acaeed27eb3ca1dca5adf1115b6abbcfa3"; - sha256 = "0si9by2ag2f7xgxidp5215d6wkg1mdhq9j5c4icdpsly9gv3w5s8"; + rev = "97150c0b1fde6a7e3f3eea0abab7d114774dd1af"; + sha256 = "16lwi234cwnp8f5gr8cry40ak2y71f6a7rbqnkq92smmw38fycnq"; fetchSubmodules = true; }; }; @@ -6200,23 +6309,23 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-02-10"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "55b690029791022fd7818ebd0ee395e8976899fe"; - sha256 = "10xkrn4yhjda187mpw1y3qw0s6bp7aklk87pansaa3fvysdf3b6c"; + rev = "0e914f2ab5ab9a9554c31b90be189dca5c4ee3a8"; + sha256 = "1njf3flx5dcahvk92kaf879sd4a75yq4nnii4ljip7bvkyci8ipa"; }; }; zoomwintab-vim = buildVimPluginFrom2Nix { pname = "zoomwintab-vim"; - version = "2018-04-14"; + version = "2020-04-10"; src = fetchFromGitHub { owner = "troydm"; repo = "zoomwintab.vim"; - rev = "5bbbd1f79e40839a34803627e11f9e662f639fe0"; - sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6"; + rev = "63a70b9e12617d6565a0489c68efe44708d19cf8"; + sha256 = "1dsi2d6wrv5x6w2hrrjzqivsspxxav0hdj0pymml6gry2jcbj4s9"; }; }; diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 86a65e1ad8ce..7333b61deae6 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -11,6 +11,7 @@ , Cocoa, CoreFoundation, CoreServices , buildVimPluginFrom2Nix , nodePackages +, dasht # coc-go dependency , go @@ -198,19 +199,6 @@ self: super: { src = "${nodePackages.coc-metals}/lib/node_modules/coc-metals"; }; - # Only official releases contains the required index.js file - # NB: Make sure you pick a rev from the release branch! - coc-nvim = buildVimPluginFrom2Nix rec { - pname = "coc-nvim"; - version = "2020-01-05"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc.nvim"; - rev = "984779f2f825626aa9d441746d8b4ee079137c65"; - sha256 = "0w7qnhi7wikr789h3w5p59l8wd81czpvbzbdanf8klf9ap4ma3yg"; - }; - }; - coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; version = nodePackages.coc-pairs.version; @@ -397,18 +385,6 @@ self: super: { dependencies = with super; [ webapi-vim ]; }); - gruvbox-community = buildVimPluginFrom2Nix { - pname = "gruvbox-community"; - version = "2019-05-31"; - src = fetchFromGitHub { - owner = "gruvbox-community"; - repo = "gruvbox"; - rev = "e122091dad968a5524f3e8136615a479c7b6f247"; - sha256 = "1hncjyfi1gbw62b2pngy5qxyzibrhbyzgfmm9a58sdh1272l8ls8"; - }; - meta.maintainers = with stdenv.lib.maintainers; [ minijackson ]; - }; - meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; @@ -542,11 +518,18 @@ self: super: { dependencies = with super; [ vim-maktaba ]; }); + vim-dasht = super.vim-dasht.overrideAttrs(old: { + preFixup = '' + substituteInPlace $out/share/vim-plugins/vim-dasht/autoload/dasht.vim \ + --replace "['dasht']" "['${dasht}/bin/dasht']" + ''; + }); + vim-easytags = super.vim-easytags.overrideAttrs(old: { dependencies = with super; [ vim-misc ]; patches = [ (fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags - url = https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch; + url = "https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch"; sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4"; }) ]; @@ -706,7 +689,7 @@ self: super: { unicode-vim = let unicode-data = fetchurl { - url = http://www.unicode.org/Public/UNIDATA/UnicodeData.txt; + url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }; in super.unicode-vim.overrideAttrs(old: { diff --git a/nixpkgs/pkgs/misc/vim-plugins/update.py b/nixpkgs/pkgs/misc/vim-plugins/update.py index bbeef0889f42..c6bf605ee473 100755 --- a/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p nix-prefetch-git -p python3 nix -i python3 +#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3 # format: # $ nix run nixpkgs.python3Packages.black -c black update.py @@ -15,18 +15,22 @@ import json import os import subprocess import sys +import time import traceback import urllib.error import urllib.parse import urllib.request import xml.etree.ElementTree as ET from datetime import datetime +from functools import wraps from multiprocessing.dummy import Pool from pathlib import Path from typing import Dict, List, Optional, Tuple, Union, Any, Callable from urllib.parse import urljoin, urlparse from tempfile import NamedTemporaryFile +import git + ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " @@ -36,17 +40,12 @@ DEFAULT_IN = ROOT.joinpath("vim-plugin-names") DEFAULT_OUT = ROOT.joinpath("generated.nix") DEPRECATED = ROOT.joinpath("deprecated.json") -import time -from functools import wraps - def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. - http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry (BSD licensed) - :param ExceptionToCheck: the exception on which to retry :param tries: number of times to try (not retry) before giving up :param delay: initial delay between retries in seconds @@ -74,9 +73,12 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa class Repo: - def __init__(self, owner: str, name: str, alias: str) -> None: + def __init__( + self, owner: str, name: str, branch: str, alias: Optional[str] + ) -> None: self.owner = owner self.name = name + self.branch = branch self.alias = alias self.redirect: Dict[str, str] = {} @@ -90,7 +92,7 @@ class Repo: def has_submodules(self) -> bool: try: urllib.request.urlopen( - self.url("blob/master/.gitmodules"), timeout=10 + self.url(f"blob/{self.branch}/.gitmodules"), timeout=10 ).close() except urllib.error.HTTPError as e: if e.code == 404: @@ -101,7 +103,7 @@ class Repo: @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: - commit_url = self.url("commits/master.atom") + commit_url = self.url(f"commits/{self.branch}.atom") with urllib.request.urlopen(commit_url, timeout=10) as req: self.check_for_redirect(commit_url, req) xml = req.read() @@ -218,12 +220,16 @@ def get_current_plugins() -> List[Plugin]: def prefetch_plugin( - user: str, repo_name: str, alias: str, cache: "Cache" + user: str, + repo_name: str, + branch: str, + alias: Optional[str], + cache: "Optional[Cache]" = None, ) -> Tuple[Plugin, Dict[str, str]]: - repo = Repo(user, repo_name, alias) + repo = Repo(user, repo_name, branch, alias) commit, date = repo.latest_commit() has_submodules = repo.has_submodules() - cached_plugin = cache[commit] + cached_plugin = cache[commit] if cache else None if cached_plugin is not None: cached_plugin.name = alias or repo_name cached_plugin.date = date @@ -241,6 +247,11 @@ def prefetch_plugin( ) +def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: + plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line)) + return plugin + + def print_download_error(plugin: str, ex: Exception): print(f"{plugin}: {ex}", file=sys.stderr) ex_traceback = ex.__traceback__ @@ -277,17 +288,20 @@ def check_results( sys.exit(1) -def parse_plugin_line(line: str) -> Tuple[str, str, Optional[str]]: +def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]: + branch = "master" + alias = None name, repo = line.split("/") - try: + if " as " in repo: repo, alias = repo.split(" as ") - return (name, repo, alias.strip()) - except ValueError: - # no alias defined - return (name, repo.strip(), None) + alias = alias.strip() + if "@" in repo: + repo, branch = repo.split("@") + return (name.strip(), repo.strip(), branch.strip(), alias) -def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, Optional[str]]]: + +def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]: plugins = [] with open(plugin_file) as f: for line in f: @@ -354,12 +368,12 @@ class Cache: def prefetch( - args: Tuple[str, str, str], cache: Cache + args: Tuple[str, str, str, Optional[str]], cache: Cache ) -> Tuple[str, str, Union[Exception, Plugin], dict]: - assert len(args) == 3 - owner, repo, alias = args + assert len(args) == 4 + owner, repo, branch, alias = args try: - plugin, redirect = prefetch_plugin(owner, repo, alias, cache) + plugin, redirect = prefetch_plugin(owner, repo, branch, alias, cache) cache[plugin.commit] = plugin return (owner, repo, plugin, redirect) except Exception as e: @@ -379,7 +393,6 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]], outfile: str): f.write( """ { lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let packages = ( self: {""" @@ -413,10 +426,14 @@ in lib.fix' (lib.extends overrides packages) print(f"updated {outfile}") -def rewrite_input(input_file: Path, output_file: Path, redirects: dict): +def rewrite_input( + input_file: Path, redirects: Dict[str, str] = None, append: Tuple = () +): with open(input_file, "r") as f: lines = f.readlines() + lines.extend(append) + if redirects: lines = [redirects.get(line, line) for line in lines] @@ -424,32 +441,16 @@ def rewrite_input(input_file: Path, output_file: Path, redirects: dict): with open(DEPRECATED, "r") as f: deprecations = json.load(f) for old, new in redirects.items(): - old_name = old.split("/")[1].split(" ")[0].strip("\n") - new_name = new.split("/")[1].split(" ")[0].strip("\n") - if old_name != new_name: - deprecations[old_name] = { - "new": new_name, + old_plugin = fetch_plugin_from_pluginline(old) + new_plugin = fetch_plugin_from_pluginline(new) + if old_plugin.normalized_name != new_plugin.normalized_name: + deprecations[old_plugin.normalized_name] = { + "new": new_plugin.normalized_name, "date": cur_date_iso, } with open(DEPRECATED, "w") as f: json.dump(deprecations, f, indent=4, sort_keys=True) - print( - f"""\ -Redirects have been detected and {input_file} has been updated. Please take the -following steps: - 1. Go ahead and commit just the updated expressions as you intended to do: - git add {output_file} - git commit -m "vimPlugins: Update" - 2. Run this script again so these changes will be reflected in the - generated expressions: - ./update.py - 3. Commit {input_file} along with deprecations and generated expressions: - git add {output_file} {input_file} {DEPRECATED} - git commit -m "vimPlugins: Update redirects" - """ - ) - lines = sorted(lines, key=str.casefold) with open(input_file, "w") as f: @@ -464,6 +465,13 @@ def parse_args(): ) ) parser.add_argument( + "--add", + dest="add_plugins", + default=[], + action="append", + help="Plugin to add to vimPlugins from Github in the form owner/repo", + ) + parser.add_argument( "--input-names", "-i", dest="input_file", @@ -477,32 +485,77 @@ def parse_args(): default=DEFAULT_OUT, help="Filename to save generated nix code", ) - + parser.add_argument( + "--proc", + "-p", + dest="proc", + type=int, + default=30, + help="Number of concurrent processes to spawn.", + ) return parser.parse_args() -def main() -> None: +def commit(repo: git.Repo, message: str, files: List[Path]) -> None: + files_staged = repo.index.add([str(f.resolve()) for f in files]) - args = parse_args() - plugin_names = load_plugin_spec(args.input_file) - current_plugins = get_current_plugins() - cache = Cache(current_plugins) + if files_staged: + print(f'committing to nixpkgs "{message}"') + repo.index.commit(message) + else: + print("no changes in working tree to commit") - prefetch_with_cache = functools.partial(prefetch, cache=cache) - try: - # synchronous variant for debugging - # results = list(map(prefetch_with_cache, plugin_names)) - pool = Pool(processes=30) - results = pool.map(prefetch_with_cache, plugin_names) - finally: - cache.store() +def get_update(input_file: str, outfile: str, proc: int): + cache: Cache = Cache(get_current_plugins()) + _prefetch = functools.partial(prefetch, cache=cache) + + def update() -> dict: + plugin_names = load_plugin_spec(input_file) + + try: + pool = Pool(processes=proc) + results = pool.map(_prefetch, plugin_names) + finally: + cache.store() + + plugins, redirects = check_results(results) - plugins, redirects = check_results(results) + generate_nix(plugins, outfile) - generate_nix(plugins, args.outfile) + return redirects - rewrite_input(args.input_file, args.outfile, redirects) + return update + + +def main(): + args = parse_args() + nixpkgs_repo = git.Repo(ROOT, search_parent_directories=True) + update = get_update(args.input_file, args.outfile, args.proc) + + redirects = update() + rewrite_input(args.input_file, redirects) + commit(nixpkgs_repo, "vimPlugins: update", [args.outfile]) + + if redirects: + update() + commit( + nixpkgs_repo, + "vimPlugins: resolve github repository redirects", + [args.outfile, args.input_file, DEPRECATED], + ) + + for plugin_line in args.add_plugins: + rewrite_input(args.input_file, append=(plugin_line + "\n",)) + update() + plugin = fetch_plugin_from_pluginline(plugin_line) + commit( + nixpkgs_repo, + "vimPlugins.{name}: init at {version}".format( + name=plugin.normalized_name, version=plugin.version + ), + [args.outfile, args.input_file], + ) if __name__ == "__main__": diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 62333ae15e31..9a854d58b08d 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -11,6 +11,7 @@ alx741/vim-stylishask amiorin/ctrlp-z andrep/vimacs andreshazard/vim-logreview +AndrewRadev/splitjoin.vim andsild/peskcolor.vim andviro/flake8-vim andys8/vim-elm-syntax @@ -119,6 +120,7 @@ google/vim-maktaba gorkunov/smartpairs.vim gotcha/vimelette gregsexton/gitv +gruvbox-community/gruvbox as gruvbox-community gu-fan/riv.vim guns/vim-clojure-highlight guns/vim-clojure-static @@ -190,6 +192,7 @@ junegunn/vim-peekaboo junegunn/vim-plug junegunn/vim-slash justincampbell/vim-eighties +justinj/vim-pico8-syntax justinmk/vim-dirvish justinmk/vim-sneak KabbAmine/vCoolor.vim @@ -206,6 +209,7 @@ kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/swift.vim kien/rainbow_parentheses.vim +knubie/vim-kitty-navigator konfekt/fastfold kristijanhusak/defx-git kristijanhusak/defx-icons @@ -224,6 +228,7 @@ lervag/vimtex lfilho/cosco.vim lifepillar/vim-mucomplete lilydjwg/colorizer +liuchengxu/vim-which-key liuchengxu/vista.vim LnL7/vim-nix LucHermitte/lh-brackets @@ -270,6 +275,7 @@ MaxMEllon/vim-jsx-pretty mbbill/undotree megaannum/forms megaannum/self +mengelbrecht/lightline-bufferline mfukar/robotframework-vim mg979/vim-visual-multi mhinz/vim-grepper @@ -332,6 +338,7 @@ neoclide/coc-vimtex neoclide/coc-wxml neoclide/coc-yaml neoclide/coc-yank +neoclide/coc.nvim@release neoclide/denite-extra neoclide/denite-git neoclide/vim-easygit @@ -436,6 +443,7 @@ solarnz/arcanist.vim sonph/onehalf stefandtw/quickfix-reflector.vim stephpy/vim-yaml +sunaku/vim-dasht svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls @@ -454,6 +462,7 @@ thinca/vim-visualstar thirtythreeforty/lessspace.vim thosakwe/vim-flutter tikhomirov/vim-glsl +tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux tmux-plugins/vim-tmux-focus-events @@ -539,6 +548,7 @@ vim-scripts/wombat256.vim vim-scripts/YankRing.vim vim-syntastic/syntastic vim-utils/vim-husk +Vimjas/vim-python-pep8-indent vimlab/split-term.vim vimoutliner/vimoutliner vimwiki/vimwiki diff --git a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix index d129bda33f49..77cf28c552ed 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.26.3"; - sha256 = "1rwyvqk3gp5f75x73d33biqvq67xx2vz1lmh3y3ax8kaf9z8jfvr"; + version = "0.27.0"; + sha256 = "06l25fjlcj0m7f7883afbh0x2ikgkqi768kv8y4qi1jc1gxndpm0"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/default.nix index b4ec1d2d6968..433371e079e0 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -140,6 +140,8 @@ in }; }; + matklad.rust-analyzer = callPackage ./rust-analyzer {}; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; diff --git a/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix index 604d0fa3ad9d..8f5a92e47222 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix @@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.3.69010"; - sha256 = "1dg8wfc3yl0msg6c9ccbvwc78f559109slsagi0lgnbc40v6v24b"; + version = "2020.3.71659"; + sha256 = "1smhnhkfchmljz8aj1br70023ysgd2hj6pm1ncn1jxphf89qi1ja"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix index fe053dd7ea3d..e58ea98a606f 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -7,7 +7,7 @@ let inherit (vscode-utils) buildVscodeMarketplaceExtension; - + # patch runs on remote machine hence use of which # links to local node if version is 12 patch = '' @@ -36,8 +36,8 @@ in mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.48.0"; - sha256 = "04q53gljqh5snkrdf5l69g0ahn1s5z35a4ipfcbf1rsjjmm85a19"; + version = "0.50.0"; + sha256 = "01pyd6759p5nkjhjy3iplrl748xblr54l1jphk2g02s1n5ds2qb9"; }; postPatch = '' diff --git a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json new file mode 100644 index 000000000000..5769db505d8a --- /dev/null +++ b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -0,0 +1,22 @@ +{ + "name": "rust-analyzer", + "version": "0.4.0-dev", + "dependencies": { + "jsonc-parser": "^2.2.1", + "node-fetch": "^2.6.0", + "vscode-languageclient": "6.1.3", + "@rollup/plugin-commonjs": "^11.0.2", + "@rollup/plugin-node-resolve": "^7.1.1", + "@types/node": "^12.12.34", + "@types/node-fetch": "^2.5.5", + "@types/vscode": "1.43.0", + "@typescript-eslint/eslint-plugin": "^2.26.0", + "@typescript-eslint/parser": "^2.26.0", + "eslint": "^6.8.0", + "rollup": "^2.3.2", + "tslib": "^1.11.1", + "typescript": "^3.8.3", + "typescript-formatter": "^7.2.2", + "vsce": "^1.75.0" + } +} diff --git a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix new file mode 100644 index 000000000000..230ee383af3a --- /dev/null +++ b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -0,0 +1,50 @@ +# Update script: pkgs/development/tools/rust/rust-analyzer/update.sh +{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages_10_x +, setDefaultServerPath ? true +}: + +let + pname = "rust-analyzer"; + publisher = "matklad"; + + # Follow the unstable version of rust-analyzer, since the extension is not stable yet. + inherit (rust-analyzer) version; + + build-deps = nodePackages_10_x."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; + # FIXME: Making a new derivation to link `node_modules` and run `npm run package` + # will cause a build failure. + vsix = build-deps.override { + src = "${rust-analyzer.src}/editors/code"; + outputs = [ "vsix" "out" ]; + + postInstall = '' + npm run package + mkdir $vsix + cp ${pname}.vsix $vsix/${pname}.zip + ''; + }; + +in vscode-utils.buildVscodeExtension { + inherit version vsix; + name = "${pname}-${version}"; + src = "${vsix}/${pname}.zip"; + vscodeExtUniqueId = "${publisher}.${pname}"; + + nativeBuildInputs = lib.optional setDefaultServerPath jq; + + postFixup = lib.optionalString setDefaultServerPath '' + package_json="$out/${publisher}.${pname}/package.json" + jq '.contributes.configuration.properties."rust-analyzer.serverPath".default = $s' \ + --arg s "${rust-analyzer}/bin/rust-analyzer" \ + $package_json >$package_json.new + mv $package_json.new $package_json + ''; + + meta = with lib; { + description = "An alternative rust language server to the RLS"; + homepage = "https://github.com/rust-analyzer/rust-analyzer"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ oxalica ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix b/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix index df8f24fcce73..5d446b025d7a 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -51,12 +51,15 @@ let buildVscodeMarketplaceExtension = a@{ name ? "", src ? null, + vsix ? null, mktplcRef, ... }: assert "" == name; assert null == src; - buildVscodeExtension ((removeAttrs a [ "mktplcRef" ]) // { + buildVscodeExtension ((removeAttrs a [ "mktplcRef" "vsix" ]) // { name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}"; - src = fetchVsixFromVscodeMarketplace mktplcRef; + src = if (vsix != null) + then vsix + else fetchVsixFromVscodeMarketplace mktplcRef; vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; }); diff --git a/nixpkgs/pkgs/misc/xosd/default.nix b/nixpkgs/pkgs/misc/xosd/default.nix index a841acdca94e..561f915d6636 100644 --- a/nixpkgs/pkgs/misc/xosd/default.nix +++ b/nixpkgs/pkgs/misc/xosd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Displays text on your screen"; - homepage = https://sourceforge.net/projects/libxosd; + homepage = "https://sourceforge.net/projects/libxosd"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; |