Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
1fe6b64349
|
|
@ -40,7 +40,7 @@
|
|||
}
|
||||
{
|
||||
name = "bzImage";
|
||||
path = "${config.system.build.kernel}/bzImage";
|
||||
path = "${config.system.build.kernel}/${config.system.boot.loader.kernelFile}";
|
||||
}
|
||||
{
|
||||
name = "kexec-boot";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
# Test whether fast reboots via kexec work.
|
||||
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
name = "kexec";
|
||||
meta = with lib.maintainers; {
|
||||
|
|
@ -18,13 +16,16 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
|
||||
node2 = { modulesPath, ... }: {
|
||||
virtualisation.vlans = [ ];
|
||||
environment.systemPackages = [ pkgs.hello ];
|
||||
imports = [
|
||||
"${modulesPath}/installer/kexec/kexec-boot.nix"
|
||||
"${modulesPath}/profiles/minimal.nix"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
# Test whether reboot via kexec works.
|
||||
node1.wait_for_unit("multi-user.target")
|
||||
node1.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(</proc/cmdline)"')
|
||||
node1.execute("systemctl kexec >&2 &", check_return=False)
|
||||
|
|
@ -32,14 +33,17 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
node1.connect()
|
||||
node1.wait_for_unit("multi-user.target")
|
||||
|
||||
# Check the machine with kexec-boot.nix profile boots up
|
||||
# Check if the machine with kexec-boot.nix profile boots up
|
||||
node2.wait_for_unit("multi-user.target")
|
||||
node2.shutdown()
|
||||
|
||||
# Kexec node1 to the toplevel of node2 via the kexec-boot script
|
||||
node1.succeed('touch /run/foo')
|
||||
node1.fail('hello')
|
||||
node1.execute('${nodes.node2.config.system.build.kexecBoot}/kexec-boot', check_return=False)
|
||||
node1.succeed('! test -e /run/foo')
|
||||
node1.succeed('hello')
|
||||
node1.succeed('[ "$(hostname)" = "node2" ]')
|
||||
|
||||
node1.shutdown()
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -51,24 +51,17 @@ let
|
|||
withCD = config.clementine.cd or true;
|
||||
withCloud = config.clementine.cloud or true;
|
||||
|
||||
# On the update after all 1.4rc, qt5.15 and protobuf 3.15 will be supported.
|
||||
version = "1.4.0rc1";
|
||||
version = "unstable-2022-04-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clementine-player";
|
||||
repo = "Clementine";
|
||||
rev = version;
|
||||
sha256 = "1rqk0hrsn8f8bjk0j0vq1af0ygy6xx7qi9fw0jjw2cmj6kzckyi2";
|
||||
rev = "250024e117fbe5fae7c62b9c8e655d66412a6ed7";
|
||||
sha256 = "06fcbs3wig3mh711iypyj49qm5246f7qhvgvv8brqfrd8cqyh6qf";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./clementine-spotify-blob.patch
|
||||
(fetchpatch {
|
||||
# "short-term" fix for execution on wayland (1.4.0rc1-131-g2179027a6)
|
||||
# for https://github.com/clementine-player/Clementine/issues/6587
|
||||
url = "https://github.com/clementine-player/Clementine/commit/2179027a6d97530c857e43be873baacd696ff332.patch";
|
||||
sha256 = "0344bfcyvjim5ph8w4km6zkg96rj5g9ybp9x14qgyw2gkdksimn6";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1119,6 +1119,7 @@ self: super: {
|
|||
"coc-flutter"
|
||||
"coc-git"
|
||||
"coc-go"
|
||||
"coc-haxe"
|
||||
"coc-highlight"
|
||||
"coc-html"
|
||||
"coc-imselect"
|
||||
|
|
|
|||
16
pkgs/applications/emulators/ryujinx/deps.nix
generated
16
pkgs/applications/emulators/ryujinx/deps.nix
generated
|
|
@ -12,9 +12,9 @@
|
|||
(fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; })
|
||||
(fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; })
|
||||
(fetchNuGet { pname = "LibHac"; version = "0.16.1"; sha256 = "131qnqa1asdmymwdvpjza6w646b05jzn1cxjdxgwh7qdcdb77xyx"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1fvv5ri32pbl43628zqnim6fbv6hjxf66p0v793xdh57dzkdyh0j"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "1m8iaq78kii0z4lxwq1igm8f4yv010blrifab4zp491b0j0qg1d4"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1sqv7vhkm4j11rl7mfvs4mmmclcdps2n4pf31ck2mcx54nr4d2kj"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; })
|
||||
|
|
@ -23,11 +23,11 @@
|
|||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1gibwhplbanv6bz3l71w8vhzlgqsh21bms30dbf1n60v7p02fl3h"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "0gkzqsmj12wwdh548rb9drjgmyzvqalmwwq0fzvgj9c7zm1gdndi"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1x4ysack9n57h8w1ybfyczkf3w6jsgz7ila0czm2011w4sjnyqj0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, unzip
|
||||
, xdg-utils
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
|
|
@ -47,6 +48,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
--add-flags "-Dawt.useSystemAAFontSettings=on" \
|
||||
--add-flags "-Dswing.aatext=true" \
|
||||
--add-flags "-jar $BASEDIR/${pname}.jar" \
|
||||
--prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||
--set _JAVA_AWT_WM_NONREPARENTING 1 \
|
||||
--set AWT_TOOLKIT MToolkit
|
||||
|
||||
|
|
|
|||
|
|
@ -55,12 +55,12 @@
|
|||
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.13.14"; sha256 = "07xsdx8j1rhp712kwy8jx9ang6f9zljqrvaggf0ssj5zqbliz93p"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; })
|
||||
(fetchNuGet { pname = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0s874cs94p1rxdy6n22ch3vr1ad1w0nkh7cnjxvxcjim2b4lfvln"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "0s0xpqd0nc9kldfay5j1krbc1nyfasxw4xxjx1mwpnbr7n99wbms"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.4"; sha256 = "195yldf6ws9qbb2aqrrr9bbaq9f8i0dvyb8jgrvg7jhay8j775ay"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "0s1hkanhfv7virdynxxx28kp3w596iiplvi0jqv3dsr63gl0m0m7"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1fvv5ri32pbl43628zqnim6fbv6hjxf66p0v793xdh57dzkdyh0j"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.4"; sha256 = "0244kxk61hddbgwkg7d7b3lf3w545w31m7hkmdb09b6jhk0kdf16"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "1m8iaq78kii0z4lxwq1igm8f4yv010blrifab4zp491b0j0qg1d4"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1sqv7vhkm4j11rl7mfvs4mmmclcdps2n4pf31ck2mcx54nr4d2kj"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; })
|
||||
|
|
@ -75,18 +75,17 @@
|
|||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.3"; sha256 = "14lypnhdby9939l75y6i077x4ccb22yakzjrbapl8an438h09yf8"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.3"; sha256 = "0rshhsygm3id8wig8mqs846l8dck65drszpzjh1d00d1fk2bxzs4"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0ws9vxias9iynhcajkl9lz4c8f6hc4b5spypxd0ha33lcjaj408a"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "003s3x2ffk4g76jy4b60n6vizly03amjbli4lngsy0wzc86c0ij1"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.4"; sha256 = "1zm9q9yvglsn5w786c9cjdfj1a8z4sipmvn9rhg3ps23rllxwmcc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.4"; sha256 = "0g1vw0wr88zlfpdg2gz8c0mriasci1kzvjia4nj19j7b0zaga7f0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.4"; sha256 = "08mrvb71kldzla2j7v10ifxrc6bwsrd4bms2rqfb7rmx00qs6yj0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.4"; sha256 = "026kl3cdbk35rjcnbj92bv7pvx20jd80hxxrnz1s4kzlm4rsp0bv"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "09i8ca56szmvyp1xlddyv3124rrcar8vgsq3pmprcylfdjarck6x"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1gibwhplbanv6bz3l71w8vhzlgqsh21bms30dbf1n60v7p02fl3h"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.4"; sha256 = "0h7vkcxaqjll65qka6hsz2hi0vmsizg4ys38a0qg76r0blsnk2yr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "0gkzqsmj12wwdh548rb9drjgmyzvqalmwwq0fzvgj9c7zm1gdndi"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1x4ysack9n57h8w1ybfyczkf3w6jsgz7ila0czm2011w4sjnyqj0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||
|
|
|
|||
|
|
@ -55,12 +55,12 @@
|
|||
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.13.14"; sha256 = "07xsdx8j1rhp712kwy8jx9ang6f9zljqrvaggf0ssj5zqbliz93p"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; })
|
||||
(fetchNuGet { pname = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0s874cs94p1rxdy6n22ch3vr1ad1w0nkh7cnjxvxcjim2b4lfvln"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "0s0xpqd0nc9kldfay5j1krbc1nyfasxw4xxjx1mwpnbr7n99wbms"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.4"; sha256 = "195yldf6ws9qbb2aqrrr9bbaq9f8i0dvyb8jgrvg7jhay8j775ay"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "0s1hkanhfv7virdynxxx28kp3w596iiplvi0jqv3dsr63gl0m0m7"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1fvv5ri32pbl43628zqnim6fbv6hjxf66p0v793xdh57dzkdyh0j"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.4"; sha256 = "0244kxk61hddbgwkg7d7b3lf3w545w31m7hkmdb09b6jhk0kdf16"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "1m8iaq78kii0z4lxwq1igm8f4yv010blrifab4zp491b0j0qg1d4"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1sqv7vhkm4j11rl7mfvs4mmmclcdps2n4pf31ck2mcx54nr4d2kj"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; })
|
||||
|
|
@ -75,18 +75,17 @@
|
|||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.3"; sha256 = "14lypnhdby9939l75y6i077x4ccb22yakzjrbapl8an438h09yf8"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.3"; sha256 = "0rshhsygm3id8wig8mqs846l8dck65drszpzjh1d00d1fk2bxzs4"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0ws9vxias9iynhcajkl9lz4c8f6hc4b5spypxd0ha33lcjaj408a"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "003s3x2ffk4g76jy4b60n6vizly03amjbli4lngsy0wzc86c0ij1"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.4"; sha256 = "1zm9q9yvglsn5w786c9cjdfj1a8z4sipmvn9rhg3ps23rllxwmcc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.4"; sha256 = "0g1vw0wr88zlfpdg2gz8c0mriasci1kzvjia4nj19j7b0zaga7f0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.4"; sha256 = "08mrvb71kldzla2j7v10ifxrc6bwsrd4bms2rqfb7rmx00qs6yj0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.4"; sha256 = "026kl3cdbk35rjcnbj92bv7pvx20jd80hxxrnz1s4kzlm4rsp0bv"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "09i8ca56szmvyp1xlddyv3124rrcar8vgsq3pmprcylfdjarck6x"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1gibwhplbanv6bz3l71w8vhzlgqsh21bms30dbf1n60v7p02fl3h"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.4"; sha256 = "0h7vkcxaqjll65qka6hsz2hi0vmsizg4ys38a0qg76r0blsnk2yr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "0gkzqsmj12wwdh548rb9drjgmyzvqalmwwq0fzvgj9c7zm1gdndi"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1x4ysack9n57h8w1ybfyczkf3w6jsgz7ila0czm2011w4sjnyqj0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||
|
|
|
|||
|
|
@ -3,27 +3,39 @@
|
|||
, fetchFromSourcehut
|
||||
, pkg-config
|
||||
, zig
|
||||
, makeWrapper
|
||||
, curl
|
||||
, SDL2
|
||||
, SDL2_gfx
|
||||
, SDL2_image
|
||||
, SDL2_ttf
|
||||
, jq
|
||||
, ncurses
|
||||
, inconsolata-nerdfont
|
||||
, dmenu
|
||||
, xdotool
|
||||
, bemenu
|
||||
, withX11 ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
menuInputs = if withX11 then [ dmenu xdotool ] else [ bemenu ];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mepo";
|
||||
version = "0.3";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~mil";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-B7BOAFhiOTILUdzh49hTMrNNHZpCNRDLW2uekXyptqQ=";
|
||||
hash = "sha256-soIAQgo8Cyii/zzJapgJmC5hN/ySnHKoSbOg/XgTnGg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config zig ];
|
||||
nativeBuildInputs = [ pkg-config zig makeWrapper ];
|
||||
|
||||
buildInputs = [ curl SDL2 SDL2_gfx SDL2_image SDL2_ttf ];
|
||||
buildInputs = [
|
||||
curl SDL2 SDL2_gfx SDL2_image SDL2_ttf inconsolata-nerdfont jq ncurses
|
||||
] ++ menuInputs;
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
|
|
@ -46,12 +58,26 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/mepo_dl.sh\
|
||||
--suffix PATH : ${lib.makeBinPath [ jq ncurses ]}
|
||||
wrapProgram $out/bin/mepo_ui_helper_menu.sh\
|
||||
--suffix PATH : ${lib.makeBinPath menuInputs}
|
||||
for script in $(grep -l jq out/bin/mepo_ui_menu_*.sh); do
|
||||
wrapProgram $script --suffix PATH : $out/bin:${lib.makeBinPath [ jq ]}
|
||||
done
|
||||
for prog in $out/bin/mepo*; do
|
||||
if [ ! -f $out/bin/.$(basename $prog)-wrapped ]; then
|
||||
wrapProgram $prog --suffix PATH : $out/bin
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast, simple, and hackable OSM map viewer";
|
||||
homepage = "https://sr.ht/~mil/mepo/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # See https://github.com/NixOS/nixpkgs/issues/86299
|
||||
maintainers = with maintainers; [ sikmir McSinyx ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.1.8";
|
||||
sha256 = "05k1r157h3jaqzzsrkgc96zcny3mi8dvixc2v1w0lwcxixqk0y2l";
|
||||
vendorSha256 = "03hjin9nybf7fpbj5r82qh19qh3cc8m0b236mk0ajhsyjqrk8pir";
|
||||
version = "1.1.12";
|
||||
sha256 = "19y52sn4qz0vx9s188nf7rkr7y2cbq6h33l98sr4w85kmainn86s";
|
||||
vendorSha256 = "0p582y2q6zpyn7vmv1p8p8r2gbh786pqc6lpipgr7rpxbnxf5v4b";
|
||||
}
|
||||
|
|
|
|||
236
pkgs/applications/networking/n8n/node-packages.nix
generated
236
pkgs/applications/networking/n8n/node-packages.nix
generated
|
|
@ -148,6 +148,24 @@ let
|
|||
sha512 = "3b94XDdRLqL7OlE7OjWg/4pgG825Juw8PLVEDm6h5pio0gMU89ICxfatGxHsBxMGfqad+wnvdmUweZWlELDFpQ==";
|
||||
};
|
||||
};
|
||||
"@fortawesome/fontawesome-common-types-6.1.1" = {
|
||||
name = "_at_fortawesome_slash_fontawesome-common-types";
|
||||
packageName = "@fortawesome/fontawesome-common-types";
|
||||
version = "6.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz";
|
||||
sha512 = "wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA==";
|
||||
};
|
||||
};
|
||||
"@fortawesome/free-regular-svg-icons-6.1.1" = {
|
||||
name = "_at_fortawesome_slash_free-regular-svg-icons";
|
||||
packageName = "@fortawesome/free-regular-svg-icons";
|
||||
version = "6.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.1.tgz";
|
||||
sha512 = "xXiW7hcpgwmWtndKPOzG+43fPH7ZjxOaoeyooptSztGmJxCAflHZxXNK0GcT0uEsR4jTGQAfGklDZE5NHoBhKg==";
|
||||
};
|
||||
};
|
||||
"@icetee/ftp-0.3.15" = {
|
||||
name = "_at_icetee_slash_ftp";
|
||||
packageName = "@icetee/ftp";
|
||||
|
|
@ -490,22 +508,22 @@ let
|
|||
sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
|
||||
};
|
||||
};
|
||||
"@types/node-12.20.48" = {
|
||||
"@types/node-12.20.49" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "12.20.48";
|
||||
version = "12.20.49";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-12.20.48.tgz";
|
||||
sha512 = "4kxzqkrpwYtn6okJUcb2lfUu9ilnb3yhUOH6qX3nug8D2DupZ2drIkff2yJzYcNJVl3begnlcaBJ7tqiTTzjnQ==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-12.20.49.tgz";
|
||||
sha512 = "5e6QNb9bkeh4Hni4ktLqUZuUqnGTX/kou2aZkXyxtuYaHXgBm+In1SHR9V+7kDzWzjB08KC2uqt2doDi7cuAAA==";
|
||||
};
|
||||
};
|
||||
"@types/node-17.0.25" = {
|
||||
"@types/node-17.0.26" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "17.0.25";
|
||||
version = "17.0.26";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz";
|
||||
sha512 = "wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz";
|
||||
sha512 = "z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==";
|
||||
};
|
||||
};
|
||||
"@types/node-fetch-2.6.1" = {
|
||||
|
|
@ -949,13 +967,13 @@ let
|
|||
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1118.0" = {
|
||||
"aws-sdk-2.1120.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1118.0";
|
||||
version = "2.1120.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1118.0.tgz";
|
||||
sha512 = "R3g06c4RC0Gz/lwMA7wgC7+FwYf5vaO30sPIigoX5m6Tfb7tdzfCYD7pnpvkPRNUvWJ3f5kQk+pEeW25DstRrQ==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1120.0.tgz";
|
||||
sha512 = "3cKXUFxC3CDBbJ/JlXEKmJZKFZhqGii7idGaLxvV5/OzqEDUstYkHGX3TCJdQRHrRwpFvRVOekXSwLxBltqXuQ==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
|
|
@ -1597,13 +1615,13 @@ let
|
|||
sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
|
||||
};
|
||||
};
|
||||
"color-string-1.9.0" = {
|
||||
"color-string-1.9.1" = {
|
||||
name = "color-string";
|
||||
packageName = "color-string";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz";
|
||||
sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==";
|
||||
url = "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz";
|
||||
sha512 = "shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==";
|
||||
};
|
||||
};
|
||||
"color-support-1.1.3" = {
|
||||
|
|
@ -1813,13 +1831,13 @@ let
|
|||
sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
|
||||
};
|
||||
};
|
||||
"core-js-3.22.1" = {
|
||||
"core-js-3.22.2" = {
|
||||
name = "core-js";
|
||||
packageName = "core-js";
|
||||
version = "3.22.1";
|
||||
version = "3.22.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.22.1.tgz";
|
||||
sha512 = "l6CwCLq7XgITOQGhv1dIUmwCFoqFjyQ6zQHUCQlS0xKmb9d6OHIg8jDiEoswhaettT21BSF5qKr6kbvE+aKwxw==";
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.22.2.tgz";
|
||||
sha512 = "Z5I2vzDnEIqO2YhELVMFcL1An2CIsFe9Q7byZhs8c/QxummxZlAHw33TUHbIte987LkisOgL0LwQ1P9D6VISnA==";
|
||||
};
|
||||
};
|
||||
"core-util-is-1.0.2" = {
|
||||
|
|
@ -3811,13 +3829,13 @@ let
|
|||
sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg==";
|
||||
};
|
||||
};
|
||||
"libphonenumber-js-1.9.51" = {
|
||||
"libphonenumber-js-1.9.52" = {
|
||||
name = "libphonenumber-js";
|
||||
packageName = "libphonenumber-js";
|
||||
version = "1.9.51";
|
||||
version = "1.9.52";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.51.tgz";
|
||||
sha512 = "MGidRDs7s2nUybwrB/UjZT4nPXZPYQZQTu/sF3/O2v/DocmD8N6G+a9kwDt2qm7DaOo35XRt7hAIbYL+ml942Q==";
|
||||
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.52.tgz";
|
||||
sha512 = "8k83chc+zMj+J/RkaBxi0PpSTAdzHmpqzCMqquSJVRfbZFr8DCp6vPC7ms2PIPGxeqajZLI6CBLW5nLCJCJrYg==";
|
||||
};
|
||||
};
|
||||
"libqp-1.1.0" = {
|
||||
|
|
@ -4468,49 +4486,49 @@ let
|
|||
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
|
||||
};
|
||||
};
|
||||
"n8n-core-0.114.0" = {
|
||||
"n8n-core-0.115.0" = {
|
||||
name = "n8n-core";
|
||||
packageName = "n8n-core";
|
||||
version = "0.114.0";
|
||||
version = "0.115.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.114.0.tgz";
|
||||
sha512 = "B1cDM9OCEJ2xeatvTHtMm3TQvaef5/7NA0kULX6XsvnMhv21k5/Nzvb5Ky1lrXB5DxkdzQdiAwtojh/GDQs4UA==";
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.115.0.tgz";
|
||||
sha512 = "VXmnbbAQKk9Nbw4g4kSpJ5bxKOydVsMnz6wU2Q4tmRd1ajp+jyjHLUWyJIoVMDWm6nLEC6GORh+Zsap7Jf2xjw==";
|
||||
};
|
||||
};
|
||||
"n8n-design-system-0.17.0" = {
|
||||
"n8n-design-system-0.18.0" = {
|
||||
name = "n8n-design-system";
|
||||
packageName = "n8n-design-system";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.17.0.tgz";
|
||||
sha512 = "7Gcy0uAiNjLIuVEPOb4UABhUgFA7ov287g2RMnAysC2edI4G7oeSvzMl/rlRojOGlTY4zjKiV6Wz4bkDlkiVbw==";
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.18.0.tgz";
|
||||
sha512 = "TurjQwQC+TRHwoEtsFBqBVg9VRSDPBg6ghmz4rm2U6X61yqg960dLQlAIl5d+oas2jezAnhHIxL47wl+9M8V/A==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.140.0" = {
|
||||
"n8n-editor-ui-0.141.0" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.140.0";
|
||||
version = "0.141.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.140.0.tgz";
|
||||
sha512 = "FzJhsid5OxdUvL5R4IYA6iflrGdpuwJUwe1SqeP5OQJVHw345PJ+MeJ7I5+viDF2nJ8rZRQ9boFSW+N/YHh+ZQ==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.141.0.tgz";
|
||||
sha512 = "CH1Jd9vyf+DsBukIgV9dICxGzyI1cbeHvv7XTv8qUVfMdNrsPan/OTAmyuoFl+aSuI0H8NedJTpzMytoLghvjw==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.171.1" = {
|
||||
"n8n-nodes-base-0.172.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.171.1";
|
||||
version = "0.172.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.171.1.tgz";
|
||||
sha512 = "VPdyYKAbBfCITznwVEH8hmrdtp23C1W0Ci8u/963UfQrPh2mYmqbNsnxAGlAOLvdPUap4YFwsoegUjq8/qDvFg==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.172.0.tgz";
|
||||
sha512 = "/Wm9E4nxftG5bTU7AMdXrYiCRq/S/rqiZO7Cn34Nvp/fyT5MndU5C6socz0Bz/ScDrRCAmsEF5I+G1+zQwuQUA==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.96.0" = {
|
||||
"n8n-workflow-0.97.0" = {
|
||||
name = "n8n-workflow";
|
||||
packageName = "n8n-workflow";
|
||||
version = "0.96.0";
|
||||
version = "0.97.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.96.0.tgz";
|
||||
sha512 = "FLghjASJdhcWjYPL1C6AJeWXsK79vQJuniFL7p1mIg8s4bHdyU+M+9mDLOwzZqAnEktOWzxTAoorDRnfEY67ug==";
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.97.0.tgz";
|
||||
sha512 = "RZlUhe8rW7r5prjn/WmdE1yZfZsDrpjjT0Bk22ItmKA+BeRW1k+VonWHBZEAsg6scui0web/MfXfXdRsRDnLdQ==";
|
||||
};
|
||||
};
|
||||
"named-placeholders-1.1.2" = {
|
||||
|
|
@ -6178,13 +6196,13 @@ let
|
|||
sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
|
||||
};
|
||||
};
|
||||
"simple-git-3.7.0" = {
|
||||
"simple-git-3.7.1" = {
|
||||
name = "simple-git";
|
||||
packageName = "simple-git";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.7.0.tgz";
|
||||
sha512 = "O9HlI83ywqkYqnr7Wh3CqKNNrMkfjzpKQSGtJAhk7+H5P+lAxHBTIPgu/eO/0D9pMciepgs433p0d5S+NYv5Jg==";
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.7.1.tgz";
|
||||
sha512 = "+Osjtsumbtew2y9to0pOYjNzSIr4NkKGBg7Po5SUtjQhaJf2QBmiTX/9E9cv9rmc7oUiSGFIB9e7ys5ibnT9+A==";
|
||||
};
|
||||
};
|
||||
"simple-lru-cache-0.0.2" = {
|
||||
|
|
@ -6286,13 +6304,13 @@ let
|
|||
sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==";
|
||||
};
|
||||
};
|
||||
"sqlite3-5.0.4" = {
|
||||
"sqlite3-5.0.5" = {
|
||||
name = "sqlite3";
|
||||
packageName = "sqlite3";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.4.tgz";
|
||||
sha512 = "ATvAe7JutFv/d+KTbLS58KsKn/t1raL/WGn2qZfZxwsrL/oGSP+0OlbQ2tX5jISvyu6/7JuKze3WkaiP1JAH6A==";
|
||||
url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.5.tgz";
|
||||
sha512 = "ZZFOMW31IOMbUeSiL23TuWSjNyS7Z83EDJ80HJxCe78OZ+5BJT6IhAwAUnQgPsUl5z+Er0DGx7VjuTP7PKPNcg==";
|
||||
};
|
||||
};
|
||||
"sqlstring-2.3.3" = {
|
||||
|
|
@ -6781,13 +6799,13 @@ let
|
|||
sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
|
||||
};
|
||||
};
|
||||
"tslib-2.3.1" = {
|
||||
"tslib-2.4.0" = {
|
||||
name = "tslib";
|
||||
packageName = "tslib";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz";
|
||||
sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==";
|
||||
url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz";
|
||||
sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==";
|
||||
};
|
||||
};
|
||||
"tsscmp-1.0.6" = {
|
||||
|
|
@ -6889,13 +6907,13 @@ let
|
|||
sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==";
|
||||
};
|
||||
};
|
||||
"unbox-primitive-1.0.1" = {
|
||||
"unbox-primitive-1.0.2" = {
|
||||
name = "unbox-primitive";
|
||||
packageName = "unbox-primitive";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz";
|
||||
sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==";
|
||||
url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz";
|
||||
sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==";
|
||||
};
|
||||
};
|
||||
"unc-path-regex-0.1.2" = {
|
||||
|
|
@ -6907,13 +6925,13 @@ let
|
|||
sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
|
||||
};
|
||||
};
|
||||
"underscore-1.13.2" = {
|
||||
"underscore-1.13.3" = {
|
||||
name = "underscore";
|
||||
packageName = "underscore";
|
||||
version = "1.13.2";
|
||||
version = "1.13.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz";
|
||||
sha512 = "ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g==";
|
||||
url = "https://registry.npmjs.org/underscore/-/underscore-1.13.3.tgz";
|
||||
sha512 = "QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA==";
|
||||
};
|
||||
};
|
||||
"unique-stream-2.3.1" = {
|
||||
|
|
@ -7453,47 +7471,47 @@ in
|
|||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.173.1";
|
||||
version = "0.174.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.173.1.tgz";
|
||||
sha512 = "p6sfFQBAvLH4AK9x4E1n00B9F+jVxf/bQiHMzNkGDHvBv+b3OMXnJ1SpLG6hK1vZvXbwvEhZWqH+PrPJHR2eNQ==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.174.0.tgz";
|
||||
sha512 = "6opUG0aQ1JSQqKRgUbK0hLnH7XIs0FjH8NoLvBA51tntxMQ6ZnK2Nck1GH/6VVKqI6a+/udmSRFvd7Ohpwqzqw==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@azure/abort-controller-1.0.5" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."@azure/core-asynciterator-polyfill-1.0.2"
|
||||
(sources."@azure/core-auth-1.3.2" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-http-2.2.4" // {
|
||||
dependencies = [
|
||||
sources."tough-cookie-4.0.0"
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-lro-2.2.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-paging-1.2.1" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-tracing-1.0.0-preview.13" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@azure/logger-1.0.3" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."@azure/ms-rest-azure-env-2.0.0"
|
||||
|
|
@ -7505,7 +7523,7 @@ in
|
|||
sources."@azure/ms-rest-nodeauth-3.1.1"
|
||||
(sources."@azure/storage-blob-12.9.0" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."@babel/runtime-7.17.9"
|
||||
|
|
@ -7517,6 +7535,8 @@ in
|
|||
];
|
||||
})
|
||||
sources."@fontsource/open-sans-4.5.8"
|
||||
sources."@fortawesome/fontawesome-common-types-6.1.1"
|
||||
sources."@fortawesome/free-regular-svg-icons-6.1.1"
|
||||
sources."@icetee/ftp-0.3.15"
|
||||
sources."@kafkajs/confluent-schema-registry-1.0.6"
|
||||
sources."@kwsites/file-exists-1.1.1"
|
||||
|
|
@ -7528,7 +7548,7 @@ in
|
|||
sources."@oclif/command-1.8.16"
|
||||
(sources."@oclif/config-1.18.3" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@oclif/errors-1.3.5" // {
|
||||
|
|
@ -7539,13 +7559,13 @@ in
|
|||
(sources."@oclif/help-1.0.1" // {
|
||||
dependencies = [
|
||||
sources."@oclif/config-1.18.2"
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."@oclif/linewrap-1.0.0"
|
||||
(sources."@oclif/parser-3.8.7" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."@opentelemetry/api-1.1.0"
|
||||
|
|
@ -7574,7 +7594,7 @@ in
|
|||
sources."@types/lodash-4.14.182"
|
||||
sources."@types/lossless-json-1.0.1"
|
||||
sources."@types/mime-1.3.2"
|
||||
sources."@types/node-17.0.25"
|
||||
sources."@types/node-17.0.26"
|
||||
(sources."@types/node-fetch-2.6.1" // {
|
||||
dependencies = [
|
||||
sources."form-data-3.0.1"
|
||||
|
|
@ -7641,7 +7661,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."avsc-5.7.4"
|
||||
(sources."aws-sdk-2.1118.0" // {
|
||||
(sources."aws-sdk-2.1120.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
|
|
@ -7720,12 +7740,12 @@ in
|
|||
sources."callsites-3.1.0"
|
||||
(sources."camel-case-4.1.2" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."capital-case-1.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."caseless-0.12.0"
|
||||
|
|
@ -7737,7 +7757,7 @@ in
|
|||
sources."chalk-4.1.2"
|
||||
(sources."change-case-4.1.2" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."chardet-0.7.0"
|
||||
|
|
@ -7774,7 +7794,7 @@ in
|
|||
})
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
sources."color-string-1.9.0"
|
||||
sources."color-string-1.9.1"
|
||||
sources."color-support-1.1.3"
|
||||
sources."colornames-1.1.1"
|
||||
sources."colorspace-1.1.4"
|
||||
|
|
@ -7802,7 +7822,7 @@ in
|
|||
sources."console-control-strings-1.1.0"
|
||||
(sources."constant-case-3.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."content-disposition-0.5.4"
|
||||
|
|
@ -7811,7 +7831,7 @@ in
|
|||
sources."cookie-0.4.1"
|
||||
sources."cookie-parser-1.4.6"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."core-js-3.22.1"
|
||||
sources."core-js-3.22.2"
|
||||
sources."core-util-is-1.0.2"
|
||||
sources."crc-32-1.2.2"
|
||||
sources."cron-1.7.2"
|
||||
|
|
@ -7850,7 +7870,7 @@ in
|
|||
sources."domutils-2.8.0"
|
||||
(sources."dot-case-3.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."dotenv-8.6.0"
|
||||
|
|
@ -7988,7 +8008,7 @@ in
|
|||
sources."he-1.2.0"
|
||||
(sources."header-case-2.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."heap-0.2.7"
|
||||
|
|
@ -8080,7 +8100,7 @@ in
|
|||
sources."iconv-lite-0.6.2"
|
||||
];
|
||||
})
|
||||
sources."libphonenumber-js-1.9.51"
|
||||
sources."libphonenumber-js-1.9.52"
|
||||
sources."libqp-1.1.0"
|
||||
sources."limiter-1.1.5"
|
||||
sources."linkify-it-3.0.3"
|
||||
|
|
@ -8114,7 +8134,7 @@ in
|
|||
sources."lossless-json-1.0.5"
|
||||
(sources."lower-case-2.0.2" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."lru-cache-6.0.0"
|
||||
|
|
@ -8192,15 +8212,15 @@ in
|
|||
];
|
||||
})
|
||||
sources."mz-2.7.0"
|
||||
sources."n8n-core-0.114.0"
|
||||
sources."n8n-design-system-0.17.0"
|
||||
sources."n8n-editor-ui-0.140.0"
|
||||
(sources."n8n-nodes-base-0.171.1" // {
|
||||
sources."n8n-core-0.115.0"
|
||||
sources."n8n-design-system-0.18.0"
|
||||
sources."n8n-editor-ui-0.141.0"
|
||||
(sources."n8n-nodes-base-0.172.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-workflow-0.96.0"
|
||||
sources."n8n-workflow-0.97.0"
|
||||
(sources."named-placeholders-1.1.2" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-4.1.5"
|
||||
|
|
@ -8219,7 +8239,7 @@ in
|
|||
sources."neo-async-2.6.2"
|
||||
(sources."no-case-3.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."node-addon-api-4.3.0"
|
||||
|
|
@ -8266,7 +8286,7 @@ in
|
|||
sources."packet-reader-1.0.0"
|
||||
(sources."param-case-3.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."parent-require-1.0.0"
|
||||
|
|
@ -8278,7 +8298,7 @@ in
|
|||
sources."parseurl-1.3.3"
|
||||
(sources."pascal-case-3.1.2" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."passport-0.5.2"
|
||||
|
|
@ -8287,7 +8307,7 @@ in
|
|||
sources."passport-strategy-1.0.0"
|
||||
(sources."path-case-3.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."path-dirname-1.0.2"
|
||||
|
|
@ -8439,7 +8459,7 @@ in
|
|||
})
|
||||
(sources."sentence-case-3.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."seq-queue-0.0.5"
|
||||
|
|
@ -8458,13 +8478,13 @@ in
|
|||
})
|
||||
sources."side-channel-1.0.4"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."simple-git-3.7.0"
|
||||
sources."simple-git-3.7.1"
|
||||
sources."simple-lru-cache-0.0.2"
|
||||
sources."simple-swizzle-0.2.2"
|
||||
sources."slash-3.0.0"
|
||||
(sources."snake-case-3.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."snowflake-sdk-1.6.9" // {
|
||||
|
|
@ -8483,7 +8503,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."sprintf-js-1.1.2"
|
||||
sources."sqlite3-5.0.4"
|
||||
sources."sqlite3-5.0.5"
|
||||
sources."sqlstring-2.3.3"
|
||||
sources."sse-channel-3.1.1"
|
||||
sources."ssf-0.11.2"
|
||||
|
|
@ -8508,7 +8528,7 @@ in
|
|||
sources."tdigest-0.1.1"
|
||||
(sources."tedious-6.7.1" // {
|
||||
dependencies = [
|
||||
sources."@types/node-12.20.48"
|
||||
sources."@types/node-12.20.49"
|
||||
sources."bl-3.0.1"
|
||||
sources."iconv-lite-0.5.2"
|
||||
sources."readable-stream-3.6.0"
|
||||
|
|
@ -8568,20 +8588,20 @@ in
|
|||
})
|
||||
sources."uc.micro-1.0.6"
|
||||
sources."uid-safe-2.1.5"
|
||||
sources."unbox-primitive-1.0.1"
|
||||
sources."unbox-primitive-1.0.2"
|
||||
sources."unc-path-regex-0.1.2"
|
||||
sources."underscore-1.13.2"
|
||||
sources."underscore-1.13.3"
|
||||
sources."unique-stream-2.3.1"
|
||||
sources."universalify-0.1.2"
|
||||
sources."unpipe-1.0.0"
|
||||
(sources."upper-case-2.0.2" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."upper-case-first-2.0.2" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."uri-js-4.4.1"
|
||||
|
|
|
|||
|
|
@ -9,4 +9,5 @@
|
|||
wlrobs = callPackage ./wlrobs.nix {};
|
||||
looking-glass-obs = callPackage ./looking-glass-obs.nix {};
|
||||
obs-nvfbc = callPackage ./obs-nvfbc.nix {};
|
||||
obs-vkcapture = callPackage ./obs-vkcapture.nix {};
|
||||
}
|
||||
|
|
|
|||
35
pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
Normal file
35
pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, wayland
|
||||
, obs-studio
|
||||
, libX11
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, libGL
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-vkcapture";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nowrep";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iIV9ke2yPEt2Lf4bwiEHFip4tLhMS4raWGyCWpao74w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
buildInputs = [ libGL libX11 obs-studio vulkan-headers vulkan-loader wayland ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OBS Linux Vulkan/OpenGL game capture";
|
||||
homepage = "https://github.com/nowrep/obs-vkcapture";
|
||||
maintainers = with maintainers; [ atila ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cldr-emoji-annotation";
|
||||
version = "37.0_13.0_0_2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fujiwarat";
|
||||
repo = "cldr-emoji-annotation";
|
||||
rev = version;
|
||||
sha256 = "0la3h6l58j9jfjvzwz65x56ijx7sppirwpqbqc06if4c2g0kzswj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Emoji annotation files in CLDR";
|
||||
homepage = "https://www.unicode.org/";
|
||||
license = licenses.unicode-dfs-2016;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -132,67 +132,67 @@ rec {
|
|||
|
||||
# v6.0 (lts)
|
||||
aspnetcore_6_0 = buildAspNetCore {
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/3af854b6-80fb-425a-972f-c7f0d693bf1b/cd458a4feae5a98646ee12a14ab34151/aspnetcore-runtime-6.0.3-linux-x64.tar.gz";
|
||||
sha512 = "9ea54220468d922ef2c40433c4b8c70df6c60d8ea63a3ac1ff5e5ce712606ae5cfe1e57d321b87eff1b5dc34d7823a4b4b964180587383f22d9a0ff5bb3a8c88";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/de3f6658-5d5b-4986-aeb1-7efdf5818437/7df572051df15117a0f52be1b79e1823/aspnetcore-runtime-6.0.4-linux-x64.tar.gz";
|
||||
sha512 = "eaff93db0a4cc0adc2fc54de5e9a6e4b0844398451c06bcf6b2867471b8ed4fd0528ad04fe7150aa5ed306d5e08a5e4219c6029b96da03ad2d1c58e7a0ddacaf";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/1e7933b2-1202-4aeb-bb70-a6f9cecac61a/b12b5666b3d4cf508f8575581abd4033/aspnetcore-runtime-6.0.3-linux-arm64.tar.gz";
|
||||
sha512 = "745586b64d3e01f856c366821f6fb8ca97c55b2a90ba36d528fdf99c98938574805153e7d4fff0560afe8382bea14b35ddeba391a2dc2328285f02e125c9b702";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/ba1662bf-50e6-451a-957f-0d55bc6e5713/921fe0e68428ac47c098e97418d3126a/aspnetcore-runtime-6.0.4-linux-arm64.tar.gz";
|
||||
sha512 = "18ffa72b38dcd01bbfd9f656996e994dbcdb7b6b196771fc498bbaea774ad844f7fd5418487d0a5a7f83a76b3683f8913e22275bc25d66ee0c0d84ea4e279971";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/2cfe2a02-dd59-4cb7-9788-76c620eaa0ff/dfd0d449289a042be9bc62e4466bf350/aspnetcore-runtime-6.0.3-osx-x64.tar.gz";
|
||||
sha512 = "bda83cf36fc9aa62ff3e16a26b5f8f37efa3221ab826467fe26f3072517a428c64e44bc52f8a90f5c77bc60eeeddb8c3d59d2a509999edce3b51b835dd7edf83";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/b39aa0b4-27e2-4fce-bf36-fb6d46f89e5e/6b8ca3b4c7026db460df1d49f5366f1b/aspnetcore-runtime-6.0.4-osx-x64.tar.gz";
|
||||
sha512 = "33b1b24496296242dd78714564e52e6be575f46d681a5093a0aca842aff5e29778cbf31259f11ce395fc9a2368fa6bfde2e12a074ccf310f9b661c0bdaf39d2d";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/d7cf4456-d9ba-4a31-98e9-4681e1b0d8b8/b9c4cfded00e9940756e62c4486f64c6/aspnetcore-runtime-6.0.3-osx-arm64.tar.gz";
|
||||
sha512 = "03d1d4e8a8370856120e045ed4a83b3383d00fb56b5fdaf7db0de8bab5e3de60d03c02deaed6f72bde0d6b0e12511fe1202c4e2c25fdeeb489ad61a5902d71d3";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/d7b60e75-6901-4f68-8943-ce32cadeaf29/f14e40b3e9a69cbd79d47375b16a76e7/aspnetcore-runtime-6.0.4-osx-arm64.tar.gz";
|
||||
sha512 = "9ff8ecc60f70d8cfa53396761610282358aa7bcbd3f013aedc639be7b8f502a8cb121777c7e8a0a7d64d74b99211751ea8a8c1819861b72ad11d80590ba9ed2b";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
runtime_6_0 = buildNetRuntime {
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/4e766615-57e6-4b1d-a574-25eeb7a71107/9f95f74c33711e085302ffd644ef86ee/dotnet-runtime-6.0.3-linux-x64.tar.gz";
|
||||
sha512 = "083d9e6e72f0d8f175b341f5229277374e630c5358cfd3602fe611aeef59abec715edbe18d62135a5d13a650e99ef49f19b17e8c81663d0b5bee757519bec894";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/5b08d331-15ac-4a53-82a5-522fa45b1b99/65ae300dd160ae0b88b91dd78834ce3e/dotnet-runtime-6.0.4-linux-x64.tar.gz";
|
||||
sha512 = "001487bfb337d0f737c4e3dedc4bc41b3185922c07c07e8f1d47e4578914fdeeed7421d7af2c4bb5e17ebddd05fde4cb9aea1e8145018dcffeaca70c1fa49bbb";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/89b5d16e-cb5e-4e6c-90f6-7332e93d20ae/7a0146aa4fc59154a3256c5196a622c7/dotnet-runtime-6.0.3-linux-arm64.tar.gz";
|
||||
sha512 = "f0f9fb191054dea2e4151a86c3de1a11ce574cc843cde429850db0996c7df403dfa348a277f1af96f13fec718ae77f3be75379ed3829b027e561564ff22c7258";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/3641affa-8bb0-486f-93d9-68adff4f4af7/1e3df9fb86cba7299b9e575233975734/dotnet-runtime-6.0.4-linux-arm64.tar.gz";
|
||||
sha512 = "acbb50f2a1cde2bb8f59ec2059cd90f669748ce0da519ddbb831d8f279c4b896cc7a8f4275fb2c4726c5caf3d6430ee6d9823baa6f65238c7017ecbc2b8a6444";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/1f354e35-ff3f-4de7-b6be-f5001b7c3976/b7c8814ab28a6f00f063440e63903105/dotnet-runtime-6.0.3-osx-x64.tar.gz";
|
||||
sha512 = "98c457cbc0ac8f5f0acd7807bb45726b78e87d4f554fd30123cc8d9568b5341cc5bba16c8e4c85537ec4798d7e4d7f2f11701d2045b124f1b36bca75d80458e8";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/c0bc0428-852d-4884-b536-3d0969a400ba/fe0a9a221c3e665e88b7020633f2cf8e/dotnet-runtime-6.0.4-osx-x64.tar.gz";
|
||||
sha512 = "7a798ce54880533151cc9290129e1a6224e81e657026e5be580ee24742d54e8e8e5f8f3bdee2cb94d5129082e3a2ffd1460f490abb848aaf3558e584e2e2df43";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/03047609-269e-4ca6-bf2e-406c496b27e3/3b19ad4d3fbc5d9a92f436db13e9e3d1/dotnet-runtime-6.0.3-osx-arm64.tar.gz";
|
||||
sha512 = "1debd4acab3c6408c849323e6dfba28a626850c40f93a0debe46c54f0c0b39526f4118d5b2bcf0307efeba0bc2656a92187a685400095ae078227698a0aabfb3";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/dd2f6b72-bf47-4ae5-8a3d-4d394569cc34/87d408439ac5feffe2abf622dbfa5084/dotnet-runtime-6.0.4-osx-arm64.tar.gz";
|
||||
sha512 = "3070af5d9dc44820dc93ca89489f1dfa8024958f64a9d62fafddb49fa16325f0845cc53027703495dc524515e613f3e7701ef148da06653070cb2e3928fb0aca";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
sdk_6_0 = buildNetSdk {
|
||||
version = "6.0.201";
|
||||
version = "6.0.202";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/c505a449-9ecf-4352-8629-56216f521616/bd6807340faae05b61de340c8bf161e8/dotnet-sdk-6.0.201-linux-x64.tar.gz";
|
||||
sha512 = "a4d96b6ca2abb7d71cc2c64282f9bd07cedc52c03d8d6668346ae0cd33a9a670d7185ab0037c8f0ecd6c212141038ed9ea9b19a188d1df2aae10b2683ce818ce";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/9d8c7137-2091-4fc6-a419-60ba59c8b9de/db0c5cda94f31d2260d369123de32d59/dotnet-sdk-6.0.202-linux-x64.tar.gz";
|
||||
sha512 = "81e9c368d445d9e92e3af471d52dc2aa05e3ecb75ce95c13a2ed1d117852dae43d23d913bbe92eab730aef7f38a14488a1ac65c3b79444026a629647322c5798";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/33c6e1e3-e81f-44e8-9de8-91934fba3c94/9105f95a9e37cda6bd0c33651be2b90a/dotnet-sdk-6.0.201-linux-arm64.tar.gz";
|
||||
sha512 = "2ea443c27ab7ca9d566e4df0e842063642394fd22fe2a8620371171c8207ae6a4a72c8c54fc6af5b6b053be25cf9c09a74504f08b963e5bd84544619aed9afc2";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/952f5525-7227-496f-85e5-09cadfb44629/eefd0f6eb8f809bfaf4f0661809ed826/dotnet-sdk-6.0.202-linux-arm64.tar.gz";
|
||||
sha512 = "2d0021bb4cd221ffba6888dbd6300e459f45f4f9d3cf7323f3b97ee0f093ef678f5a36d1c982296f4e15bbcbd7275ced72c3e9b2fc754039ba663d0612ffd866";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/cecaa095-3254-4987-b105-6bb9b594a89c/df29881aea827565a96d5e47dc337749/dotnet-sdk-6.0.201-osx-x64.tar.gz";
|
||||
sha512 = "1df27ca5a1db1a8712acd95083aa00ec7b266618770e164d6460d0cf781b3643a7365ef35232140c83b588f7aa4e2d7e5f5b6d627f1851b2d0ec197172f9fb4d";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/1a014dee-ff5f-48e3-a817-82b9bd536b56/fed3a710f5e0add13844a6ce400775a1/dotnet-sdk-6.0.202-osx-x64.tar.gz";
|
||||
sha512 = "ff7df20ce9054ed50d521eba88e063422efa4d48cb3117cf733cc6ecea24012c2ac34f6df10d88f64fe7a952bb96455a3c2eb877f1d50c0b7bcaedf11f98ce82";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/628be5e6-7fc7-42b6-99c9-ea46fbcc3d14/d94bb4198af2d5013c75b1c70751ec8f/dotnet-sdk-6.0.201-osx-arm64.tar.gz";
|
||||
sha512 = "0796a81339788fbc160885548983889dcffd26a5c0ac935b497b290ae99920386f3929cebfbef9bb22f644a207ba329cf8b90ffe7bbb49d1d99d0d8a05ce50c9";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/032fc69b-f437-4d17-9e6c-c204ce18a0b0/76386390762a9ba205666a6e45a2ac47/dotnet-sdk-6.0.202-osx-arm64.tar.gz";
|
||||
sha512 = "8bf9ff3f89ac0f2d04b09d3f5df72efeac8007b9e33980c9c80eb735d050275a5594b11d902d0304ac9967111971bcd690be3adf34d4acbef6d247e8f2071f60";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.23"; sha256 = "0r2jd4ys31sgp2zcf8lzkji1xkyaxzgrkrh5rkk7p3r8b5f7fkcv"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.24"; sha256 = "0a4ra58nhh8q8r9lmzihjabx3dwyzh0wpdjlz4qxvjjbr6cqnhy9"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.23"; sha256 = "09cy79swsmrfczv92wmxrwin7djpdl22yzhriac7r1xcg2sc36yk"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.24"; sha256 = "16wn8f3aswbbp1ivh0rdmhq99924ba8jmgaw964h23ncy6xyh2ip"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq";
|
||||
};
|
||||
|
||||
# Fix build with GCC 11.
|
||||
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch";
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libyang";
|
||||
version = "2.0.112";
|
||||
version = "2.0.164";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CESNET";
|
||||
repo = "libyang";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-f8x0tC3XcQ9fnUE987GYw8qEo/B+J759vpCImqG3QWs=";
|
||||
sha256 = "sha256-0Ou0j9KaNkX/SFmid+wphvtu3wDTXkw+8xdck6lEE3w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vapoursynth";
|
||||
version = "R57";
|
||||
version = "R58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vapoursynth";
|
||||
repo = "vapoursynth";
|
||||
rev = version;
|
||||
sha256 = "sha256-tPQ1SOIpFevOYzL9a8Lc5+dv2egVX1CY3km8yWVv+Sk=";
|
||||
sha256 = "sha256-LIjNfyfpyvE+Ec6f4aGzRA4ZGoWPFhjtUw4yrenDsUQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
, "coc-flutter"
|
||||
, "coc-git"
|
||||
, "coc-go"
|
||||
, "coc-haxe"
|
||||
, "coc-highlight"
|
||||
, "coc-html"
|
||||
, "coc-imselect"
|
||||
|
|
|
|||
2422
pkgs/development/node-packages/node-packages.nix
generated
2422
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioftp";
|
||||
version = "0.21.0";
|
||||
version = "0.21.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-TwORfChymaB4k5Q3CAPjsPaTXiQdjyi7s2fCN5qTT5I=";
|
||||
sha256 = "sha256-JWzeBdCPXLYMmKkvCqQQF/mHoRbdRvj0vKVF4+D8LSI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -41,6 +41,12 @@ buildPythonPackage rec {
|
|||
"aiohttp_remotes"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W"
|
||||
"ignore::DeprecationWarning"
|
||||
"--asyncio-mode=auto"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Set of useful tools for aiohttp.web server";
|
||||
homepage = "https://github.com/wikibusiness/aiohttp-remotes";
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "aiohttp-swagger";
|
||||
version = "1.0.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -20,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "cr0hn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q=";
|
||||
hash = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -41,7 +42,14 @@ buildPythonPackage rec {
|
|||
--replace "jinja2~=2.11.2" "jinja2>=2.11.2"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aiohttp_swagger" ];
|
||||
preCheck = ''
|
||||
# The custom client is obsolete
|
||||
rm tests/conftest.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiohttp_swagger"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Swagger API Documentation builder for aiohttp";
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "amply";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38";
|
||||
sha256 = "sha256-rXF7SQtrcFWQn6oZXoKkQytwb4+VhUBQFy9Ckx5HhCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pythonOlder
|
||||
|
||||
# pythonPackages
|
||||
, anyconfig
|
||||
|
|
@ -18,14 +19,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "1.2.1";
|
||||
version = "1.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2Jaf7asU4c7kw9v9dUYDL4/M2Y/2qhMM3m0jqYiobUI=";
|
||||
hash = "sha256-e0FmV4U96TSC/dYJlgo5AeLdXQ7Z7rrP4JCtBxJdkhU=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -34,6 +37,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \
|
||||
--replace 'environs = "9.5.0"' 'environs = "*"' \
|
||||
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' \
|
||||
--replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"'
|
||||
|
|
@ -58,7 +62,10 @@ buildPythonPackage rec {
|
|||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "ansibledoctor" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ansibledoctor"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Annotation based documentation for your Ansible roles";
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-later";
|
||||
version = "2.0.9";
|
||||
version = "2.0.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "thegeeklab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g7/RClQB+6HsDbe/VjjKka97LcwRTKO0OD0RlCG9lWY=";
|
||||
hash = "sha256-EwWoRLTA1vm8Su3VpXTrRVtmtneEsO/+SuuY1k1yeMQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asciimatics";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a041826ec5add03fb882d8981c1debf9b9e98274f4f2d52ec21ef30de70c2c6e";
|
||||
sha256 = "sha256-FtIM5CIQtDTrBbpGns24KTrH7TwM4N1PcOMNctdgIic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,31 +1,42 @@
|
|||
{ lib
|
||||
, boto3
|
||||
, botocore
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, configparser
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fido2
|
||||
, glibcLocales
|
||||
, isPy27
|
||||
, lxml
|
||||
, mock
|
||||
, poetry-core
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-kerberos
|
||||
, toml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-adfs";
|
||||
version = "2.0.1";
|
||||
disabled = isPy27;
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-+WMv52JIbh51pqLhDnUCzrcbPD5eutzwFcPOhO+nR7s=";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "venth";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-0BURXbEOZvb8kszuajLtR+V7HjJycCBAQrm3WqpVB1w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boto3
|
||||
botocore
|
||||
click
|
||||
configparser
|
||||
|
|
@ -36,31 +47,38 @@ buildPythonPackage rec {
|
|||
requests-kerberos
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
glibcLocales
|
||||
mock
|
||||
pytestCheckHook
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/venth/aws-adfs/pull/230
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/venth/aws-adfs/commit/da095ccf64629d36a6045ffec2684038378ee690.patch";
|
||||
sha256 = "sha256-xg4c7iIonkUmNN74q/UeGSuYP3to7q4cLW6+TMW9nh4=";
|
||||
})
|
||||
];
|
||||
|
||||
# Relax version constraint
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'coverage < 4' 'coverage' \
|
||||
--replace 'fido2>=0.8.1,<0.9.0' 'fido2>=0.8.1,<1.0.0'
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'boto3 = "^1.20.50"' 'boto3 = "*"' \
|
||||
--replace 'botocore = ">=1.12.6"' 'botocore = "*"'
|
||||
'';
|
||||
|
||||
# Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset
|
||||
HOME = ".";
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
toml
|
||||
];
|
||||
|
||||
# Required for python3 tests, along with glibcLocales
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aws_adfs" ];
|
||||
pythonImportsCheck = [
|
||||
"aws_adfs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tool to ease aws cli authentication against ADFS";
|
||||
description = "Command line tool to ease AWS CLI authentication against ADFS";
|
||||
homepage = "https://github.com/venth/aws-adfs";
|
||||
license = licenses.psfl;
|
||||
maintainers = [ maintainers.bhipple ];
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, hypothesis
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "collections-extended";
|
||||
version = "2.0.2";
|
||||
|
|
@ -16,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "mlenzen";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cK13+CQUELKSiLpG747+C+RB5b6luu0mWLLXTT+uGH4=";
|
||||
hash = "sha256-cK13+CQUELKSiLpG747+C+RB5b6luu0mWLLXTT+uGH4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -24,14 +26,17 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "collections_extended" ];
|
||||
pythonImportsCheck = [
|
||||
"collections_extended"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extra Python Collections - bags (multisets), setlists (unique list/indexed set), RangeMap and IndexedDict";
|
||||
homepage = "https://github.com/mlenzen/collections-extended";
|
||||
description = "Extra Python Collections - bags (multisets), setlists (unique list / indexed set), RangeMap and IndexedDict";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ exarkun ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "coqpit";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i2Lf7YQ9Ht4AlmfIBvJTWNPgEk8Kv92rs5VxuPgvR5U=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-f1FLjR4VzSOA/VaeseVA4F1NWVJIvokIZIDW1k7fNqU=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -47,6 +47,6 @@ buildPythonPackage rec {
|
|||
description = "Python library for Dropbox's HTTP-based Core and Datastore APIs";
|
||||
homepage = "https://github.com/dropbox/dropbox-sdk-python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,5 +58,7 @@ buildPythonPackage rec {
|
|||
description = "MRI intensity normalization tools";
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
license = licenses.asl20;
|
||||
# depends on simpleitk python wrapper which is not packaged yet
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "0s1hkanhfv7virdynxxx28kp3w596iiplvi0jqv3dsr63gl0m0m7"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1fvv5ri32pbl43628zqnim6fbv6hjxf66p0v793xdh57dzkdyh0j"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; sha256 = "03v6145vr1winq8xxfikydicds4f10qmy1ybyz2gfimnzzx51w00"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.4"; sha256 = "0g1vw0wr88zlfpdg2gz8c0mriasci1kzvjia4nj19j7b0zaga7f0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "09i8ca56szmvyp1xlddyv3124rrcar8vgsq3pmprcylfdjarck6x"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1gibwhplbanv6bz3l71w8vhzlgqsh21bms30dbf1n60v7p02fl3h"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1-rc2-24027"; sha256 = "1a0w5fv8slfr4q7m3mh78lb9awdwyz4zv3bb73vybkyq1f6z7lx8"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
|
|
|
|||
|
|
@ -1,13 +1,19 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../../.. -i bash -p dotnet-sdk_6 jq xmlstarlet curl
|
||||
#!nix-shell -I nixpkgs=../../../.. -i bash -p dotnet-sdk_6 jq xmlstarlet curl
|
||||
set -euo pipefail
|
||||
|
||||
cat << EOL
|
||||
{ fetchurl }: [
|
||||
EOL
|
||||
|
||||
# enter a temporary directory containing the source code, copied from the derivation
|
||||
srcdir="$(mktemp -d)"
|
||||
cp -r "$(nix-build -A omnisharp-roslyn.src ../../../..)"/. "$srcdir"
|
||||
rm -f "$srcdir"/global.json
|
||||
|
||||
pushd $srcdir >&2
|
||||
|
||||
tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root
|
||||
trap 'rm -rf "$tmpdir"' EXIT
|
||||
|
||||
mapfile -t repos < <(
|
||||
xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.Config |
|
||||
|
|
@ -20,7 +26,7 @@ mapfile -t repos < <(
|
|||
|
||||
dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \
|
||||
-p:RestoreNoCache=true -p:RestoreForce=true \
|
||||
src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2
|
||||
"$srcdir/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj" >&2
|
||||
|
||||
cd "$tmpdir"
|
||||
for package in *
|
||||
|
|
@ -64,3 +70,5 @@ cd ..
|
|||
cat << EOL
|
||||
]
|
||||
EOL
|
||||
|
||||
popd >&2
|
||||
|
|
|
|||
54
pkgs/development/tools/omnisharp-roslyn/deps.nix
generated
54
pkgs/development/tools/omnisharp-roslyn/deps.nix
generated
|
|
@ -65,26 +65,26 @@
|
|||
}
|
||||
{
|
||||
pname = "microsoft.aspnetcore.app.runtime.win-arm64";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-arm64/6.0.3/microsoft.aspnetcore.app.runtime.win-arm64.6.0.3.nupkg";
|
||||
sha256 = "0wxnwqg43hd1hk07j1wqhfrwbjm5ly7bsy9z2jgy9zf8lya4qs9a";
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-arm64/6.0.4/microsoft.aspnetcore.app.runtime.win-arm64.6.0.4.nupkg";
|
||||
sha256 = "1sn2jlqzyiszrxscd3ah7sfvv065xc3vjky34qy81wdmyvxwhkba";
|
||||
};
|
||||
}
|
||||
{
|
||||
pname = "microsoft.aspnetcore.app.runtime.win-x64";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x64/6.0.3/microsoft.aspnetcore.app.runtime.win-x64.6.0.3.nupkg";
|
||||
sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq";
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x64/6.0.4/microsoft.aspnetcore.app.runtime.win-x64.6.0.4.nupkg";
|
||||
sha256 = "1sqv7vhkm4j11rl7mfvs4mmmclcdps2n4pf31ck2mcx54nr4d2kj";
|
||||
};
|
||||
}
|
||||
{
|
||||
pname = "microsoft.aspnetcore.app.runtime.win-x86";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x86/6.0.3/microsoft.aspnetcore.app.runtime.win-x86.6.0.3.nupkg";
|
||||
sha256 = "1c1qx840hwcp6a26dbx10f24pw9kzlvr15w3s1pakldygng5skwm";
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x86/6.0.4/microsoft.aspnetcore.app.runtime.win-x86.6.0.4.nupkg";
|
||||
sha256 = "0v7bpbl7bif1qlkdc0p10l69amf4vpzdd8bgz2455h6zxwjc1hy4";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -553,50 +553,50 @@
|
|||
}
|
||||
{
|
||||
pname = "microsoft.netcore.app.host.win-arm64";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-arm64/6.0.3/microsoft.netcore.app.host.win-arm64.6.0.3.nupkg";
|
||||
sha256 = "1dhdr3ccaag3yb803qswkm1zvvwc9q6m3d9nvxvb5f8m94rsbhka";
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-arm64/6.0.4/microsoft.netcore.app.host.win-arm64.6.0.4.nupkg";
|
||||
sha256 = "1bnfb4yxdandddr36j5gkpaqym5pm971rp7gc8nkp3xmff4fnmc0";
|
||||
};
|
||||
}
|
||||
{
|
||||
pname = "microsoft.netcore.app.host.win-x64";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x64/6.0.3/microsoft.netcore.app.host.win-x64.6.0.3.nupkg";
|
||||
sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj";
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x64/6.0.4/microsoft.netcore.app.host.win-x64.6.0.4.nupkg";
|
||||
sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp";
|
||||
};
|
||||
}
|
||||
{
|
||||
pname = "microsoft.netcore.app.host.win-x86";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x86/6.0.3/microsoft.netcore.app.host.win-x86.6.0.3.nupkg";
|
||||
sha256 = "0byyxiv8253zgymn0vwz8zxyasmhdwj891gxg3ydgnc2qf23f16g";
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x86/6.0.4/microsoft.netcore.app.host.win-x86.6.0.4.nupkg";
|
||||
sha256 = "16chkjf2fc2d4bd7wccxkgb5n44dpb6admchmg8mx3mlg0n24bwa";
|
||||
};
|
||||
}
|
||||
{
|
||||
pname = "microsoft.netcore.app.runtime.win-arm64";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-arm64/6.0.3/microsoft.netcore.app.runtime.win-arm64.6.0.3.nupkg";
|
||||
sha256 = "022kld62v6npxx27mvllg3nv7rpw142q49zwgprzvrxgnn5zszq1";
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-arm64/6.0.4/microsoft.netcore.app.runtime.win-arm64.6.0.4.nupkg";
|
||||
sha256 = "1jcfajqq6i06w8a9n2r92f326x3v7avkiv31nsldzjdn1ikiwfzj";
|
||||
};
|
||||
}
|
||||
{
|
||||
pname = "microsoft.netcore.app.runtime.win-x64";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x64/6.0.3/microsoft.netcore.app.runtime.win-x64.6.0.3.nupkg";
|
||||
sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw";
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x64/6.0.4/microsoft.netcore.app.runtime.win-x64.6.0.4.nupkg";
|
||||
sha256 = "1x4ysack9n57h8w1ybfyczkf3w6jsgz7ila0czm2011w4sjnyqj0";
|
||||
};
|
||||
}
|
||||
{
|
||||
pname = "microsoft.netcore.app.runtime.win-x86";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x86/6.0.3/microsoft.netcore.app.runtime.win-x86.6.0.3.nupkg";
|
||||
sha256 = "0gsk9939f6vrqbgc7cw8g8q9c7669rkfwwlyhiq13piqmj2kni6g";
|
||||
url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x86/6.0.4/microsoft.netcore.app.runtime.win-x86.6.0.4.nupkg";
|
||||
sha256 = "1ha2w6zh0l1kl36rxy9g38xcq8awhyqiiwi9gbr9kmxig5i5fxfa";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
|
|||
4
pkgs/games/osu-lazer/deps.nix
generated
4
pkgs/games/osu-lazer/deps.nix
generated
|
|
@ -66,7 +66,7 @@
|
|||
(fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; })
|
||||
(fetchNuGet { pname = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; })
|
||||
(fetchNuGet { pname = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1fvv5ri32pbl43628zqnim6fbv6hjxf66p0v793xdh57dzkdyh0j"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.3"; sha256 = "0mc84qjsbsi7m1yx42w4zh8bdkqyqlvvx9iw80g4wsbrflkq5pwi"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.3"; sha256 = "1vadkmcxj2nv01mg8027z0ywxk2fddyj5aqflanslbfclsz4779i"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.3"; sha256 = "11a5w8p0nkfyp21aafpmrf0lvjpbg2p4yqay4dxbjg0w99w2kwq6"; })
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1gibwhplbanv6bz3l71w8vhzlgqsh21bms30dbf1n60v7p02fl3h"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk
|
||||
#!nix-shell -I nixpkgs=../../../. -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk
|
||||
set -eo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
|
|
@ -13,7 +13,11 @@ if [[ "$new_version" == "$old_version" ]]; then
|
|||
fi
|
||||
|
||||
cd ../../..
|
||||
update-source-version osu-lazer "$new_version"
|
||||
|
||||
if [[ "$1" != "--deps-only" ]]; then
|
||||
update-source-version osu-lazer "$new_version"
|
||||
fi
|
||||
|
||||
store_src="$(nix-build . -A osu-lazer.src --no-out-link)"
|
||||
src="$(mktemp -d /tmp/osu-src.XXX)"
|
||||
echo "Temp src dir: $src"
|
||||
|
|
@ -26,6 +30,7 @@ export DOTNET_NOLOGO=1
|
|||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
|
||||
mkdir ./nuget_tmp.packages
|
||||
dotnet --info
|
||||
dotnet restore osu.Desktop --packages ./nuget_tmp.packages --runtime linux-x64
|
||||
|
||||
nuget-to-nix ./nuget_tmp.packages > "$deps_file"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ledger-udev-rules";
|
||||
version = "unstable-2019-05-30";
|
||||
version = "unstable-2021-09-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LedgerHQ";
|
||||
repo = "udev-rules";
|
||||
rev = "765b7fdf57b20fd9326cedf48ee52e905024ab4f";
|
||||
sha256 = "10a42al020zpkx918y6b1l9az45vk3921b2l1mx87w3m0ad9qvif";
|
||||
rev = "2776324af6df36c2af4d2e8e92a1c98c281117c9";
|
||||
sha256 = "sha256-yTYI81PXMc32lMfI5uhD14nP20zAI7ZF33V1LRDWg2Y=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ lib, pkgs }:
|
||||
let
|
||||
inherit (lib) types;
|
||||
inherit (types) attrsOf oneOf coercedTo str bool int float package;
|
||||
in
|
||||
{
|
||||
javaProperties = { comment ? "Generated with Nix" }: {
|
||||
javaProperties = { comment ? "Generated with Nix", boolToString ? lib.boolToString }: {
|
||||
|
||||
# Design note:
|
||||
# A nested representation of inevitably leads to bad UX:
|
||||
|
|
@ -25,7 +29,21 @@
|
|||
# We _can_ choose to support hierarchical config files
|
||||
# via nested attrsets, but the module author should
|
||||
# make sure that problem (2) does not occur.
|
||||
type = lib.types.attrsOf lib.types.str;
|
||||
type = let
|
||||
elemType =
|
||||
oneOf ([
|
||||
# `package` isn't generalized to `path` because path values
|
||||
# are ambiguous. Are they host path strings (toString /foo/bar)
|
||||
# or should they be added to the store? ("${/foo/bar}")
|
||||
# The user must decide.
|
||||
(coercedTo package toString str)
|
||||
|
||||
(coercedTo bool boolToString str)
|
||||
(coercedTo int toString str)
|
||||
(coercedTo float toString str)
|
||||
])
|
||||
// { description = "string, package, bool, int or float"; };
|
||||
in attrsOf elemType;
|
||||
|
||||
generate = name: value:
|
||||
pkgs.runCommandLocal name
|
||||
|
|
|
|||
|
|
@ -5,6 +5,12 @@
|
|||
, lib
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
# This test primarily tests correct escaping.
|
||||
# See also testJavaProperties in
|
||||
# pkgs/pkgs-lib/tests/formats.nix, which tests
|
||||
# type coercions and is a bit easier to read.
|
||||
|
||||
let
|
||||
inherit (lib) concatStrings attrValues mapAttrs;
|
||||
|
||||
|
|
@ -71,7 +77,8 @@ stdenv.mkDerivation {
|
|||
src = lib.sourceByRegex ./. [
|
||||
".*\.java"
|
||||
];
|
||||
LANG = "C.UTF-8";
|
||||
# On Linux, this can be C.UTF-8, but darwin + zulu requires en_US.UTF-8
|
||||
LANG = "en_US.UTF-8";
|
||||
buildPhase = ''
|
||||
javac Main.java
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -18,8 +18,11 @@ let
|
|||
}) [ def ]);
|
||||
in formatSet.generate "test-format-file" config;
|
||||
|
||||
runBuildTest = name: { drv, expected }: pkgs.runCommand name {} ''
|
||||
if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then
|
||||
runBuildTest = name: { drv, expected }: pkgs.runCommand name {
|
||||
passAsFile = ["expected"];
|
||||
inherit expected drv;
|
||||
} ''
|
||||
if diff -u "$expectedPath" "$drv"; then
|
||||
touch "$out"
|
||||
else
|
||||
echo
|
||||
|
|
@ -171,11 +174,21 @@ in runBuildTests {
|
|||
'';
|
||||
};
|
||||
|
||||
# See also java-properties/default.nix for more complete tests
|
||||
# This test is responsible for
|
||||
# 1. testing type coercions
|
||||
# 2. providing a more readable example test
|
||||
# Whereas java-properties/default.nix tests the low level escaping, etc.
|
||||
testJavaProperties = {
|
||||
drv = evalFormat formats.javaProperties {} {
|
||||
floaty = 3.1415;
|
||||
tautologies = true;
|
||||
contradictions = false;
|
||||
foo = "bar";
|
||||
"1" = "2";
|
||||
# # Disallowed at eval time, because it's ambiguous:
|
||||
# # add to store or convert to string?
|
||||
# root = /root;
|
||||
"1" = 2;
|
||||
package = pkgs.hello;
|
||||
"ütf 8" = "dûh";
|
||||
# NB: Some editors (vscode) show this _whole_ line in right-to-left order
|
||||
"الجبر" = "أكثر من مجرد أرقام";
|
||||
|
|
@ -184,7 +197,11 @@ in runBuildTests {
|
|||
# Generated with Nix
|
||||
|
||||
1 = 2
|
||||
contradictions = false
|
||||
floaty = 3.141500
|
||||
foo = bar
|
||||
package = ${pkgs.hello}
|
||||
tautologies = true
|
||||
\u00fctf\ 8 = d\u00fbh
|
||||
\u0627\u0644\u062c\u0628\u0631 = \u0623\u0643\u062b\u0631 \u0645\u0646 \u0645\u062c\u0631\u062f \u0623\u0631\u0642\u0627\u0645
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-04-19";
|
||||
version = "2022-04-22";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "a26d72baa27a46cfd2f35afa789529dccf7fc212";
|
||||
rev = "a879ff1515b6bd80eea695c03e22289bd6743718";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "PwHE8PDvZ4fRBAq4wxgXc7FS6Q6Se6ICYDrwBaxKV1Q=";
|
||||
sha256 = "GFIFxlKCU6XURqZxkCkgZB0a5PW/OuC9KePpmxLAIE4=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -301,6 +301,9 @@ let
|
|||
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip"
|
||||
"de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913";
|
||||
|
||||
azure-mgmt-servicelinker = overrideAzureMgmtPackage super.azure-mgmt-servicelinker "1.0.0b1" "zip"
|
||||
"sha256-T3DTvNmLpTm/74cOPEl+vcXv7TIAwmJ6YXGLqpqyGmE=";
|
||||
|
||||
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip"
|
||||
"41ebdc69c0d1f81d25dd30438c14fff4331f66639f55805b918b9649eaffe78a";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, cmake
|
||||
, extra-cmake-modules
|
||||
, cairo
|
||||
, cldr-emoji-annotation
|
||||
, cldr-annotations
|
||||
, pango
|
||||
, fribidi
|
||||
, fmt
|
||||
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
|||
gdk-pixbuf
|
||||
wayland
|
||||
wayland-protocols
|
||||
cldr-emoji-annotation
|
||||
cldr-annotations
|
||||
json_c
|
||||
libGL
|
||||
libevent
|
||||
|
|
@ -90,6 +90,8 @@ stdenv.mkDerivation rec {
|
|||
libxkbfile
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DCLDR_DIR=${cldr-annotations}/share/unicode/cldr" ];
|
||||
|
||||
passthru.updateScript = ./update.py;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
, python3
|
||||
, json-glib
|
||||
, libnotify ? null
|
||||
, enablePython2Library ? false
|
||||
, enableUI ? true
|
||||
, withWayland ? false
|
||||
, libxkbcommon ? null
|
||||
|
|
@ -100,8 +99,6 @@ stdenv.mkDerivation rec {
|
|||
(enableFeature (dconf != null) "dconf")
|
||||
(enableFeature (libnotify != null) "libnotify")
|
||||
(enableFeature withWayland "wayland")
|
||||
(enableFeature enablePython2Library "python-library")
|
||||
(enableFeature enablePython2Library "python2") # XXX: python2 library does not work anyway
|
||||
(enableFeature enableUI "ui")
|
||||
"--enable-gtk4"
|
||||
"--enable-install-tests"
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpufetch";
|
||||
version = "1.01";
|
||||
version = "1.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dr-Noob";
|
||||
repo = "cpufetch";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vae/59eEDuZUDsTHE93mi+L8WBr3H4zp+mzXg7WWusA=";
|
||||
sha256 = "sha256-bhw7+z4/50MrC5WyexHhtzmqnovwiA9X6Q2TcznDYZM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Simplistic yet fancy CPU architecture fetching tool";
|
||||
license = licenses.mit;
|
||||
license = licenses.gpl2Only;
|
||||
homepage = "https://github.com/Dr-Noob/cpufetch";
|
||||
changelog = "https://github.com/Dr-Noob/cpufetch/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ devhell ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "1.8.1";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P4F/5n08vony4ed9o62NCK0UXjpRo+jjadQK1ke0Tl0=";
|
||||
sha256 = "sha256-EqUaJHlZupk8CP0ob8pL5tAW/bzG38eZmA4hgTg1jYY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UAApPni4zIAQVOmPAah5vEE8kTrGaJ3irjtsukBNVHo=";
|
||||
|
|
|
|||
|
|
@ -175,6 +175,7 @@ mapAliases ({
|
|||
claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05
|
||||
claws-mail-gtk3 = claws-mail; # Added 2021-07-10
|
||||
clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22
|
||||
cldr-emoji-annotation = throw "'cldr-emoji-annotation' has been removed, as it was unmaintained; use 'cldr-annotations' instead"; # Added 2022-04-03
|
||||
clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15
|
||||
clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22
|
||||
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05
|
||||
|
|
|
|||
|
|
@ -4536,10 +4536,10 @@ with pkgs;
|
|||
|
||||
cksfv = callPackage ../tools/networking/cksfv { };
|
||||
|
||||
clementine = libsForQt514.callPackage ../applications/audio/clementine {
|
||||
clementine = libsForQt5.callPackage ../applications/audio/clementine {
|
||||
gst_plugins =
|
||||
with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ];
|
||||
protobuf = protobuf3_14;
|
||||
protobuf = protobuf3_19;
|
||||
};
|
||||
|
||||
clementineUnfree = clementine.unfree;
|
||||
|
|
@ -23979,8 +23979,6 @@ with pkgs;
|
|||
|
||||
cldr-annotations = callPackage ../data/misc/cldr-annotations { };
|
||||
|
||||
cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { };
|
||||
|
||||
clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
|
||||
|
||||
cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {};
|
||||
|
|
@ -27884,9 +27882,8 @@ with pkgs;
|
|||
|
||||
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
|
||||
|
||||
mepo = callPackage ../applications/misc/mepo {
|
||||
zig = zig_0_8_1;
|
||||
};
|
||||
mepo = callPackage ../applications/misc/mepo { };
|
||||
mepo-x11 = callPackage ../applications/misc/mepo { withX11 = true; };
|
||||
|
||||
meshcentral = callPackage ../tools/admin/meshcentral { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue