public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-3

Browse Source
This commit is contained in:
Andy Richardson
2021-01-26 10:28:01 +00:00
committed by GitHub
parent 9c324b680d 117addb0f8
commit b6fd071027
7079 changed files with 54405 additions and 45266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/base16-builder/node-packages-generated.nix
+1 -1
View File
@@ -1634,4 +1634,4 @@ in
bypassCache = true;
reconstructLock = true;
};
}
}
pkgs/misc/base16-builder/node-packages.nix
Generated
+1 -1
View File
@@ -18,4 +18,4 @@ in
import ./node-packages-generated.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv globalBuildInputs;
}
}
pkgs/misc/base16-builder/supplement.nix
+1 -1
View File
@@ -690,4 +690,4 @@ in
bypassCache = true;
reconstructLock = true;
};
}
}
pkgs/misc/cups/drivers/carps-cups/default.nix
+44
View File
@@ -0,0 +1,44 @@
{ stdenv
, lib
, fetchFromGitHub
, cups
}:
stdenv.mkDerivation {
pname = "carps-cups";
version = "unstable-2018-03-05";
src = fetchFromGitHub {
owner = "ondrej-zary";
repo = "carps-cups";
rev = "18d80d1d6f473dd9132e4b6d8b5c592c74982f17";
sha256 = "0mjj9hs5lqxi0qamgb4sxfz4fvf7ggi66bxd37bkz3fl0g9xff70";
};
preBuild = ''
export CUPS_DATADIR="${cups}/share/cups"
'';
installPhase = ''
CUPSDIR="$out/lib/cups"
CUPSDATADIR="$out/share/cups"
mkdir -p "$CUPSDIR/filter" "$CUPSDATADIR/drv" "$CUPSDATADIR/usb"
install -s rastertocarps $CUPSDIR/filter
install -m 644 carps.drv $CUPSDATADIR/drv/
install -m 644 carps.usb-quirks $CUPSDATADIR/usb/
'';
buildInputs = [ cups ];
meta = with lib; {
description = "CUPS Linux drivers for Canon printers";
homepage = "https://www.canon.com/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
ewok
];
};
}
pkgs/misc/doge/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv , python3Packages }:
{ lib, python3Packages }:
python3Packages.buildPythonPackage rec {
pname = "doge";
pkgs/misc/drivers/epson-201106w/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ in
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"
"https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"
"https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"
];
sha256 = "1yig1xrh1ikblbp7sx706n5nnc237wy4mbch23ymy6akbgqg4aig";
pkgs/misc/drivers/epson-escpr/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
# To find new versions, visit
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
# some printer like for instance "WF-7110" to get to the most recent
# version.
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz"
pkgs/misc/drivers/epson-escpr2/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
# To find new versions, visit
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
# some printer like for instance "WF-7210" to get to the most recent
# version.
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
pkgs/misc/drivers/epson_201207w/default.nix
+5 -5
View File
@@ -63,11 +63,11 @@ in
Epson L550 Series
Epson L555 Series
To use the driver adjust your configuration.nix file:
services.printing = {
enable = true;
drivers = [ pkgs.epson_201207w ];
};
To use the driver adjust your configuration.nix file:
services.printing = {
enable = true;
drivers = [ pkgs.epson_201207w ];
};
'';
license = with licenses; [ lgpl21 epson ];
maintainers = [ maintainers.romildo ];
pkgs/misc/drivers/steamcontroller/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders
{ lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders
, GyroplotSupport ? false
}:
pkgs/misc/drivers/xow/default.nix
+5 -5
View File
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
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"
"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"
];
postUnpack = ''
pkgs/misc/emulators/citra/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
{ mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
mkDerivation {
pname = "citra";
pkgs/misc/emulators/dolphin-emu/master.nix
+3 -3
View File
@@ -21,13 +21,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "dolphin-emu";
version = "5.0-12716";
version = "5.0-13178";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
rev = "31524288e3b2450eaefff8202c6d26c4ba3f7333";
sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg";
rev = "a34823df61df65168aa40ef5e82e44defd4a0138";
sha256 = "0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1";
};
nativeBuildInputs = [ cmake pkg-config ]
pkgs/misc/emulators/firebird-emu/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
mkDerivation rec {
pname = "firebird-emu";
pkgs/misc/emulators/mednaffe/default.nix
+21 -8
View File
@@ -1,7 +1,13 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkg-config, wrapGAppsHook
, gtk2 ? null, gtk3 ? null, mednafen }:
with lib;
{ stdenv
, lib
, fetchFromGitHub
, autoreconfHook
, pkg-config
, mednafen
, gtk2 ? null
, gtk3 ? null
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "mednaffe";
@@ -14,13 +20,20 @@ stdenv.mkDerivation rec {
sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7";
};
nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config wrapGAppsHook ];
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
buildInputs = [ gtk2 gtk3 mednafen ];
configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];
postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin";
configureFlags = [ (lib.enableFeature (gtk3 != null) "gtk3") ];
meta = {
dontWrapGApps = true;
postInstall = ''
wrapProgram $out/bin/mednaffe \
--prefix PATH ':' "${mednafen}/bin" \
"''${gappsWrapperArgs[@]}"
'';
meta = with lib; {
description = "GTK-based frontend for mednafen emulator";
homepage = "https://github.com/AmatCoder/mednaffe";
license = licenses.gpl3Plus;
pkgs/misc/emulators/melonDS/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv
{ lib
, fetchFromGitHub
, mkDerivation
, cmake
pkgs/misc/emulators/ruffle/default.nix
+12 -4
View File
@@ -1,26 +1,29 @@
{ alsaLib
, fetchFromGitHub
, makeWrapper
, openssl
, pkg-config
, python3
, rustPlatform
, lib, stdenv
, lib
, wayland
, xorg
, vulkan-loader
}:
rustPlatform.buildRustPackage rec {
pname = "ruffle";
version = "nightly-2020-11-30";
version = "nightly-2021-01-12";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = pname;
rev = version;
sha256 = "0z54swzy47laq3smficd3dyrs2zdi3cj2kb0b4hppjxpkkhiw4x0";
sha256 = "1lywxn61w0b3pb8vjpavd9f3v58gq35ypwp41b7rjkc4rjxmf3cd";
};
nativeBuildInputs = [
makeWrapper
pkg-config
python3
];
@@ -35,9 +38,14 @@ rustPlatform.buildRustPackage rec {
xorg.libXi
xorg.libxcb
xorg.libXrender
vulkan-loader
];
cargoSha256 = "05kwfcbzjyyfhiqklhhlv06pinzw9bry4j8l9lk3k04c1q30gzkw";
postInstall = ''
wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
'';
cargoSha256 = "113gh8nf2fs9shfvnzpwlc7zaq1l9l9jhlybcc4dq0wr4r8qpff5";
meta = with lib; {
description = "An Adobe Flash Player emulator written in the Rust programming language.";
pkgs/misc/emulators/ryujinx/default.nix
+8 -8
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
, dotnet-sdk_3, dotnetPackages, dotnetCorePackages
, dotnet-sdk_5, dotnetPackages, dotnetCorePackages
, SDL2, libX11, openal
, gtk3, gobject-introspection, wrapGAppsHook
, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
}:
let
@@ -13,16 +13,16 @@ let
];
in stdenv.mkDerivation rec {
pname = "ryujinx";
version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
version = "1.0.6416"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf";
sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf";
rev = "ad491b5570ec428d0d87d56426b03125e2ca5220";
sha256 = "0gjrvdh6n26r9kkljiw9xvmvb47vmpwsjxi4iv41ir3nsdigdvsn";
};
nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ];
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix {
fetchNuGet = { name, version, sha256 }: fetchurl {
@@ -73,12 +73,12 @@ in stdenv.mkDerivation rec {
shopt -s extglob
makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \
--set DOTNET_ROOT "${dotnetCorePackages.netcore_3_1}" \
--set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \
''${gappsWrapperArgs[@]}
for i in 16 32 48 64 96 128 256 512 1024; do
install -D ${src}/Ryujinx/Ui/assets/Icon.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png
install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png
done
cp -r ${makeDesktopItem {
desktopName = "Ryujinx";
pkgs/misc/emulators/ryujinx/deps.nix
Generated
+73 -53
View File
@@ -1,13 +1,13 @@
{ fetchNuGet }: [
(fetchNuGet {
name = "AtkSharp";
version = "3.22.25.56";
sha256 = "069fm4wplxb4s1i6mdj00b22zqpz6pg9miglcj8mkf1b4lnn09g0";
version = "3.22.25.128";
sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94";
})
(fetchNuGet {
name = "CairoSharp";
version = "3.22.25.56";
sha256 = "0b7p4yj88wgayh464j3rkbc4js8z57wxy3mprgvx86i3rc2v5jd9";
version = "3.22.25.128";
sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9";
})
(fetchNuGet {
name = "Concentus";
@@ -21,8 +21,8 @@
})
(fetchNuGet {
name = "DiscordRichPresence";
version = "1.0.150";
sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79";
version = "1.0.166";
sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a";
})
(fetchNuGet {
name = "FFmpeg.AutoGen";
@@ -31,18 +31,18 @@
})
(fetchNuGet {
name = "GdkSharp";
version = "3.22.25.56";
sha256 = "0f708dwy6i9hghxs711scwkww28lvfjd6gykk7xv921vich5xvy6";
version = "3.22.25.128";
sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7";
})
(fetchNuGet {
name = "GioSharp";
version = "3.22.25.56";
sha256 = "1i7x1bakv5sq27ppl6w79c1wbvnfhf1713plc9ixaznh1fclcnwr";
version = "3.22.25.128";
sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv";
})
(fetchNuGet {
name = "GLibSharp";
version = "3.22.25.56";
sha256 = "12czfm0lgjcy9hgqsiycwfv124dq619svrnsi036246i5hycj37w";
version = "3.22.25.128";
sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5";
})
(fetchNuGet {
name = "GLWidget";
@@ -51,8 +51,8 @@
})
(fetchNuGet {
name = "GtkSharp";
version = "3.22.25.56";
sha256 = "18dbn834wimdmxmgsqd81hyvjyyzgbnayzvz9f714cgw4yjkjyqs";
version = "3.22.25.128";
sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy";
})
(fetchNuGet {
name = "GtkSharp.Dependencies";
@@ -66,23 +66,23 @@
})
(fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
version = "3.1.8";
sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135";
version = "5.0.0";
sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.osx-x64";
version = "3.1.8";
sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4";
version = "5.0.0";
sha256 = "1mmklq1fwq4km9y9jgk63wmwjlarx4npkpvjaiwdzv83vdv104ja";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.win-x64";
version = "3.1.8";
sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f";
version = "5.0.0";
sha256 = "0k7q89w3nky4m0j5jsk95c8gczlyp5jl9982gf1hli3gqpl2q4jr";
})
(fetchNuGet {
name = "Microsoft.CodeCoverage";
version = "16.7.0";
sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1";
version = "16.8.0";
sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8";
})
(fetchNuGet {
name = "Microsoft.CSharp";
@@ -96,28 +96,28 @@
})
(fetchNuGet {
name = "Microsoft.NETCore.App.Host.osx-x64";
version = "3.1.8";
sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb";
version = "5.0.0";
sha256 = "1nirb155gzn2ws1ayaqspjmjaizw87jq2684mzkn18jv4si0hbpf";
})
(fetchNuGet {
name = "Microsoft.NETCore.App.Host.win-x64";
version = "3.1.8";
sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb";
version = "5.0.0";
sha256 = "0nghghcapc28ixg21wb30ccjirc9wz83h0y3bn5zyfanxv2m2ypx";
})
(fetchNuGet {
name = "Microsoft.NETCore.App.Runtime.linux-x64";
version = "3.1.8";
sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa";
version = "5.0.0";
sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq";
})
(fetchNuGet {
name = "Microsoft.NETCore.App.Runtime.osx-x64";
version = "3.1.8";
sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w";
version = "5.0.0";
sha256 = "0lvpf4zz617y94zz3zsmzrg6zcdd6z3z9gz2bd5kq1l8y1pmq77y";
})
(fetchNuGet {
name = "Microsoft.NETCore.App.Runtime.win-x64";
version = "3.1.8";
sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz";
version = "5.0.0";
sha256 = "1486654z369857h45v73jz8pwr8ibb97fiw5mfm7f01kdbyjdsdd";
})
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
@@ -139,6 +139,11 @@
version = "3.1.0";
sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j";
})
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
version = "5.0.0";
sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc";
})
(fetchNuGet {
name = "Microsoft.NETCore.Targets";
version = "1.0.1";
@@ -151,18 +156,18 @@
})
(fetchNuGet {
name = "Microsoft.NET.Test.Sdk";
version = "16.7.0";
sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy";
version = "16.8.0";
sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9";
})
(fetchNuGet {
name = "Microsoft.TestPlatform.ObjectModel";
version = "16.7.0";
sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz";
version = "16.8.0";
sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m";
})
(fetchNuGet {
name = "Microsoft.TestPlatform.TestHost";
version = "16.7.0";
sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs";
version = "16.8.0";
sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a";
})
(fetchNuGet {
name = "Microsoft.Win32.Primitives";
@@ -189,6 +194,11 @@
version = "4.7.0";
sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs";
})
(fetchNuGet {
name = "Microsoft.Win32.Registry";
version = "5.0.0";
sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n";
})
(fetchNuGet {
name = "Microsoft.Win32.SystemEvents";
version = "4.5.0";
@@ -241,13 +251,13 @@
})
(fetchNuGet {
name = "OpenTK.NetStandard";
version = "1.0.5.22";
sha256 = "10bdhc4qbffac862zg03ab5j3iqrr33bydxmnmrxn82brldahm23";
version = "1.0.5.32";
sha256 = "12y8kg73llmq3zibcp6j3hhiw04g7mqlm1nslmb74gfkzx0b4m9f";
})
(fetchNuGet {
name = "PangoSharp";
version = "3.22.25.56";
sha256 = "12b0761nfsci4rvzcba4hrh5rcn6q24qaxwwz66myb82c999qj8w";
version = "3.22.25.128";
sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp";
})
(fetchNuGet {
name = "runtime.any.System.Collections";
@@ -489,6 +499,11 @@
version = "4.3.0";
sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr";
})
(fetchNuGet {
name = "Ryujinx.Audio.OpenAL.Dependencies";
version = "1.21.0.1";
sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l";
})
(fetchNuGet {
name = "Ryujinx.Graphics.Nvdec.Dependencies";
version = "4.3.0";
@@ -496,8 +511,8 @@
})
(fetchNuGet {
name = "SharpZipLib";
version = "1.2.0";
sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5";
version = "1.3.0";
sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4";
})
(fetchNuGet {
name = "System.AppContext";
@@ -521,8 +536,8 @@
})
(fetchNuGet {
name = "System.CodeDom";
version = "4.7.0";
sha256 = "1lch8gwmw420wsvbv9ir4v5g1ij2ag23cbgi3c9gramj1h4vhlz2";
version = "5.0.0";
sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh";
})
(fetchNuGet {
name = "System.Collections";
@@ -701,8 +716,8 @@
})
(fetchNuGet {
name = "System.Management";
version = "4.7.0";
sha256 = "0aw61jl6l78liiq04afxplz0ad5qbyg6vmyjaqrlnrv7whb58n66";
version = "5.0.0";
sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s";
})
(fetchNuGet {
name = "System.Net.Http";
@@ -829,11 +844,6 @@
version = "4.3.0";
sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
})
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "4.6.0";
sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m";
})
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "5.0.0-preview.7.20364.11";
@@ -899,6 +909,11 @@
version = "4.7.0";
sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz";
})
(fetchNuGet {
name = "System.Security.AccessControl";
version = "5.0.0";
sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r";
})
(fetchNuGet {
name = "System.Security.Claims";
version = "4.3.0";
@@ -959,6 +974,11 @@
version = "4.7.0";
sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d";
})
(fetchNuGet {
name = "System.Security.Principal.Windows";
version = "5.0.0";
sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8";
})
(fetchNuGet {
name = "System.Text.Encoding";
version = "4.0.11";
pkgs/misc/emulators/ryujinx/fetch-deps.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3
#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5
set -eo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
pkgs/misc/emulators/termtekst/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
'';
meta = with lib; {
description = ''Console NOS Teletekst viewer in Python'';
description = "Console NOS Teletekst viewer in Python";
longDescription = ''
Small Python app using curses to display Dutch NOS Teletekst on
the Linux console. The original Teletekst font includes 2x6
pkgs/misc/emulators/tilem/default.nix
+6 -54
View File
@@ -1,63 +1,15 @@
{ stdenv
, fetchurl
, lib
, libarchive
, autoreconfHook
, pkg-config
, glib
, libusb1
, darwin
, acl
, lzma
, bzip2
, gnome2
, libticonv
, libtifiles2
, libticables2
, libticalcs2
}:
let
libticonv = stdenv.mkDerivation rec {
pname = "libticonv";
version = "1.1.5";
src = fetchurl {
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib ];
configureFlags = [ "--enable-iconv" ];
};
libticables2 = stdenv.mkDerivation rec {
pname = "libticables2";
version = "1.3.5";
src = fetchurl {
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib libusb1 ];
configureFlags = [ "--enable-libusb10" ];
};
libticalcs2 = stdenv.mkDerivation rec {
pname = "libticalcs2";
version = "1.1.9";
src = fetchurl {
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib libticables2 libticonv libtifiles2 lzma bzip2 ]
++ lib.optionals stdenv.isLinux [ acl ]
++ lib.optionals stdenv.isDarwin [ darwin.libobjc ];
};
libtifiles2 = stdenv.mkDerivation rec {
pname = "libtifiles2";
version = "1.1.7";
src = fetchurl {
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib libticonv libarchive lzma bzip2 ];
};
in
stdenv.mkDerivation rec {
pname = "tilem";
version = "2.0";
@@ -72,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = "http://lpg.ticalc.org/prj_tilem/";
description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ siraben ];
maintainers = with maintainers; [ siraben luc65r ];
platforms = platforms.linux ++ platforms.darwin;
};
}
pkgs/misc/emulators/wine/staging.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, wineUnstable }:
{ lib, callPackage, wineUnstable }:
with callPackage ./util.nix {};
pkgs/misc/emulators/wine/util.nix
+1 -1
View File
@@ -3,7 +3,7 @@ rec {
toPackages = pkgNames: pkgs:
map (pn: lib.getAttr pn pkgs) pkgNames;
toBuildInputs = pkgArches: archPkgs:
lib.concatLists (map archPkgs pkgArches);
lib.concatLists (map archPkgs pkgArches);
mkBuildInputs = pkgArches: pkgNames:
toBuildInputs pkgArches (toPackages pkgNames);
}
pkgs/misc/emulators/yabause/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL
{ mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL
, freeglut ? null, openal ? null, SDL2 ? null }:
mkDerivation rec {
pkgs/misc/lilypond/with-fonts.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, lndir, symlinkJoin, makeWrapper
{ lib, lndir, symlinkJoin, makeWrapper
, lilypond, openlilylib-fonts
}:
pkgs/misc/logging/beats/6.x.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
let beat = package : extraArgs : buildGoPackage (rec {
name = "${package}-${version}";
pkgs/misc/logging/beats/7.x.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
let beat = package : extraArgs : buildGoPackage (rec {
name = "${package}-${version}";
pkgs/misc/scrcpy/default.nix
+3 -3
View File
@@ -10,10 +10,10 @@
}:
let
version = "1.16";
version = "1.17";
prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
sha256 = "sha256-lKeeBbRJjQRgq3vZ0Sy/BRVuOke/DF0UIM7h1Ek7ODI=";
sha256 = "sha256-EbWtLRvJuXMPtyVKeO/XGo/0axk4/0aOR6IbZTobZyU=";
};
in
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-koQY59VrfE28h2qt0TiPGypBLQTvvT0hoOrVIEznIP4=";
sha256 = "sha256-xCzrbWhMve0bJerFNHiUdSzp5O1pSaKRkcJSs/0nHpk=";
};
# postPatch:
pkgs/misc/source-and-tags/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, glibcLocales, unzip, hasktags, ctags } : {
# optional srcDir
annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags
annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags
|| x ? meta && x.meta ? sourceWithTags );
# hack because passthru doesn't work the way I'd expect. Don't have time to spend on this right now
# that's why I'm abusing meta for the same purpose in ghcsAndLibs
@@ -10,7 +10,7 @@
# createTagFiles = [ { name = "my_tag_name_without_suffix", tagCmd = "ctags -R . -o \$TAG_FILE"; } ]
# tag command must create file named $TAG_FILE
sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} :
sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} :
stdenv.mkDerivation {
phases = "unpackPhase buildPhase";
inherit src srcDir tagSuffix;
@@ -72,7 +72,7 @@
addCTaggingInfo = deriv :
deriv // {
deriv // {
passthru = {
sourceWithTags = {
inherit (deriv) src;
pkgs/misc/vim-plugins/generated.nix
+365 -196
View File
File diff suppressed because it is too large Load Diff
pkgs/misc/vim-plugins/overrides.nix
+31 -1
View File
@@ -14,6 +14,7 @@
, buildVimPluginFrom2Nix
, nodePackages
, dasht
, sqlite
# deoplete-khard dependency
, khard
@@ -285,6 +286,10 @@ self: super: {
dependencies = [ self.skim ];
});
sql-nvim = super.sql-nvim.overrideAttrs(old: {
buildInputs = [ sqlite ];
});
sved = let
# we put the script in its own derivation to benefit the magic of wrapGAppsHook
svedbackend = stdenv.mkDerivation {
@@ -654,7 +659,7 @@ self: super: {
libiconv
];
cargoSha256 = "6tgSdIC9ThKvyiX1Unihwozhez6+HsQiqebugzNrKVc=";
cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c=";
};
in ''
ln -s ${maple-bin}/bin/maple $target/bin/maple
@@ -671,6 +676,31 @@ self: super: {
ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s)
'';
});
telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: {
preFixup =
let
fzy-lua-native-path = "deps/fzy-lua-native";
fzy-lua-native =
stdenv.mkDerivation {
name = "fzy-lua-native";
src = "${old.src}/${fzy-lua-native-path}";
# remove pre-compiled binaries
preBuild = "rm -rf static/*";
installPhase = ''
install -Dm 444 -t $out/static static/*
install -Dm 444 -t $out/lua lua/*
'';
};
in
''
rm -rf $target/${fzy-lua-native-path}/*
ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static
ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua
'';
meta.platforms = lib.platforms.all;
});
} // (
let
nodePackageNames = [
pkgs/misc/vim-plugins/vim-plugin-names
+17 -3
View File
@@ -79,6 +79,7 @@ deoplete-plugins/deoplete-clang
deoplete-plugins/deoplete-dictionary
deoplete-plugins/deoplete-go
deoplete-plugins/deoplete-jedi
deoplete-plugins/deoplete-lsp
deoplete-plugins/deoplete-zsh
derekelkins/agda-vim
derekwyatt/vim-scala
@@ -132,7 +133,11 @@ gentoo/gentoo-syntax
GEverding/vim-hocon
gfanto/fzf-lsp.nvim@main
gibiansky/vim-textobj-haskell
glepnir/galaxyline.nvim
gioele/vim-autoswap
glepnir/galaxyline.nvim@main
glepnir/lspsaga.nvim@main
glepnir/oceanic-material
glepnir/zephyr-nvim@main
glts/vim-textobj-comment
godlygeek/csapprox
godlygeek/tabular
@@ -235,6 +240,7 @@ justincampbell/vim-eighties
justinj/vim-pico8-syntax
justinmk/vim-dirvish
justinmk/vim-sneak
jvirtanen/vim-hcl
jvoorhis/coq.vim
KabbAmine/vCoolor.vim
KabbAmine/zeavim.vim
@@ -274,6 +280,7 @@ leanprover/lean.vim
ledger/vim-ledger
lepture/vim-jinja
lervag/vimtex
lewis6991/gitsigns.nvim@main
lfilho/cosco.vim
lifepillar/vim-mucomplete
lighttiger2505/deoplete-vim-lsp
@@ -332,6 +339,7 @@ mengelbrecht/lightline-bufferline
metakirby5/codi.vim
mfukar/robotframework-vim
mfussenegger/nvim-dap
mfussenegger/nvim-jdtls
mg979/vim-visual-multi
mhartington/oceanic-next
mhinz/vim-crates
@@ -350,6 +358,7 @@ mopp/sky-color-clock.vim
morhetz/gruvbox
motus/pig.vim
mpickering/hlint-refactor-vim
ms-jpq/chadtree@chad
mtikekar/vim-bsv
nanotech/jellybeans.vim
natebosch/vim-lsc
@@ -403,6 +412,9 @@ nvim-lua/lsp-status.nvim
nvim-lua/lsp_extensions.nvim
nvim-lua/plenary.nvim
nvim-lua/popup.nvim
nvim-telescope/telescope-frecency.nvim
nvim-telescope/telescope-fzf-writer.nvim
nvim-telescope/telescope-fzy-native.nvim
nvim-telescope/telescope.nvim
nvim-treesitter/completion-treesitter
nvim-treesitter/nvim-treesitter
@@ -494,7 +506,6 @@ Shougo/context_filetype.vim
Shougo/defx.nvim
Shougo/denite.nvim
Shougo/deol.nvim
Shougo/deoplete-lsp
Shougo/deoplete.nvim
Shougo/echodoc.vim
Shougo/neco-syntax
@@ -531,11 +542,13 @@ svermeulen/vim-subversive
t9md/vim-choosewin
t9md/vim-smalls
takac/vim-hardtime
tami5/sql.nvim
tbodt/deoplete-tabnine
ternjs/tern_for_vim
terryma/vim-expand-region
terryma/vim-multiple-cursors
tex/vimpreviewpandoc
Th3Whit3Wolf/one-nvim@main
theHamsta/nvim-dap-virtual-text
thinca/vim-ft-diff_fold
thinca/vim-prettyprint
@@ -659,6 +672,7 @@ VundleVim/Vundle.vim
w0ng/vim-hybrid
wakatime/vim-wakatime
wannesm/wmgraphviz.vim
wbthomason/packer.nvim
weirongxu/coc-explorer
wellle/targets.vim
wellle/tmux-complete.vim
@@ -676,6 +690,6 @@ Xuyuanp/nerdtree-git-plugin
ycm-core/YouCompleteMe
Yggdroot/indentLine
Yilin-Yang/vim-markbar
yuki-ycino/ncm2-dictionary
yuki-yano/ncm2-dictionary
zah/nim.vim
ziglang/zig.vim
pkgs/misc/vscode-extensions/cpptools/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, vscode-utils
{ lib, vscode-utils
, fetchurl, unzip
, mono, writeScript, runtimeShell
, jq, clang-tools
pkgs/misc/vscode-extensions/default.nix
+135 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }:
{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
@@ -140,6 +140,18 @@ let
};
};
davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-markdownlint";
publisher = "DavidAnson";
version = "0.38.0";
sha256 = "0d6hbsjrx1j8wrmfnvdwsa7sci1brplgxwkmy6sp74va7zxfjnqv";
};
meta = with lib; {
license = licenses.mit;
};
};
dhall.dhall-lang = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "dhall-lang";
@@ -177,6 +189,18 @@ let
};
};
eamodio.gitlens = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gitlens";
publisher = "eamodio";
version = "11.1.3";
sha256 = "sha256-hqJg3jP4bbXU4qSJOjeKfjkPx61yPDMsQdSUVZObK/U=";
};
meta = {
license = lib.licenses.mit;
};
};
esbenp.prettier-vscode = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
@@ -280,6 +304,30 @@ let
};
};
graphql.vscode-graphql = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-graphql";
publisher = "GraphQL";
version = "0.3.13";
sha256 = "sha256-JjEefVHQUYidUsr8Ce/dh7hLDm21WkyS+2RwsXHoY04=";
};
meta = {
license = lib.licenses.mit;
};
};
gruntfuggly.todo-tree = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
version = "0.0.196";
sha256 = "1l4f290018f2p76q6hn2b2injps6wz65as7dm537wrsvsivyg2qz";
};
meta = with lib; {
license = licenses.mit;
};
};
haskell.haskell = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "haskell";
@@ -292,6 +340,18 @@ let
};
};
hookyqr.beautify = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "beautify";
publisher = "HookyQR";
version = "1.5.0";
sha256 = "1c0kfavdwgwham92xrh0gnyxkrl9qlkpv39l1yhrldn8vd10fj5i";
};
meta = with lib; {
license = licenses.mit;
};
};
ibm.output-colorizer = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "output-colorizer";
@@ -333,6 +393,30 @@ let
};
};
jock.svg = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "svg";
publisher = "jock";
version = "1.4.4";
sha256 = "0kn2ic7pgbd4rbvzpsxfwyiwxa1iy92l0h3jsppxc8gk8xbqm2nc";
};
meta = with lib; {
license = licenses.mit;
};
};
jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-styled-components";
publisher = "jpoissonnier";
version = "1.4.1";
sha256 = "sha256-ojbeuYBCS+DjF5R0aLuBImzoSOb8mXw1s0Uh0CzggzE=";
};
meta = {
license = lib.licenses.mit;
};
};
justusadam.language-haskell = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "language-haskell";
@@ -345,6 +429,18 @@ let
};
};
mikestead.dotenv = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "dotenv";
publisher = "mikestead";
version = "1.0.1";
sha256 = "sha256-dieCzNOIcZiTGu4Mv5zYlG7jLhaEsJR05qbzzzQ7RWc=";
};
meta = {
license = lib.licenses.mit;
};
};
mskelton.one-dark-theme = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "one-dark-theme";
@@ -437,6 +533,18 @@ let
};
};
rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-paste-and-indent";
publisher = "Rubymaniac";
version = "0.0.8";
sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl";
};
meta = with lib; {
license = licenses.mit;
};
};
matklad.rust-analyzer = callPackage ./rust-analyzer {};
ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
@@ -496,8 +604,8 @@ let
mktplcRef = {
name = "metals";
publisher = "scalameta";
version = "1.9.7";
sha256 = "0v599yssvk358gxfxnyzzkyk0y5krsbp8n4rkp9wb2ncxqsqladr";
version = "1.9.10";
sha256 = "1afmqzlw3bl9bv59l9b2jrljhbq8djb7vl8rjv58c5wi7nvm2qab";
};
meta = {
license = lib.licenses.asl20;
@@ -528,6 +636,30 @@ let
};
};
spywhere.guides = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "guides";
publisher = "spywhere";
version = "0.9.3";
sha256 = "1kvsj085w1xax6fg0kvsj1cizqh86i0pkzpwi0sbfvmcq21i6ghn";
};
meta = with lib; {
license = licenses.mit;
};
};
streetsidesoftware.code-spell-checker = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
version = "1.10.2";
sha256 = "1ll046rf5dyc7294nbxqk5ya56g2bzqnmxyciqpz2w5x7j75rjib";
};
meta = with lib; {
license = licenses.mit;
};
};
tamasfe.even-better-toml = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "even-better-toml";
pkgs/misc/vscode-extensions/remote-ssh/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv
{ lib
, vscode-utils
, useLocalExtensions ? false}:
# Note that useLocalExtensions requires that vscode-server is not running
pkgs/misc/vscode-extensions/rust-analyzer/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
# Update script: pkgs/development/tools/rust/rust-analyzer/update.sh
{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages
{ lib, vscode-utils, jq, rust-analyzer, nodePackages
, setDefaultServerPath ? true
}:
pkgs/misc/vscode-extensions/vscodeExts2nix.nix
+2 -2
View File
@@ -18,7 +18,7 @@ writeShellScriptBin "vscodeExts2nix" ''
for line in $(${vscode}/bin/code --list-extensions --show-versions \
${lib.optionalString (extensionsToIgnore != []) ''
| grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)'
| grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : "${e.publisher}.${e.name}") extensionsToIgnore}\)'
''}
) ; do
[[ $line =~ ([^.]*)\.([^@]*)@(.*) ]]
@@ -26,7 +26,7 @@ writeShellScriptBin "vscodeExts2nix" ''
publisher=''${BASH_REMATCH[1]}
version=''${BASH_REMATCH[3]}
extensions="${lib.concatMapStringsSep "." (e : ''${e.publisher}${e.name}@${e.sha256}'') extensions}"
extensions="${lib.concatMapStringsSep "." (e : "${e.publisher}${e.name}@${e.sha256}") extensions}"
reCurrentExt=$publisher$name"@([^.]*)"
if [[ $extensions =~ $reCurrentExt ]]; then
sha256=''${BASH_REMATCH[1]}
pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
+6 -6
View File
@@ -18,22 +18,22 @@ let
mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions;
mutableExtsPaths = lib.forEach mutExtsDrvs ( e:
{
origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}'';
target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}'';
origin = "${e}/share/vscode/extensions/${e.vscodeExtUniqueId}";
target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}'';
}
);
#removed not defined extensions
rmExtensions = lib.optionalString (nixExtensions++mutableExtensions != []) ''
find ${vscodeExtsFolderName} -mindepth 1 -maxdepth 1 ${
lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name} '') nixExtensions
lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name} ") nixExtensions
+
lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name}-${e.version} '') mutableExtensions
lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name}-${e.version} ") mutableExtensions
} -exec rm -rf {} \;
'';
#copy mutable extension out of the nix store
cpExtensions = ''
${lib.concatMapStringsSep "\n" (e : ''ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/'') nixExtsDrvs}
${lib.concatMapStringsSep "\n" (e : "ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/") nixExtsDrvs}
${lib.concatMapStringsSep "\n" (ePath : ''
if [ ! -d ${ePath.target} ]; then
cp -a ${ePath.origin} ${ePath.target}
@@ -49,6 +49,6 @@ in
${cpExtensions}
fi
${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${
lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }''
lib.optionalString (user-data-dir != "") "--user-data-dir ${user-data-dir}"
} "$@"
''
pkgs/misc/vscode-extensions/wakatime/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv
{ lib
, wakatime, vscode-utils }:
let