diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 60794cef3627..e3d7866cabb5 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -667,6 +667,27 @@ in # uid. Users and groups with the same name should have equal # uids and gids. Also, don't use gids above 399! + # For exceptional cases where you really need a gid above 399, leave a + # comment stating why. + # + # Also, avoid the following GID ranges: + # + # 1000 - 29999: user accounts (see ../config/update-users-groups.pl) + # 30000 - 31000: nixbld users (the upper limit is arbitrarily chosen) + # 61184 - 65519: systemd DynamicUser (see systemd.exec(5)) + # 65535: the error return sentinel value when uid_t was 16 bits + # + # 100000 - 6653600: subgid allocated for user namespaces + # (see ../config/update-users-groups.pl) + # 4294967294: unauthenticated user in some NFS implementations + # 4294967295: error return sentinel value + # + # References: + # https://www.debian.org/doc/debian-policy/ch-opersys.html#uid-and-gid-classes + + onepassword = 31001; # 1Password requires that its GID be larger than 1000 + onepassword-cli = 31002; # 1Password requires that its GID be larger than 1000 + users = 100; nixbld = 30000; nogroup = 65534; diff --git a/nixos/modules/programs/_1password-gui.nix b/nixos/modules/programs/_1password-gui.nix index 42f6a0b52252..657116c267d9 100644 --- a/nixos/modules/programs/_1password-gui.nix +++ b/nixos/modules/programs/_1password-gui.nix @@ -8,19 +8,16 @@ let in { + imports = [ + (mkRemovedOptionModule [ "programs" "_1password-gui" "gid" ] '' + A preallocated GID will be used instead. + '') + ]; + options = { programs._1password-gui = { enable = mkEnableOption "the 1Password GUI application"; - gid = mkOption { - type = types.addCheck types.int (x: x >= 1000); - example = literalExpression "5000"; - description = '' - The gid to assign to the onepassword group, which is needed for browser integration. - It must be 1000 or greater. - ''; - }; - polkitPolicyOwners = mkOption { type = types.listOf types.str; default = [ ]; @@ -44,7 +41,7 @@ in in mkIf cfg.enable { environment.systemPackages = [ package ]; - users.groups.onepassword.gid = cfg.gid; + users.groups.onepassword.gid = config.ids.gids.onepassword; security.wrappers = { "1Password-BrowserSupport" = { diff --git a/nixos/modules/programs/_1password.nix b/nixos/modules/programs/_1password.nix index 547c12867a91..b87e9b776e85 100644 --- a/nixos/modules/programs/_1password.nix +++ b/nixos/modules/programs/_1password.nix @@ -8,19 +8,16 @@ let in { + imports = [ + (mkRemovedOptionModule [ "programs" "_1password" "gid" ] '' + A preallocated GID will be used instead. + '') + ]; + options = { programs._1password = { enable = mkEnableOption "the 1Password CLI tool"; - gid = mkOption { - type = types.addCheck types.int (x: x >= 1000); - example = literalExpression "5001"; - description = '' - The gid to assign to the onepassword-cli group, which is needed for integration with the 1Password GUI. - It must be 1000 or greater. - ''; - }; - package = mkPackageOption pkgs "1Password CLI" { default = [ "_1password" ]; }; @@ -29,7 +26,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.groups.onepassword-cli.gid = cfg.gid; + users.groups.onepassword-cli.gid = config.ids.gids.onepassword-cli; security.wrappers = { "op" = { diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index cf5110001503..38766113f391 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -71,10 +71,6 @@ in package = mkOption { type = types.package; default = crioPackage; - defaultText = literalDocBook '' - pkgs.cri-o built with - config.${opt.extraPackages}. - ''; internal = true; description = '' The final CRI-O package (including extra packages). diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index d950cecff6f0..53ad2ac708b8 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -34,7 +34,8 @@ in package = mkOption { type = types.nullOr types.package; default = config.boot.kernelPackages.prl-tools; - defaultText = literalExpression "config.boot.kernelPackages.prl-tools"; + defaultText = "config.boot.kernelPackages.prl-tools"; + example = literalExpression "config.boot.kernelPackages.prl-tools"; description = '' Defines which package to use for prl-tools. Override to change the version. ''; @@ -44,27 +45,6 @@ in }; config = mkIf config.hardware.parallels.enable { - services.xserver = { - drivers = singleton - { name = "prlvideo"; modules = [ prl-tools ]; }; - - screenSection = '' - Option "NoMTRR" - ''; - - config = '' - Section "InputClass" - Identifier "prlmouse" - MatchIsPointer "on" - MatchTag "prlmouse" - Driver "prlmouse" - EndSection - ''; - }; - - hardware.opengl.package = prl-tools; - hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.prl-tools.override { libsOnly = true; kernel = null; }; - hardware.opengl.setLdLibraryPath = true; services.udev.packages = [ prl-tools ]; @@ -72,37 +52,44 @@ in boot.extraModulePackages = [ prl-tools ]; - boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" ]; + boot.kernelModules = [ "prl_fs" "prl_fs_freeze" "prl_tg" ] + ++ optional (pkgs.stdenv.hostPlatform.system == "aarch64-linux") "prl_notifier"; services.timesyncd.enable = false; systemd.services.prltoolsd = { - description = "Parallels Tools' service"; + description = "Parallels Tools Service"; wantedBy = [ "multi-user.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prltoolsd -f"; PIDFile = "/var/run/prltoolsd.pid"; + WorkingDirectory = "${prl-tools}/bin"; }; }; systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares { - description = "Parallels Shared Folders Daemon"; + description = "Parallels Guest File System Sharing Tool"; wantedBy = [ "multi-user.target" ]; + path = [ prl-tools ]; serviceConfig = rec { ExecStart = "${prl-tools}/sbin/prlfsmountd ${PIDFile}"; ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /media"; ExecStopPost = "${prl-tools}/sbin/prlfsmountd -u"; PIDFile = "/run/prlfsmountd.pid"; + WorkingDirectory = "${prl-tools}/bin"; }; }; systemd.services.prlshprint = { - description = "Parallels Shared Printer Tool"; + description = "Parallels Printing Tool"; wantedBy = [ "multi-user.target" ]; bindsTo = [ "cups.service" ]; + path = [ prl-tools ]; serviceConfig = { Type = "forking"; ExecStart = "${prl-tools}/bin/prlshprint"; + WorkingDirectory = "${prl-tools}/bin"; }; }; @@ -110,43 +97,47 @@ in prlcc = { description = "Parallels Control Center"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prlcc"; + WorkingDirectory = "${prl-tools}/bin"; }; }; prldnd = { - description = "Parallels Control Center"; + description = "Parallels Drag And Drop Tool"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prldnd"; - }; - }; - prl_wmouse_d = { - description = "Parallels Walking Mouse Daemon"; - wantedBy = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = "${prl-tools}/bin/prl_wmouse_d"; + WorkingDirectory = "${prl-tools}/bin"; }; }; prlcp = { - description = "Parallels CopyPaste Tool"; + description = "Parallels Copy Paste Tool"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prlcp"; + Restart = "always"; + WorkingDirectory = "${prl-tools}/bin"; }; }; prlsga = { description = "Parallels Shared Guest Applications Tool"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prlsga"; + WorkingDirectory = "${prl-tools}/bin"; }; }; prlshprof = { description = "Parallels Shared Profile Tool"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prlshprof"; + WorkingDirectory = "${prl-tools}/bin"; }; }; }; diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index bb92af2dd5c5..eb702d086312 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -1,8 +1,6 @@ { lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: -let - py = python3Packages; -in py.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "friture"; version = "0.49"; @@ -13,10 +11,10 @@ in py.buildPythonApplication rec { sha256 = "sha256-xKgyBV/Qc+9PgXyxcT0xG1GXLC6KnjavJ/0SUE+9VSY="; }; - nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ + nativeBuildInputs = (with python3Packages; [ numpy cython scipy ]) ++ [ wrapQtAppsHook ]; - propagatedBuildInputs = with py; [ + propagatedBuildInputs = with python3Packages; [ sounddevice pyopengl pyopengl-accelerate diff --git a/pkgs/applications/audio/jack-autoconnect/default.nix b/pkgs/applications/audio/jack-autoconnect/default.nix new file mode 100644 index 000000000000..302571c2be4d --- /dev/null +++ b/pkgs/applications/audio/jack-autoconnect/default.nix @@ -0,0 +1,31 @@ +{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake, qtbase, libjack2 }: +mkDerivation rec { + pname = "jack_autoconnect"; + + # It does not have any versions (yet?) + version = "unstable-2021-02-01"; + + src = fetchFromGitHub { + owner = "kripton"; + repo = pname; + rev = "fe0c8f69149e30979e067646f80b9d326341c02b"; + sha256 = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw="; + }; + + buildInputs = [ qtbase libjack2 ]; + nativeBuildInputs = [ pkg-config qmake ]; + + installPhase = '' + mkdir -p -- "$out/bin" + cp -- jack_autoconnect "$out/bin" + ''; + + meta = with lib; { + homepage = "https://github.com/kripton/jack_autoconnect"; + description = + "Tiny application that reacts on port registrations by clients and connects them"; + maintainers = with maintainers; [ unclechu ]; + license = licenses.gpl2Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index ee85b71cf8a4..46311c3ed45b 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "13388-4a86638ce"; - rpcs3Version = "0.0.21-13388-4a86638ce"; - rpcs3Revision = "4a86638ce898e3bd68ade8e7ba794253782ea411"; - rpcs3Sha256 = "0bc1n0jy4a869mn1g5i008vb5m2a6qfhyf7lw0d0jiljgsppiys1"; + rpcs3GitVersion = "13907-cdef752a9"; + rpcs3Version = "0.0.23-13907-cdef752a9"; + rpcs3Revision = "cdef752a9c2004010279cd4a6d77b451b42cc6ab"; + rpcs3Sha256 = "1mw6k097rsiljaw34harhvr32dvrh4xv22ryinylijnsjlm3hcan"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 5fc9a5388a42..3bc35e6b1065 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.100"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.181"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "26a881176eb6513a98889648e0d5b7fe647cd0e3"; - sha256 = "09wjygkdr9sr0hwv77czi0x5xw8y585k9pghdm5s3iqjn9gbb45k"; + rev = "6eb85e846f25ae36a39685d6ac91025deaea306c"; + sha256 = "0lc8hhcrad26sw2dx0lwml8lk2mxg4db4sgfxnd450xi2qd63kdc"; }; projectFile = "Ryujinx.sln"; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index dc831080d7fd..67e7b0dc7244 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -1,22 +1,60 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AtkSharp"; version = "3.22.25.128"; sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94"; }) + (fetchNuGet { pname = "Avalonia"; version = "0.10.15"; sha256 = "02rf96gxpafbk0ilg3nxf0fas9gkpb25kzqc2lnbxp8h366qg431"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.15"; sha256 = "064l23dazs5aj8qj40py8vg362z3vpn2nxwh3m5h73qf85npyhgm"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.15"; sha256 = "0wgc46vg227bv7nsybc9mxkqv9xlz2bj08bdipkigjlf23g0x4p6"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.15"; sha256 = "0k3fq7nrfsx0l07mhnjnm0y2i0mydsnhjpa76jxsbh1kvi4mz56i"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.15"; sha256 = "1bq2ha1mmgsb9gxmsibr3i6alcg6y3kizxi07qh4wgw38c3fkwzs"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.15"; sha256 = "1qvay0wlpih6864hl6w85mskirs19k0xg513lxq2rhddqcnkh788"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.15"; sha256 = "0p0ih6ql5kyvpfhc6ll2mgy23kx0vwn88qji74713id493w2ab02"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.15"; sha256 = "1va9zwznfr161w2xjjg4swm5505685mdkxxs747l2s35mahl5072"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.14"; sha256 = "1cvyg94avqdscniszshx5r3vfvx0cnna262sp89ad4bianmd4qkj"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.15"; sha256 = "0xlnanssz24rcnybz1x0d3lclzmbzdjb9k0i37rd76dif3rgng0h"; }) + (fetchNuGet { pname = "Avalonia.Svg"; version = "0.10.14"; sha256 = "102567bgj41sxhl3igzpd7gb6kizc6nyqlar23d7xvisyr0z037j"; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.14"; sha256 = "1d8gkaw057xakaa50a100m8lf1njwv0mzrqzwidlfvjsiay2c28j"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.15"; sha256 = "1lxaj8la8bwc7j4d3cc3q5jklycc647lzpm8610ya241y64gryww"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.15"; sha256 = "120d19i8ad3b2m1516v5r1bj4h7fddmad6szrbkbpd711x3sh6ka"; }) (fetchNuGet { pname = "CairoSharp"; version = "3.22.25.128"; sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9"; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { pname = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) - (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.4.1"; sha256 = "01j989g68arm2d8abq44hp0f22pp6azf2xi7wi7hv7m4sl0l9cwp"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.4"; sha256 = "0mfmlsdd48dpwiphqhq8gsix2528mc6anp7rakd6vyzmig60f520"; }) + (fetchNuGet { pname = "Fizzler"; version = "1.2.0"; sha256 = "1b8kvqli5wql53ab9fwyg78h572z4f286s8rjb9xxmsyav1hsyll"; }) + (fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.1"; sha256 = "1jddr3iqb6402gv4v9wr8zaqbd2lh7988znlk3l3bmkfdviiflsx"; }) (fetchNuGet { pname = "GdkSharp"; version = "3.22.25.128"; sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7"; }) (fetchNuGet { pname = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; }) (fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2"; sha256 = "12kxgnmv9ygmqzf92zcnw4dqz6l4m1wsaz5v9i7i88jja81k6l3a"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2"; sha256 = "0jkdqwjyhpxlkswd6pq45w4aix3ivl8937p68c1jl2y0m5p6259w"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2"; sha256 = "1g3i7rzns6xsiybsls3sifgnfr6ml148c2r8vs0hz4zlisyfr8pd"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) + (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.2.0"; sha256 = "1abck2gad29mgf9gwqgc6wr8iwl64v50n0sbxcj1bcxgkgndraiq"; }) (fetchNuGet { pname = "LibHac"; version = "0.16.1"; sha256 = "131qnqa1asdmymwdvpjza6w646b05jzn1cxjdxgwh7qdcdb77xyx"; }) + (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.10.4"; sha256 = "1bdgy6g15d1mln1xpvs6sy0l2zvfs4hxw6nc3qm16qb8hdgvb73y"; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.10.4"; sha256 = "0ccbzp0d01dcahm7ban7xyh1rk7k2pkml3l5i7s85cqk5lnczpw2"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0i00xs472gpxbrwx593z520sp8nv3lmqi8z3zrj9cshqckq8knnx"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.2.0"; sha256 = "0ld6xxgaqc3c6zgyimlvpgrxncsykbz8irqs01jyj40rv150kp8s"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.2.0"; sha256 = "0i1c7055j3f5k1765bl66amp72dcw0zapczfszdldbg91iqmmkxg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) (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.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.15.0"; sha256 = "0dwx7dk8jr10784nriqbi364qbxzfwq0c6xia0ac5rzrp7179r4d"; }) @@ -31,6 +69,7 @@ (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"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m"; }) @@ -39,19 +78,21 @@ (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) (fetchNuGet { pname = "NUnit"; version = "3.12.0"; sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; }) (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) - (fetchNuGet { pname = "OpenTK.Core"; version = "4.5.0"; sha256 = "06qxczikp0aah20d4skk3g588dgh2vn2xffn0ajyyv0475m61s9m"; }) - (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.5.0"; sha256 = "180g5c92fhhhpmwl6paihx4h1bil7akaihlz2qy124n28pf4s988"; }) - (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.5.0"; sha256 = "1h9dxhq1llxdbgdzsi87ijqgj2ilr3rv0zkxhaa65xrc5x8j8fva"; }) - (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.5.0"; sha256 = "0lqxpc3vnxglql42x2frvq5bpkl5cf3dpnf9nx6pr3q6qnhigkfb"; }) + (fetchNuGet { pname = "OpenTK.Core"; version = "4.7.2"; sha256 = "023jav5xdn532kdlkq8pqrvcjl98g1p9ggc8r85fk9bry5121pra"; }) + (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.2"; sha256 = "1wnf9x45ga336vq4px2a2fmma4zc9xrcr4qwrsmsh3l4w0d9s6ps"; }) + (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.2"; sha256 = "0ay1a8spmy8pn5nlvvac796smp74hjpxm3swvxdrbqqg4l4xqlfz"; }) + (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.2"; sha256 = "1m0wgf4khikyz2pvns5d9ffwm7psxjn9r4h128aqlca1iyay23f6"; }) (fetchNuGet { pname = "PangoSharp"; version = "3.22.25.128"; sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) @@ -101,26 +142,46 @@ (fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) + (fetchNuGet { pname = "runtime.win7-x64.runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1dmbmksnxg12fk2p0k7rzy16448mddr2sfrnqs0rhhrzl0z22zi5"; }) + (fetchNuGet { pname = "runtime.win7.System.Private.Uri"; version = "4.3.0"; sha256 = "0bxkcmklp556dc43bra8ngc8wymcbbflcydi0xwq0j22gm66xf2m"; }) (fetchNuGet { pname = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; }) - (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build7"; sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; }) - (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build9"; sha256 = "121zmh0byi22qsc9b25wv58kwcq6pmk7zf4f2rfafmdjvwx8bkxc"; }) - (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.0.17-build18"; sha256 = "0j0vs6075c4fniydqxhpp18pg3x679mq463x4gxqgkri3vhpj4vl"; }) + (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "5.0.1-build10"; sha256 = "05r3fh92raaydf4vcih77ivymbs97kqwjlgqdpaxa11aqq0hq753"; }) + (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.0.22-build20"; sha256 = "03d1rv0rlr2z7ynqixgj9xqlksplk1vsvq5wxjf5c6c6zcknx01r"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.14"; sha256 = "0ym0ayik0vq2za9h0kr8mhjd9zk4hx25hrrfyyg9wrc164xa11qb"; }) (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0"; sha256 = "0wqfgzyp2m4myqrni9rgchiqi95axbf279hlqjflrj4c9z2412ni"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.0"; sha256 = "0ygkwlk2d59sqjvvw0s92hh92wxnm68rdlbp7wfs2gz5nipkgdvi"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.0-preview.178"; sha256 = "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0"; sha256 = "0d0pdcm61jfy3fvgkxmm3hj9cijrwbmp6ky2af776m1l63ryii3q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.0-preview.178"; sha256 = "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; sha256 = "135ni4rba4wy4wyzy9ip11f3dwb1ipn38z9ps1p9xhw8jc06y5vp"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) (fetchNuGet { pname = "SPB"; version = "0.0.4-build17"; sha256 = "0arp7mwdn1w67qx8a0m90xh8waj15154ynswrbsp5w4wmzkcss1i"; }) + (fetchNuGet { pname = "Svg.Custom"; version = "0.5.14"; sha256 = "1wjghs2n5hk7zszzk2p2a8m6ga2gc8sfd5mdqi15sbfkmwg2nbw7"; }) + (fetchNuGet { pname = "Svg.Model"; version = "0.5.14"; sha256 = "1xilk95bmnsl93sbr7pah0jrjrnccf1ikcn8s7rkm0yjkj382hc8"; }) + (fetchNuGet { pname = "Svg.Skia"; version = "0.5.14"; sha256 = "02wv040wi8ijw9mwg3c84f8bfyfv9n99ji8q1v2bs11b463zsyd1"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) @@ -131,9 +192,10 @@ (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) @@ -151,25 +213,34 @@ (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Management"; version = "6.0.0"; sha256 = "0ra1g75ykapg6i5y0za721kpjd6xcq6dalijkdm6fsxxmz8iz4dr"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.3.0"; sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) @@ -178,7 +249,11 @@ (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) @@ -202,8 +277,11 @@ (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) @@ -215,13 +293,17 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) ] diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh index f98189eaf812..c403af37856a 100755 --- a/pkgs/applications/emulators/ryujinx/updater.sh +++ b/pkgs/applications/emulators/ryujinx/updater.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6 +#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6 set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -61,14 +61,14 @@ OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" echo "comparing versions $OLD_VERSION -> $NEW_VERSION" if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then echo "Already up to date!" - if [[ "$1" != "--deps-only" ]]; then + if [[ "${1-default}" != "--deps-only" ]]; then exit 0 fi fi cd ../../../.. -if [[ "$1" != "--deps-only" ]]; then +if [[ "${1-default}" != "--deps-only" ]]; then SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')" update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" fi diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 87e1f1b1db72..fbd318cb4a12 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -21,14 +21,14 @@ in rec { ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { - version = "2.47.2"; + version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - sha256 = "07d6nrk2g0614kvwdjym1wq21d2bwy3pscwikk80qhnd6rrww875"; + sha256 = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; }; gecko64 = fetchurl rec { - version = "2.47.2"; + version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - sha256 = "0iffhvdawc499nbn4k99k33cr7g8sdfcvq8k3z1g6gw24h87d5h5"; + sha256 = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; }; ## see http://wiki.winehq.org/Mono @@ -46,9 +46,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.12"; + version = "7.13"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-gJzsE3FmNubq/Uw9pzEkVqhE0xYCClV4YRvNuiEGnGg="; + sha256 = "sha256-a/6+kz2qUJVprnmwv2ofG08H4b+K/Balm+4TdIuSymQ="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -61,7 +61,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-A7IcBm3LzXzFu/NT+kbf2InTTuBzyQju/uMxSnIfsls="; + sha256 = "sha256-U1awbhJRT3aAJstyEjv2Dp20FqyQ4ntnFFRYJb12C/U="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 7506f57e73fa..3298625601d5 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.24.3"; + version = "1.25.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-aAP5hyo4t5IX4wLwyNDuXxAYbAkS36S1UewYs9ZFJM4="; + sha256 = "sha256-VAakbuAkH7kuAx16m2vo4exikI03inXBW3OEIs5WwSY="; }; vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA="; diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 148d308c4f10..031fa0c21b77 100644 --- a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { description = "Exec into node via kubectl"; homepage = "https://github.com/kvaps/kubectl-node-shell"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ jocelynthode ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 0afd173debdb..4f2b4ef440f7 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -23,6 +23,7 @@ , qtwebengine , qtx11extras , jellyfin-web +, withDbus ? stdenv.isLinux, dbus }: mkDerivation rec { @@ -74,6 +75,8 @@ mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DQTROOT=${qtbase}" "-GNinja" + ] ++ lib.optionals (!withDbus) [ + "-DLINUX_X11POWER=ON" ]; preBuild = '' diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 24c595081573..37abe5c154ee 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cwm"; - version = "6.7"; + version = "7.1"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = pname; rev = "v${version}"; - sha256 = "0f9xmki2hx10k8iisfzc7nm1l31zkf1r06pdgn06ar9w9nizrld9"; + sha256 = "sha256-lkjsxGMXOrnu4cUiV/TO7yzd9FzM297MhaFKauqmiHo="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index e09fd0e20f22..af314aa338c8 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -4,7 +4,7 @@ # Please keep in spec order for easier maintenance. # When adding a new value, don't forget to update the Version field below! # See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html -{ name # The name of the desktop file +lib.makeOverridable ({ name # The name of the desktop file , type ? "Application" # version is hardcoded , desktopName # The name of the application @@ -115,4 +115,4 @@ writeTextFile { destination = "/share/applications/${name}.desktop"; text = builtins.concatStringsSep "\n" content; checkPhase = ''${buildPackages.desktop-file-utils}/bin/desktop-file-validate "$target"''; -} +}) diff --git a/pkgs/development/interpreters/boron/default.nix b/pkgs/development/interpreters/boron/default.nix new file mode 100644 index 000000000000..249a39c58f3a --- /dev/null +++ b/pkgs/development/interpreters/boron/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, zlib +}: + +stdenv.mkDerivation rec { + pname = "boron"; + version = "2.0.8"; + + src = fetchurl { + url = "https://sourceforge.net/projects/urlan/files/Boron/boron-${version}.tar.gz"; + sha256 = "sha256-Ni/LJgOABC2wXDMsg1ZAuZWSQdFT9/Fa4lH4+V0gy8M="; + }; + + # this is not a standard Autotools-like `configure` script + dontAddPrefix = true; + + preConfigure = '' + patchShebangs configure + ''; + + configureFlags = [ "--thread" ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + buildInputs = [ + zlib + ]; + + installTargets = [ "install" "install-dev" ]; + + doCheck = true; + + checkPhase = '' + patchShebangs . + make -C test + ''; + + meta = with lib; { + homepage = "http://urlan.sourceforge.net/boron/"; + description = "Scripting language and C library useful for building DSLs"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mausch ]; + }; +} + diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 2c3c0bed680e..c0e3ab0aca40 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -11,6 +11,7 @@ , http-parser , libiconv , Security +, staticBuild ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { "-DTHREADSAFE=ON" "-DUSE_HTTP_PARSER=system" "-DUSE_SSH=ON" + "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" ]; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 96be84ee2a7e..08a348505006 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gtest, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, gtest, zlib }: stdenv.mkDerivation rec { pname = "lucene++"; @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost gtest zlib ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + patches = [ + (fetchpatch { + name = "pkgconfig_use_correct_LIBDIR_for_destination_library"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; + sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; + }) + ]; + postPatch = '' substituteInPlace src/test/CMakeLists.txt \ --replace "add_subdirectory(gtest)" "" diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 3f50c0665fa8..19f755ca0533 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.29.3"; + version = "7.3.1"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O0nIPRKj0ZOEjynh7h9kM6V965hQKs+4GgIbN+Os0I4="; + sha256 = "sha256-5fh8hH6f0Mv9XQAoHYIiY019qkC5PuLS2qlE+ladWWM="; }; nativeBuildInputs = [ cmake ninja ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional enableJemalloc jemalloc; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move" - + lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field"; + + lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field -faligned-allocation"; cmakeFlags = [ "-DPORTABLE=1" diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index e3545ee0e6dd..17e5389a5bbc 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -5,7 +5,6 @@ , dill , fastavro , fetchFromGitHub -, fetchpatch , freezegun , grpcio , grpcio-tools @@ -38,35 +37,25 @@ , sqlalchemy , tenacity , typing-extensions +, scikit-learn }: buildPythonPackage rec { pname = "apache-beam"; - version = "2.37.0"; - disabled = pythonAtLeast "3.10"; + version = "2.40.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "v${version}"; - sha256 = "sha256-FmfTxRLqXUHhhAZIxCRx2+phX0bmU5rIHaftBU4yBJY="; + sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0="; }; - patches = [ - # patch in the pyarrow.Table.to_batches(max_chunksize=...) argument fix - (fetchpatch { - url = "https://github.com/apache/beam/commit/2418a14ee99ff490d1c82944043f97f37ec97a85.patch"; - sha256 = "sha256-G8ARBBf7nmF46P2ncnlteGFnPWq5iCqZDfuaosre9jY="; - stripLen = 2; - }) - ]; - # See https://github.com/NixOS/nixpkgs/issues/156957. postPatch = '' substituteInPlace setup.py \ --replace "dill>=0.3.1.1,<0.3.2" "dill" \ - --replace "httplib2>=0.8,<0.20.0" "httplib2" \ - --replace "pyarrow>=0.15.1,<7.0.0" "pyarrow" + --replace "pyarrow>=0.15.1,<8.0.0" "pyarrow" ''; sourceRoot = "source/sdks/python"; @@ -115,6 +104,7 @@ buildPythonPackage rec { pytestCheckHook pyyaml requests-mock + scikit-learn sqlalchemy tenacity ]; @@ -150,6 +140,21 @@ buildPythonPackage rec { # different runners - I don't expect them to help debugging these # when running via our (= custom from their PoV) testing infra. "test_with_main_session" + # AssertionErrors + "test_unified_repr" + "testDictComprehension" + "testDictComprehensionSimple" + "testGenerator" + "testGeneratorComprehension" + "testListComprehension" + "testNoneReturn" + "testSet" + "testTupleListComprehension" + "test_newtype" + "test_pardo_type_inference" + "test_get_output_batch_type" + "test_pformat_namedtuple_with_unnamed_fields" + "test_row_coder_fail_early_bad_schema" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/bsuite/default.nix b/pkgs/development/python-modules/bsuite/default.nix new file mode 100644 index 000000000000..c577e6142f44 --- /dev/null +++ b/pkgs/development/python-modules/bsuite/default.nix @@ -0,0 +1,101 @@ +{ lib +, fetchPypi +, buildPythonPackage +, frozendict +, termcolor +, matplotlib +, gym +, pandas +, scipy +, absl-py +, dm-env +, plotnine +, scikitimage +, dm-tree +, patsy +, tensorflow-probability +, dm-haiku +, statsmodels +, mizani +, trfl +, optax +, pytestCheckHook +, dm-sonnet }: + +buildPythonPackage rec { + pname = "bsuite"; + version = "0.3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ak9McvXl7Nz5toUaPaRaJek9lurxiQiIW209GnZEjX0="; + }; + + buildInputs = [ + absl-py + dm-env + dm-tree + frozendict + gym + matplotlib + mizani + pandas + patsy + plotnine + scikitimage + scipy + statsmodels + termcolor + ]; + + checkInputs = [ + dm-haiku + dm-sonnet + optax + pytestCheckHook + tensorflow-probability + trfl + ]; + + pythonImportsCheck = [ + "bsuite" + ]; + + disabledTestPaths = [ + # Disabled because tests require module rlax but this results in infinite + # recursion error + "bsuite/baselines/jax/actor_critic/run_test.py" + "bsuite/baselines/jax/actor_critic_rnn/run_test.py" + "bsuite/baselines/jax/boot_dqn/run_test.py" + "bsuite/baselines/jax/dqn/run_test.py" + ]; + + disabledTests = [ + # Tests require network connection + "test_run9" + "test_longer_action_sequence" + "test_reset" + "test_step_after_reset" + "test_step_on_fresh_environment" + "test_longer_action_sequence" + "test_reset" + "test_step_after_reset" + "test_step_on_fresh_environment" + "test_longer_action_sequence" + "test_reset" + "test_step_after_reset" + "test_step_on_fresh_environment" + "test_logger" + "test_episode_truncation" + ]; + + meta = with lib; { + description = '' + Core RL Behaviour Suite. A collection of reinforcement learning + experiments + ''; + homepage = "https://github.com/deepmind/bsuite"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix new file mode 100644 index 000000000000..a1be0b95826d --- /dev/null +++ b/pkgs/development/python-modules/celery-redbeat/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, python-dateutil +, celery +, redis +, tenacity +, pytestCheckHook +, fakeredis +, mock +}: + +buildPythonPackage rec { + pname = "celery-redbeat"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sibson"; + repo = "redbeat"; + rev = "v${version}"; + hash = "sha256-pu4umhfNFZ30bQu5PcT2LYN4WGzFj4p4/qHm3pVIV+c="; + }; + + propagatedBuildInputs = [ + python-dateutil + celery + redis + tenacity + ]; + + checkInputs = [ + pytestCheckHook + fakeredis + mock + ]; + + pythonImportsCheck = [ "redbeat" ]; + + meta = with lib; { + description = "Database-backed Periodic Tasks"; + homepage = "https://github.com/celery/django-celery-beat"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix new file mode 100644 index 000000000000..be277f97ba5e --- /dev/null +++ b/pkgs/development/python-modules/distrax/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, tensorflow-probability +, chex +, dm-haiku +, pytestCheckHook +, jaxlib }: + +buildPythonPackage rec { + pname = "distrax"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-b/+rxjdowNMuhUBhRCuN45z/iUbj1hN1qCSQqqAtZIw="; + }; + + buildInputs = [ + chex + jaxlib + numpy + tensorflow-probability + ]; + + checkInputs = [ + dm-haiku + pytestCheckHook + ]; + + pythonImportsCheck = [ + "distrax" + ]; + + disabledTestPaths = [ + # TypeErrors + "distrax/_src/bijectors/tfp_compatible_bijector_test.py" + "distrax/_src/distributions/distribution_from_tfp_test.py" + "distrax/_src/distributions/laplace_test.py" + "distrax/_src/distributions/multinomial_test.py" + "distrax/_src/distributions/mvn_diag_plus_low_rank_test.py" + "distrax/_src/distributions/mvn_kl_test.py" + "distrax/_src/distributions/straight_through_test.py" + "distrax/_src/distributions/tfp_compatible_distribution_test.py" + "distrax/_src/distributions/transformed_test.py" + "distrax/_src/distributions/uniform_test.py" + "distrax/_src/utils/transformations_test.py" + ]; + + meta = with lib; { + description = "Probability distributions in JAX"; + homepage = "https://github.com/deepmind/distrax"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix new file mode 100644 index 000000000000..be1b627525f6 --- /dev/null +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -0,0 +1,51 @@ +{ lib +, fetchPypi +, buildPythonPackage +, python-crontab +, celery +, django-timezone-field +, tzdata +, ephem +, pytest-timeout +, pytest-django +, case +, pytestCheckHook }: + +buildPythonPackage rec { + pname = "django-celery-beat"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-uiT4btlWug7itDI3pJMD6/Wqfg+wzLfgVCt+MaRj3Lo="; + }; + + propagatedBuildInputs = [ + python-crontab + celery + django-timezone-field + tzdata + ]; + + checkInputs = [ + ephem + pytest-timeout + pytest-django + case + pytestCheckHook + ]; + + disabledTestPaths = [ + # Connection error + "t/unit/test_schedulers.py" + ]; + + pythonImportsCheck = [ "django_celery_beat" ]; + + meta = with lib; { + description = "Celery Periodic Tasks backed by the Django ORM"; + homepage = "https://github.com/celery/django-celery-beat"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-celery-email/default.nix b/pkgs/development/python-modules/django-celery-email/default.nix new file mode 100644 index 000000000000..950fb4f75e93 --- /dev/null +++ b/pkgs/development/python-modules/django-celery-email/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, django-appconf +, celery +, pytest-django +, pytestCheckHook +, python }: + +buildPythonPackage rec { + pname = "django-celery-email"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "pmclanahan"; + repo = pname; + rev = version; + sha256 = "sha256-LBavz5Nh2ObmIwLCem8nHvsuKgPwkzbS/OzFPmSje/M="; + }; + + propagatedBuildInputs = [ + django + django-appconf + celery + ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + checkPhase = '' + ${python.executable} runtests.py + ''; + + pythonImportsCheck = [ "djcelery_email" ]; + + meta = with lib; { + homepage = "https://github.com/pmclanahan/django-celery-email"; + description = "Django email backend that uses a celery task for sending the email"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix new file mode 100644 index 000000000000..6f38ae77e16a --- /dev/null +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, sphinx +, setuptools-scm +, django +, redis +, celery +, pytest-django +, pytestCheckHook +, mock +, gitMinimal }: + +buildPythonPackage rec { + pname = "django-health-check"; + version = "3.16.5"; + + src = fetchFromGitHub { + owner = "KristianOellegaard"; + repo = pname; + rev = version; + hash = "sha256-Jfzi+o4ja2sNCSPfX9eRq3WGid1gcfehhayAD1L4f2U="; + leaveDotGit = true; + }; + + buildInputs = [ + sphinx + django + ]; + + nativeBuildInputs = [ + setuptools-scm + gitMinimal + ]; + + checkInputs = [ + pytest-django + pytestCheckHook + mock + celery + redis + ]; + + postPatch = '' + # We don't want to generate coverage + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" \ + --replace "--cov=health_check" "" \ + --replace "--cov-report=term" "" \ + --replace "--cov-report=xml" "" + ''; + + pythonImportsCheck = [ "health_check" ]; + + meta = with lib; { + description = "Pluggable app that runs a full check on the deployment"; + homepage = "https://github.com/KristianOellegaard/django-health-check"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix index 5d43afc77949..f8f85adf0d3d 100644 --- a/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/pkgs/development/python-modules/django-timezone-field/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "django-timezone-field"; - version = "4.2.3"; - format = "setuptools"; + version = "5.0"; disabled = pythonOlder "3.5"; + format = "pyproject"; src = fetchFromGitHub { owner = "mfogel"; repo = pname; rev = version; - sha256 = "sha256-purzXzPvnYNVsASsK6s9m4XieUL80FOjeSbUP4bpRj8="; + sha256 = "sha256-GXkvF/kAOU1JK0GDpUT1irCQlkxIWieYRqPd0fr2HXw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dm-env/default.nix b/pkgs/development/python-modules/dm-env/default.nix new file mode 100644 index 000000000000..92c234c215c3 --- /dev/null +++ b/pkgs/development/python-modules/dm-env/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, buildPythonPackage +, dm-tree +, numpy +, absl-py +, nose }: + +buildPythonPackage rec { + pname = "dm-env"; + version = "1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Pv2ZsGUlY1mVB8QV1ItRiWyIvi8BwrYlCvi6tRVx41M="; + }; + + buildInputs = [ + absl-py + dm-tree + numpy + ]; + + checkInputs = [ + nose + ]; + + pythonImportsCheck = [ + "dm_env" + ]; + + meta = with lib; { + description = "Pure Python client for Apache Kafka"; + homepage = "https://github.com/dpkp/kafka-python"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 2c4c24b93670..87de983330c2 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -1,66 +1,49 @@ { buildPythonPackage -, chex -, cloudpickle -, dill -, dm-tree , fetchFromGitHub -, jaxlib -, jmp +, callPackage , lib -, pytest-xdist -, pytestCheckHook +, jmp , tabulate -, tensorflow +, jaxlib }: buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "v${version}"; - hash = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM="; + hash = "sha256-Qa3g3vOPZJt/wBjjuZHAcFUz/gwN/yvirV/8V9CnIko="; }; - propagatedBuildInputs = [ - jmp - tabulate + outputs = [ + "out" + "testsout" ]; - checkInputs = [ - chex - cloudpickle - dill - dm-tree + propagatedBuildInputs = [ jaxlib - pytest-xdist - pytestCheckHook - tensorflow + jmp + tabulate ]; pythonImportsCheck = [ "haiku" ]; - disabledTestPaths = [ - # These tests require `bsuite` which isn't packaged in `nixpkgs`. - "examples/impala_lite_test.py" - "examples/impala/actor_test.py" - "examples/impala/learner_test.py" - # This test breaks on multiple cases with TF-related errors, - # likely that's the reason the upstream uses TF-nightly for tests? - # `nixpkgs` doesn't have the corresponding TF version packaged. - "haiku/_src/integration/jax2tf_test.py" - # `TypeError: lax.conv_general_dilated requires arguments to have the same dtypes, got float32, float16`. - "haiku/_src/integration/numpy_inputs_test.py" - ]; + postInstall = '' + mkdir $testsout + cp -R examples $testsout/examples + ''; - disabledTests = [ - # See https://github.com/deepmind/dm-haiku/issues/366. - "test_jit_Recurrent" - ]; + # check in passthru.tests.pytest to escape infinite recursion with bsuite + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { description = "Haiku is a simple neural network library for JAX developed by some of the authors of Sonnet."; diff --git a/pkgs/development/python-modules/dm-haiku/tests.nix b/pkgs/development/python-modules/dm-haiku/tests.nix new file mode 100644 index 000000000000..93a4f3cd4795 --- /dev/null +++ b/pkgs/development/python-modules/dm-haiku/tests.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildPythonPackage +, dm-haiku +, chex +, cloudpickle +, dill +, dm-tree +, jaxlib +, pytest-xdist +, pytestCheckHook +, tensorflow +, bsuite +, frozendict +, dm-env +, scikitimage +, rlax +, distrax +, tensorflow-probability +, optax }: + +buildPythonPackage rec { + pname = "dm-haiku-tests"; + inherit (dm-haiku) version; + + src = dm-haiku.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + bsuite + chex + cloudpickle + dill + distrax + dm-env + dm-haiku + dm-tree + frozendict + jaxlib + pytest-xdist + pytestCheckHook + optax + rlax + scikitimage + tensorflow + tensorflow-probability + ]; + + disabledTests = [ + # See https://github.com/deepmind/dm-haiku/issues/366. + "test_jit_Recurrent" + # Assertion errors + "test_connect_conv_padding_function_same0" + "test_connect_conv_padding_function_valid0" + "test_connect_conv_padding_function_same1" + "test_connect_conv_padding_function_same2" + "test_connect_conv_padding_function_valid1" + "test_connect_conv_padding_function_valid2" + "test_invalid_axis_ListString" + "test_invalid_axis_String" + "test_simple_case" + "test_simple_case_with_scale" + "test_slice_axis" + "test_zero_inputs" + ]; + +} diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix new file mode 100644 index 000000000000..f857eac8503b --- /dev/null +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -0,0 +1,54 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, numpy +, tabulate +, six +, dm-tree +, absl-py +, wrapt +, docutils +, tensorflow +, tensorflow-datasets }: + +buildPythonPackage rec { + pname = "dm-sonnet"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "deepmind"; + repo = "sonnet"; + rev = "v${version}"; + sha256 = "sha256-YSMeH5ZTfP1OdLBepsxXAVczBG/ghSjCWjoz/I+TFl8="; + }; + + buildInputs = [ + absl-py + dm-tree + numpy + six + tabulate + wrapt + ]; + + propagatedBuildInputs = [ + tabulate + tensorflow + ]; + + checkInputs = [ + docutils + tensorflow-datasets + ]; + + pythonImportsCheck = [ + "sonnet" + ]; + + meta = with lib; { + description = "Library for building neural networks in TensorFlow"; + homepage = "https://github.com/deepmind/sonnet"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 68cf0fa7ef17..8ecae2963b55 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.3"; + version = "2.13.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4ocFDAimS1oFVJTpGWJYedJ35MJoJ7eheiWFiMX/JUk="; + hash = "sha256-ZhcBynfvHc0nveZP9z0y2IJf44vTzy8xB3XV5iJOLu0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index cd5e1e0f7620..6b3ac52767d7 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , jupyter-packaging , jupyter_server , pytest-tornasync @@ -30,6 +32,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_server_mathjax" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "MathJax resources as a Jupyter Server Extension"; homepage = "https://jupyter.org"; diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index fa72ab748d75..da00ff3702dd 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,11 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k , hypothesis , setuptools-scm , six , attrs , py , setuptools -, pytest-cov , pytest-timeout , pytest-tornado , mock @@ -33,26 +35,6 @@ buildPythonPackage rec { sha256 = "67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b"; }; - checkInputs = [ - hypothesis - pytest-cov - pytest-timeout - pytest-tornado - jsonschema - mock - tabulate - pytestCheckHook - ]; - - disabledTests = [ - "test_apply_filter_no_repo" - "test_diff_api_checkpoint" - "test_filter_cmd_invalid_filter" - "test_inline_merge" - "test_interrogate_filter_no_repo" - "test_merge" - ]; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ @@ -69,7 +51,32 @@ buildPythonPackage rec { GitPython notebook jinja2 - ]; + ]; + + checkInputs = [ + hypothesis + pytest-timeout + pytest-tornado + jsonschema + mock + tabulate + pytestCheckHook + ]; + + disabledTests = [ + "test_apply_filter_no_repo" + "test_diff_api_checkpoint" + "test_filter_cmd_invalid_filter" + "test_inline_merge_source_add" + "test_inline_merge_source_patches" + "test_inline_merge_source_replace" + "test_inline_merge_cells_insertion" + "test_inline_merge_cells_replacement" + "test_interrogate_filter_no_repo" + "test_merge_input_strategy_inline" + ]; + + __darwinAllowLocalNetworking = true; meta = with lib; { homepage = "https://github.com/jupyter/nbdime"; diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 98906606fa5e..edd5b0ec0ddd 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "0.99.0"; + version = "0.100.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-P3PDzCgInpOzQut/NIsoX1pl/+UFiYvhXbJQx1u4Ves="; + hash = "sha256-AT9WDdoxtW5sGiL0h9n4y/3xvClcDoh1N3TFVHjPB0c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix new file mode 100644 index 000000000000..58df795cb3a1 --- /dev/null +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -0,0 +1,72 @@ +{ lib +, fetchPypi +, buildPythonPackage +, matplotlib +, scipy +, patsy +, pandas +, statsmodels +, pytestCheckHook +, geopandas +, mizani }: + +buildPythonPackage rec { + pname = "plotnine"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DompMBXzxx1oRKx6qfsNoJuQj199+n3V1opcoysuvOo="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=plotnine --cov-report=xml" "" + ''; + + buildInputs = [ + matplotlib + mizani + pandas + patsy + scipy + statsmodels + ]; + + checkInputs = [ + geopandas + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "plotnine" + ]; + + disabledTestPaths = [ + # Assertion Errors + "tests/test_theme.py" + "tests/test_scale_internals.py" + "tests/test_scale_labelling.py" + "tests/test_position.py" + "tests/test_geom_text_label.py" + "tests/test_geom_smooth.py" + "tests/test_geom_segment.py" + "tests/test_geom_ribbon_area.py" + "tests/test_geom_map.py" + "tests/test_facets.py" + "tests/test_facet_labelling.py" + "tests/test_coords.py" + "tests/test_annotation_logticks.py" + ]; + + meta = with lib; { + description = "Grammar of graphics for python"; + homepage = "https://plotnine.readthedocs.io/en/stable"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix new file mode 100644 index 000000000000..45425e1d1187 --- /dev/null +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pyinstrument"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "joerick"; + repo = pname; + rev = "v${version}"; + hash = "sha256-4gM60UhzN+VnNMTHw6NSU7/LUPHaMgg105D+dO6SDfg="; + }; + + # Module import recursion + doCheck = false; + + pythonImportsCheck = [ + "pyinstrument" + ]; + + meta = with lib; { + description = "Call stack profiler for Python"; + homepage = "https://github.com/joerick/pyinstrument"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix new file mode 100644 index 000000000000..5dc0916991c9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-unordered/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-unordered"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "utapyngo"; + repo = pname; + rev = "972012a984b1e9fb3e98f9e8fe9e2ada16ad8110"; + hash = "sha256-mCcR6WZb2+V5n0PwgsjvnChWnANkIyQ0YtqwTKBYtaA="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pytest_unordered" ]; + + meta = with lib; { + description = "Test equality of unordered collections in pytest"; + homepage = "https://github.com/utapyngo/pytest-unordered"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index 2f08341a2c4f..4b33fbfec831 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "8.3.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4AEDh1Ap3IXLtZEx0AzMhTT2kpVqzeMrWjzFr0wkWAs="; + sha256 = "sha256-oiV6si2kRyRJ3cdSVRNBIm2iv8FrZ9mGnN6vRbqGv6o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 83449a9285d3..44c258675a7c 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonApplication rec { pname = "python-ironicclient"; - version = "4.11.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zGG/3Cq7mARyuGGvqa4KGWFmx/UN+W2KMuy+RNenzXM="; + sha256 = "sha256-mA8+4cvWhxPn7LGVcWvwxGRBnlM671YgFfE10zhVPtQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index 470e0734ddaa..198ef19465c4 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "4.5.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bX8FxpLn2yaSd4KEx3mubOqLIVmRS0QXpfoL/qHinNw="; + hash = "sha256-D1DaM78gtVrPxZ1PlGD6Lvwb4V/QXsPyNnTQPror6j8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix new file mode 100644 index 000000000000..adff2f0ac5d3 --- /dev/null +++ b/pkgs/development/python-modules/rlax/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchPypi +, buildPythonPackage +, chex +, jaxlib +, tensorflow-probability +, optax +, dm-haiku +, bsuite +, frozendict +, pytestCheckHook +, dm-env +, distrax }: + +buildPythonPackage rec { + pname = "rlax"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-hAG0idz5VkGVvxaJWoxlVZ8myeHF6ndDxB0SyJm7qV8="; + }; + + buildInputs = [ + chex + jaxlib + distrax + tensorflow-probability + ]; + + checkInputs = [ + bsuite + dm-env + dm-haiku + frozendict + optax + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rlax" + ]; + + disabledTests = [ + # RuntimeErrors + "test_cross_replica_scatter_add0" + "test_cross_replica_scatter_add1" + "test_cross_replica_scatter_add2" + "test_cross_replica_scatter_add3" + "test_cross_replica_scatter_add4" + "test_learn_scale_shift" + "test_normalize_unnormalize_is_identity" + "test_outputs_preserved" + "test_scale_bounded" + "test_slow_update" + "test_unnormalize_linear" + ]; + + meta = with lib; { + description = "Library of reinforcement learning building blocks in JAX"; + homepage = "https://github.com/deepmind/rlax"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/trfl/default.nix b/pkgs/development/python-modules/trfl/default.nix new file mode 100644 index 000000000000..0f986f7148e9 --- /dev/null +++ b/pkgs/development/python-modules/trfl/default.nix @@ -0,0 +1,75 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, numpy +, absl-py +, dm-tree +, wrapt +, tensorflow +, tensorflow-probability +, pytestCheckHook +, nose }: + +buildPythonPackage rec { + pname = "trfl"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "deepmind"; + repo = pname; + rev = "ed6eff5b79ed56923bcb102e152c01ea52451d4c"; + sha256 = "sha256-UsDUKJCHSJ4gP+P95Pm7RsPpqTJqJhrsW47C7fTZ77I="; + }; + + buildInputs = [ + absl-py + dm-tree + numpy + wrapt + ]; + + propagatedBuildInputs = [ + tensorflow + tensorflow-probability + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ + "trfl" + ]; + + # Tests currently fail with assertion errors + doCheck = false; + + disabledTestPaths = [ + # AssertionErrors + "trfl/indexing_ops_test.py" + "trfl/vtrace_ops_test.py" + "trfl/value_ops_test.py" + "trfl/target_update_ops_test.py" + "trfl/sequence_ops_test.py" + "trfl/retrace_ops_test.py" + "trfl/policy_ops_test.py" + "trfl/policy_gradient_ops_test.py" + "trfl/pixel_control_ops_test.py" + "trfl/periodic_ops_test.py" + "trfl/dpg_ops_test.py" + "trfl/distribution_ops_test.py" + "trfl/dist_value_ops_test.py" + "trfl/discrete_policy_gradient_ops_test.py" + "trfl/continuous_retrace_ops_test.py" + "trfl/clipping_ops_test.py" + "trfl/action_value_ops_test.py" + ]; + + meta = with lib; { + description = "TensorFlow Reinforcement Learning"; + homepage = "https://github.com/deepmind/trfl"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 441dc4988f52..0db37008ae71 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -20,7 +20,7 @@ , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic , webUISupport ? false -, extraGrammars ? {} +, extraGrammars ? { } }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -69,9 +69,11 @@ let { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } // { tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { language = "org"; }; } // { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } // - { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; }; + { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; } // + { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } // + { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }; in - lib.mapAttrs change (grammars); + lib.mapAttrs change (grammars); # Usage: # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 37f6794bc281..2f82e53ab6d0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -30,9 +30,9 @@ tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json; tree-sitter-glsl = lib.importJSON ./tree-sitter-glsl.json; tree-sitter-go = lib.importJSON ./tree-sitter-go.json; - tree-sitter-gowork = lib.importJSON ./tree-sitter-gowork.json; tree-sitter-godot-resource = lib.importJSON ./tree-sitter-godot-resource.json; tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json; + tree-sitter-gowork = lib.importJSON ./tree-sitter-gowork.json; tree-sitter-graphql = lib.importJSON ./tree-sitter-graphql.json; tree-sitter-haskell = lib.importJSON ./tree-sitter-haskell.json; tree-sitter-hcl = lib.importJSON ./tree-sitter-hcl.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json index 254e657260a3..6862eecdfda6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json @@ -1,9 +1,9 @@ { "url": "https://github.com/polarmutex/tree-sitter-beancount", - "rev": "78b8ddca3ab774573a4e3bf64eabd79e9452cea9", - "date": "2021-11-11T10:25:06-05:00", - "path": "/nix/store/lzvc19ky1wxbc1cjf2zr351hbdfq22mm-tree-sitter-beancount", - "sha256": "19s1fgn1vgxz5q6qvcfdr1lqj1vnkjrwlkl9chapbdaliw0dy110", + "rev": "b807e0c5255221f5e4baa08b3325d08e2ba56ba2", + "date": "2022-07-02T10:33:09-04:00", + "path": "/nix/store/9kqvj3rpqlqgxr5nkcc43pkcvs460h14-tree-sitter-beancount", + "sha256": "0vh2sz5qjsgkmqlcw0kyq01wj5mxwymhyg9w8hfyd7kd779lfa86", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 3b83f06df203..9fb8a320e0b6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "3ced8d6cd212a6f576cd4ef3d533bcb9c09eface", - "date": "2022-05-30T15:48:31+02:00", - "path": "/nix/store/hh79856h2fw1i3i4g75a78rbzgi8qk3s-tree-sitter-c", - "sha256": "0g43xn98i01cgqzv0ck1inj267y7qjwpxzy5l245kdmxgfg4czm8", + "rev": "517bf92b2c5e8baa4241cbb8a49085ed7c3c48d4", + "date": "2022-07-08T09:44:02-07:00", + "path": "/nix/store/0nz381ay9ybngxvialwxisji9j4gwadb-tree-sitter-c", + "sha256": "03klq9mb9jnhjxf8lv0mk02gdp83zcyrvx1bzrqbd9jdza3ji1xl", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index 9e5bce1b0a43..5a90c5dcce77 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,9 +1,9 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "5020572408a386d5d2dfac3516584f5edda7a49b", - "date": "2022-01-26T22:53:15+01:00", - "path": "/nix/store/in8jrkjf5vca2azpnyq2dgmzz9jcvjy6-tree-sitter-cmake", - "sha256": "0y49x8d36vdq2lcj67f3ms53qxym3578b3aw9gs2ckibwzrbfbgy", + "rev": "599836393074e4744d78dad76b8b8eb8e1f690ff", + "date": "2022-07-08T12:16:35+07:00", + "path": "/nix/store/w6nxam1m3kq35faqcx17qmgn250fv461-tree-sitter-cmake", + "sha256": "02gbi24rxq4qqlxzl17vi81xjk3d3y41ig6g8w2yc6f2ihiw85na", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index 266de6ad18b5..4c55b73a1183 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "d21df11b0ecc6fd211dbe11278e92ef67bd17e97", - "date": "2021-12-23T08:53:16-08:00", - "path": "/nix/store/zy74brmd1x2q68bpvi5v4z52bhmkcmy8-tree-sitter-embedded-template", - "sha256": "0h3nj6fz512riyx2b65pg9pjprkpkasnglwljlzi6s1in9fdig3x", + "rev": "1a538da253d73f896b9f6c0c7d79cda58791ac5c", + "date": "2022-06-20T17:01:16+02:00", + "path": "/nix/store/6mrkhc8bkfnmfaq94a30am9ygh971y97-tree-sitter-embedded-template", + "sha256": "0j73jk9byrhwddb4qsh67gf5fwj9fgdz6byphh3jj8f0ajzdxrmx", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index 5bea07ef1e3c..f30b880b6451 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,9 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "d37fd84a702b78ff0282f223ece83c61ab062a6e", - "date": "2022-02-21T08:13:28-05:00", - "path": "/nix/store/lafx5rw9r9jp9056sv0sk89kxfjlb9x3-tree-sitter-fennel", - "sha256": "1wqvz8v877jh7shv50xbnx1bxvdlnfnpmndwzsb0smidnzx7lbw2", + "rev": "517195970428aacca60891b050aa53eabf4ba78d", + "date": "2022-06-22T09:39:24-04:00", + "path": "/nix/store/v8by7ilv9fyv20rp714xq7vhwwi7vz0g-tree-sitter-fennel", + "sha256": "02ja5narbahc02f6gmnr5j2sg5sbjcc71hbny6n0nd57kcnapfgd", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json index 5dc18d6c7b28..4e4935dfabab 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json @@ -1,9 +1,9 @@ { "url": "https://github.com/alexlafroscia/tree-sitter-glimmer", - "rev": "5ed38d3cba65376e4734b0f1763c2f049ad5a1cf", - "date": "2021-09-25T09:50:19-04:00", - "path": "/nix/store/z0nhsn3v519mbxrhj5x1y7h7k7giviw2-tree-sitter-glimmer", - "sha256": "0whij8420niywdi0lna8w5fizq30vhldz3wssisw91gjfdn8d9mz", + "rev": "a23d28de811976f3ca310df735fe09a5d2de16ab", + "date": "2022-06-24T09:27:51-04:00", + "path": "/nix/store/m0hr0x0s3j7r6dn1kv6c77c9qbl4ggkw-tree-sitter-glimmer", + "sha256": "07dzpjyc644clh2x3r48w3mi3i68pkac5mwzha2iaxly9fndm0zk", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json index e6873a191a0f..509d7b90778c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-glsl", - "rev": "a480a02033f8d5c67e798a6f7584ec0d2be568b0", - "date": "2022-05-22T00:37:43+02:00", - "path": "/nix/store/jw1wnz2wfgibdz9pz0zlxyvs9p3pcayg-tree-sitter-glsl", - "sha256": "04yd7s26z4lmjrw325sn68nwma3mj1pl1kj1xvvwzxb9cxb91657", + "rev": "57652a006b726251ae4d03862ffecbe39b1515bf", + "date": "2022-07-10T20:32:50+02:00", + "path": "/nix/store/n3rfnc7z8ps4jzgxyb9hv9kffb2alcmw-tree-sitter-glsl", + "sha256": "1iayzjbwfmjbak3igrgms7wpa58syy2xym6n2hpi3369v7rfgsg8", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json index 590d0c77d614..c20c4c717d96 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json @@ -2,7 +2,7 @@ "url": "https://github.com/omertuc/tree-sitter-go-work", "rev": "6dd9dd79fb51e9f2abc829d5e97b15015b6a8ae2", "date": "2021-12-18T20:13:22+01:00", - "path": "/nix/store/7a4raw2gi4xgbg858cs0davbplj7m8rq-tree-sitter-gowork", + "path": "/nix/store/7a4raw2gi4xgbg858cs0davbplj7m8rq-tree-sitter-go-work", "sha256": "1kzrs4rpby3b0h87rbr02k55k3mmkmdy7rvl11q95b3ym0smmyqb", "fetchLFS": false, "fetchSubmodules": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 89a249a68cb0..74d8289dfa07 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "ca0a13f1acb60cf32e74cced3cb623b6c70fa77c", - "date": "2022-06-06T23:15:37+02:00", - "path": "/nix/store/dmq8mc361rkhrpa5s06h1z9k8khkvi78-tree-sitter-haskell", - "sha256": "1r3mfnj1f6p2cqriay22jjfggrmyywimidzmzw8h5q84flngdg2s", + "rev": "cf394604ae2ec2a5e65b1afbc7dea21258ede403", + "date": "2022-07-02T11:46:11+02:00", + "path": "/nix/store/04cbp4wc4ga3d36d9xvqz2wy9bdnyapv-tree-sitter-haskell", + "sha256": "1kvh5gwg3c59snqhpsg23b690rnbmcya0i38mqq9n1pdmv2pzxyi", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index 0220be6596c9..925c106fd265 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/connorlay/tree-sitter-heex", - "rev": "4d8d646bba27ec11bbf76ea37410a604d2e18bfc", - "date": "2022-06-09T17:09:44-05:00", - "path": "/nix/store/hcn9zl21asz1h6h2abqjpcc37sr56s6s-tree-sitter-heex", - "sha256": "0s38g23npq4k2yfwijmp14wmk7klhlycr4jl9a1hnh8qqihxjbj1", + "rev": "961bc4d2937cfd24ceb0a5a6b2da607809f8822e", + "date": "2022-06-13T09:15:37-07:00", + "path": "/nix/store/5qackjn309ls9qja23wkwhqiid9rc6l3-tree-sitter-heex", + "sha256": "1by6c4gcqxy9czvwabbmlfr1hlw8z2w7f623llbag956scp2b9al", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json index 879893ca4bd2..b0957165199b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cbarrete/tree-sitter-ledger", - "rev": "1050a25df55a62878102d10e524b5184b316b7ad", - "date": "2022-04-01T08:21:18-04:00", - "path": "/nix/store/hfhxv3k8kxpg7m31xzrf56lbaa4ips65-tree-sitter-ledger", - "sha256": "0qivr9wjab8m1ha4zisznijpw4x3phv0q0nh8lnsx7bjbz6f7xfx", + "rev": "47b8971448ce5e9abac865f450c1b14fb3b6eee9", + "date": "2022-07-09T09:40:08-04:00", + "path": "/nix/store/qzp0n5gcw7hakcv3ahxf1nrqrk8j2l3w-tree-sitter-ledger", + "sha256": "0j5fsgmmvc8z0ihsifc38qbvx8xdwd25bxq2a0k6kb8mbbmzk30f", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 52ade503e8a9..5312806c003e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MunifTanjim/tree-sitter-lua", - "rev": "2b4ffd5a5ffd0c6b4c84f0d9e003050a70db2a37", - "date": "2022-04-08T22:29:43+06:00", - "path": "/nix/store/gj2bbwc3105djyl3l5b0hjr1y1jg7262-tree-sitter-lua", - "sha256": "1l383clymmzk0q9b21kcgnmpww4hsh938yd3z9djpkhagadpqpjs", + "rev": "a041a547270c17f3d3aca11cb882f5c8eb88a572", + "date": "2022-07-07T14:08:02+06:00", + "path": "/nix/store/cs0rf42nnyw4w2rlzhw137iqh06dy5mh-tree-sitter-lua", + "sha256": "0db2wjwzzx40i38cs04w8pn0zqqv18ry4m2div0a0b2wgdhzf33f", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index f33e3022acef..b416bccb8123 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "6d112e7a9c1694504bb78ee0b92dcd509625e0df", - "date": "2022-04-26T12:23:01+02:00", - "path": "/nix/store/598nrwznzg37r9pskrmzwnhrw3f4knnw-tree-sitter-markdown", - "sha256": "03d601dp65p30c88p0r6rx13wlkbg1q3ch11wfn4sa2rhba8zpyk", + "rev": "142a5b4a1b092b64c9f5db8f11558f9dd4009a1b", + "date": "2022-07-04T10:48:30+02:00", + "path": "/nix/store/wac43pvz3wdwl2i6a8a0ik6l99c9lzmq-tree-sitter-markdown", + "sha256": "0q1czdv7szw9rk4h9i9xjc29s0g3m1grhsjq6rl5vm70h998fbmg", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index abf7df917efe..9cf696fe8168 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "23d419ba45789c5a47d31448061557716b02750a", - "date": "2021-08-26T21:21:27+02:00", - "path": "/nix/store/942q4rv9vs77wwvvw46yx0jnqja2cbig-tree-sitter-ocaml", - "sha256": "1bh3afd3iix0gf6ldjngf2c65nyfdwvbmsq25gcxm04jwbg9c6k8", + "rev": "cc26b1ef111100f26a137bcbcd39fd4e35be9a59", + "date": "2022-06-19T21:41:43+02:00", + "path": "/nix/store/m5z0cdxb8mg1ff64529p8sfj9afq50l5-tree-sitter-ocaml", + "sha256": "1qra2zihw09ff16gxfmpmdmyj0rilvnk1xc9y4wb01j2a4292fc1", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json index 0a88da3e4536..33b3088227f9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/milisims/tree-sitter-org", - "rev": "7ab140276cff85bf6dd08914e04188f4da1ff0ab", - "date": "2022-06-01T13:56:57-04:00", - "path": "/nix/store/ig79jii0vihy6vjq5j35ymgpbppjcsgd-tree-sitter-org", - "sha256": "0j3520h0bvxn6sm8fg1a400y2rnp0l9jrf31n8rbkq9ri34bzi5x", + "rev": "bc8a040492b56754a35b3b00a3052fdb7ba12969", + "date": "2022-06-27T11:07:56-04:00", + "path": "/nix/store/6xpvk9i1250slzsh2ap3pr0fawmibngw-tree-sitter-org", + "sha256": "19z45bd276g4xggg2vqmr6fjwyi88xmpx1ihqq908152pq83zmv6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index d7b8f83ef50a..98dcf351a7bf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "866e4a155739a1374da5247b876e70f8639005f6", - "date": "2022-06-06T09:18:54+02:00", - "path": "/nix/store/23f9s4z321mnjnqfxjdj75rkcvwv2xpa-tree-sitter-php", - "sha256": "11nagsvq2jsinrhsfpnylz1lkp6hiw3jndshnjvzvkjmmpavm1gr", + "rev": "ece74b20942a5b23acaf3622512c6d0db1491a7e", + "date": "2022-06-24T15:38:28-07:00", + "path": "/nix/store/cqqyvb0vfp0q34lf3w5jds5dq4riac9z-tree-sitter-php", + "sha256": "0ggx747j3hpgwqw7cjh07n866mvdcyv3mvblffbrb8b1xn3bll84", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index b1213507b5b5..fe96836732ee 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "dafcef7943229ec9d530b36ed67d758e659f4c6c", - "date": "2022-05-31T14:13:03-07:00", - "path": "/nix/store/9f82z98jx9jlpb96niav0zd173lxmlla-tree-sitter-python", - "sha256": "07dkwp46wp8fnh94qy4rlvn8yq0wzawnmbrz7z1jk14ymr6s5hkh", + "rev": "de221eccf9a221f5b85474a553474a69b4b5784d", + "date": "2022-06-27T15:09:45-07:00", + "path": "/nix/store/r8cac3zd9xd3l3knzl6k98zhq0wshv0n-tree-sitter-python", + "sha256": "1mp2rqv6p2nla0sh1s5hprq32b9nkwbj2q21dcpvdcg6gack1sdf", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json index db200508b4bc..ae10412d474b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json @@ -1,9 +1,9 @@ { "url": "https://github.com/stsewd/tree-sitter-rst", - "rev": "b74770c0166f28c1a0ab293513a78712ca1c338b", - "date": "2022-01-22T20:59:44-05:00", - "path": "/nix/store/ymhzq6hwq43gf918zyxk7can4qfkz7n1-tree-sitter-rst", - "sha256": "0q50vwk72lrgnrdjjn5aj1fjksrwkd0gfmdnrjy59a6cw8m1gmf0", + "rev": "d4b6c33ec15a4c22d0003dd37a5b20baa352b843", + "date": "2022-06-13T13:46:50-05:00", + "path": "/nix/store/scmhiai4dfc8k7nw6f0j1nmdhzv2j1ji-tree-sitter-rst", + "sha256": "127g78x2macl5fc1vhkfgkkd3zzj1yv9m2067j53nrivaff3jj8d", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index b56e34d696e7..9dcd2a657e7d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "36ae187ed6dd3803a8a89dbb54f3124c8ee74662", - "date": "2022-05-30T15:48:43+02:00", - "path": "/nix/store/h3abmx5hwki3lnymgk1awmkrc070733m-tree-sitter-rust", - "sha256": "1x1k4cn8x3my2rp735byn0z1sjiw17vkzaqnm10jr8jg5nxigl7a", + "rev": "0f14a10011ac6e56f309fb99a94829c3312b743a", + "date": "2022-07-11T12:34:08-04:00", + "path": "/nix/store/9767f79glbdja848ri2i0vii41g3z84n-tree-sitter-rust", + "sha256": "15js3v1kyl7h34ichy5q6zs5n0sm2b0iwgfdh34jrcgnlbvbgy52", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index d8413f75d7d5..c80f1eaddd1e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -1,9 +1,9 @@ { "url": "https://github.com/m-novikov/tree-sitter-sql", - "rev": "2ec2fedbb38d09737e2a1cdd207f6416dc1cb109", - "date": "2022-06-11T22:57:56+02:00", - "path": "/nix/store/zzx4b5cnsrrdzkb5rbmx5d8vzbyr0rbi-tree-sitter-sql", - "sha256": "0dcpdshymyszsr1dflsr3j6ynrnrq0g4qdxqcz7d0anpwh3xw4cs", + "rev": "218b672499729ef71e4d66a949e4a1614488aeaa", + "date": "2022-06-30T19:50:55+02:00", + "path": "/nix/store/rcdcgwb28jblgb65k5zjw5zgmigiqjfl-tree-sitter-sql", + "sha256": "1j68h5jzc0d3a44v5mw005lh3zsrh0salfzydl9br1n8byl1awms", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index df1e810151ff..58bd0d8f8074 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "1b3ba31c7538825b05815f4f5bffcca6394edc63", - "date": "2022-06-02T09:10:56-07:00", - "path": "/nix/store/g3q8azmyclcdns0ihwl5im46qlsfxbfj-tree-sitter-typescript", - "sha256": "1iw6823zh2m95gjmly34j49ixga07fhax7z6g2q6px06gj4fm5df", + "rev": "49e82b1bce36d6046df911901684cd66b5345d58", + "date": "2022-07-06T12:52:21-07:00", + "path": "/nix/store/wzkgvx1sj0js8sdkm8cmip4rmsgqy3ij-tree-sitter-typescript", + "sha256": "1kgl0dvcjzlbpfbdf1mq9693p5j7kvcqfmxis2w30js2lmrp0wgb", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index 10908da4ae7c..7777e3c7e45c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "4b9d2dda6de64fe5abc9bf96b5727ba73ed08515", - "date": "2022-05-07T11:41:23+02:00", - "path": "/nix/store/zm2pfjv3fn2qg6iy1s03mn5kjawsy3qg-tree-sitter-viml", - "sha256": "0p7fj5vvxxz4d43j91zwv3h8df4m4c26w9gq2qx561vjh5w1q7fn", + "rev": "2d75bf329e3df6e1c13f81262567b9aeb6c241d1", + "date": "2022-07-12T08:30:33+02:00", + "path": "/nix/store/l19kbw907jxk26qf5cl5w5nz17sywjf6-tree-sitter-viml", + "sha256": "1pc6s2pc4svk64imkc486nz8fkhkpmwamn17gvnblinsjxr8369y", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 0ad82155c77a..d67ca3c18929 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "4cff36421dae9c05388b86cd64d2bab4b9ed6676", - "date": "2022-04-02T10:33:48+07:00", - "path": "/nix/store/ripw74y32a8nzsr9n30jfhh16wjxlxvb-tree-sitter-zig", - "sha256": "0k9z0f6vfj1pfz3qkscb41wz2nzjp0xpz9mvm6264q655rq73dlc", + "rev": "8d3224c3bd0890fe08358886ebf54fca2ed448a6", + "date": "2022-06-25T10:13:16+07:00", + "path": "/nix/store/an534h97z3gi6zk5mzysbx2fp8rvy9c4-tree-sitter-zig", + "sha256": "0mw4s92qmxkh9a13h9hg6kv9b704vzx3kr4j6dap0c80dffvfjhk", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index 2fa5ce7cf06f..c28542390039 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { libGL glfw openal + stdenv.cc.cc.lib ]; in '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 761426da865d..33ddc3f6b6fd 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,15 +2,15 @@ let stableVariant = { - version = "5.15.43"; + version = "5.15.53"; suffix = "xanmod1"; - hash = "sha256-MeH9RUPDiuN22eAZ18v+N3aIT18dQ3FnTkcQV0MjB4k="; + hash = "sha256-mLgzaXG6QaJ0hfzfNlLbAEldxHK6iHuMVUv6p8zqRBo="; }; edgeVariant = { - version = "5.18.1"; + version = "5.18.10"; suffix = "xanmod1"; - hash = "sha256-dqvB4F2S7cklSJ7XTUNvWVKTsZGLevOXME5lvhmfyis="; + hash = "sha256-RtvrJujd854bKf1YPiPavTh9oplpFN9ykr624K17vKE="; }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { @@ -39,9 +39,6 @@ let # AMD P-state driver X86_AMD_PSTATE = yes; - # Linux RNG framework - LRNG = whenOlder "5.18" yes; - # Paragon's NTFS3 driver NTFS3_FS = module; NTFS3_LZX_XPRESS = yes; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index e6c246de0d27..ce0c05346ef1 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,50 +1,59 @@ { stdenv, lib, makeWrapper, p7zip -, gawk, util-linux, xorg, glib, dbus-glib, zlib +, gawk, util-linux, xorg, glib, dbus-glib, zlib, bbe, bash, timetrap, netcat, cups , kernel ? null, libsOnly ? false -, undmg, fetchurl +, fetchurl, undmg, perl, autoPatchelfHook }: assert (!libsOnly) -> kernel != null; +assert lib.elem stdenv.hostPlatform.system [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; -let xorgFullVer = lib.getVersion xorg.xorgserver; - xorgVer = lib.versions.majorMinor xorgFullVer; - x64 = if stdenv.hostPlatform.system == "x86_64-linux" then true - else if stdenv.hostPlatform.system == "i686-linux" then false - else throw "Parallels Tools for Linux only support {x86-64,i686}-linux targets"; -in stdenv.mkDerivation rec { - version = "${prl_major}.2.1-41615"; - prl_major = "12"; + version = "17.1.4-51567"; pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { - url = "https://download.parallels.com/desktop/v${prl_major}/${version}/ParallelsDesktop-${version}.dmg"; - sha256 = "1jwzwif69qlhmfky9kigjaxpxfj0lyrl1iyrpqy4iwqvajdgbbym"; + url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; + sha256 = "sha256-gjLxQOTFuVghv1Bj+zfbNW97q1IN2rurSnPQi13gzRA="; }; hardeningDisable = [ "pic" "format" ]; - # also maybe python2 to generate xorg.conf - nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ p7zip undmg perl bbe autoPatchelfHook ] + ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies; + + buildInputs = with xorg; [ libXrandr libXext libX11 libXcomposite libXinerama ] + ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]; + + runtimeDependencies = [ glib xorg.libXrandr ]; inherit libsOnly; unpackPhase = '' undmg "${src}" - export sourceRoot=prl-tools-build - 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso" -o$sourceRoot + 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot if test -z "$libsOnly"; then ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz ) fi - ( cd $sourceRoot/tools; tar -xaf prltools${if x64 then ".x64" else ""}.tar.gz ) ''; - kernelVersion = if libsOnly then "" else lib.getName kernel.name; - kernelDir = if libsOnly then "" else "${kernel.dev}/lib/modules/${kernelVersion}"; - scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ "${util-linux}/bin" "${gawk}/bin" ]); + patches = lib.optionals (lib.versionAtLeast kernel.version "5.18") [ ./prl-tools.patch ]; + + kernelVersion = lib.optionalString (!libsOnly) kernel.modDirVersion; + kernelDir = lib.optionalString (!libsOnly) "${kernel.dev}/lib/modules/${kernelVersion}"; + + libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" "${xorg.libXrandr}/lib" ]; + + scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ + "${util-linux}/bin" + "${gawk}/bin" + "${bash}/bin" + "${timetrap}/bin" + "${netcat}/bin" + "${cups}/sbin" + ]); buildPhase = '' if test -z "$libsOnly"; then @@ -57,112 +66,80 @@ stdenv.mkDerivation rec { SRC=$kernelDir/build \ KVER=$kernelVersion ) - - # Xorg config (maybe would be useful for other versions) - #python2 installer/xserver-config.py xorg ${xorgVer} /dev/null parallels.conf fi ''; - libPath = with xorg; - lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] - ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]); - - installPhase = '' if test -z "$libsOnly"; then ( # kernel modules cd kmods mkdir -p $out/lib/modules/${kernelVersion}/extra - cp prl_eth/pvmnet/prl_eth.ko $out/lib/modules/${kernelVersion}/extra - cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra cp prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs.ko $out/lib/modules/${kernelVersion}/extra cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra + cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra + ${lib.optionalString stdenv.isAarch64 + "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"} ) fi ( # tools - cd tools + cd tools/tools${if stdenv.isAarch64 then "-arm64" else if stdenv.isx86_64 then "64" else "32"} mkdir -p $out/lib if test -z "$libsOnly"; then + # prltoolsd contains hardcoded /bin/bash path + # we're lucky because it uses only -c command + # => replace to /bin/sh + bbe -e "s:/bin/bash:/bin/sh\x00\x00:" -o bin/prltoolsd.tmp bin/prltoolsd + rm -f bin/prltoolsd + mv bin/prltoolsd.tmp bin/prltoolsd + # install binaries for i in bin/* sbin/prl_nettool sbin/prl_snapshot; do + # also patch binaries to replace /usr/bin/XXX to XXX + # here a two possible cases: + # 1. it is uses as null terminated string and should be truncated by null; + # 2. it is uses inside shell script and should be truncated by space. + for p in bin/* sbin/prl_nettool sbin/prl_snapshot sbin/prlfsmountd; do + p=$(basename $p) + bbe -e "s:/usr/bin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00:" -o $i.tmp $i + bbe -e "s:/usr/sbin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00 :" -o $i $i.tmp + bbe -e "s:/usr/bin/$p:$p :" -o $i.tmp $i + bbe -e "s:/usr/sbin/$p:$p :" -o $i $i.tmp + done + install -Dm755 $i $out/$i done - # other binaries - for i in xorg.7.1/usr/bin/*; do - cp $i $out/bin + + install -Dm755 ../../tools/prlfsmountd.sh $out/sbin/prlfsmountd + for f in $out/bin/* $out/sbin/*; do + wrapProgram $f \ + --prefix LD_LIBRARY_PATH ':' "$libPath" \ + --prefix PATH ':' "$scriptPath" done - for i in $out/bin/* $out/sbin/*; do - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:$libPath" \ - $i || true - done - - mkdir -p $out/bin - install -Dm755 ../installer/prlfsmountd.sh $out/sbin/prlfsmountd - wrapProgram $out/sbin/prlfsmountd \ - --prefix PATH ':' "$scriptPath" - - for i in lib/*.a; do + for i in lib/libPrl*.0.0; do cp $i $out/lib + ln -s $out/$i $out/''${i%.0.0} done - for i in xorg.7.1/usr/lib/libprl_wmouse_watcher.*; do - cp $i $out/lib - done + mkdir -p $out/share/man/man8 + install -Dm644 ../mount.prl_fs.8 $out/share/man/man8 - mkdir -p $out/lib/udev/rules.d - for i in *.rules; do - sed 's,/bin/bash,${stdenv.shell},g' $i > $out/lib/udev/rules.d/$i - done + substituteInPlace ../99prltoolsd-hibernate \ + --replace "/bin/bash" "${bash}/bin/bash" - ( - cd xorg.${xorgVer} - # Install the X modules. - ( - cd x-server/modules - for i in */*; do - install -Dm755 $i $out/lib/xorg/modules/$i - done - ) - ( - cd usr/lib - libGLXname=$(echo libglx.so*) - install -Dm755 $libGLXname $out/lib/xorg/modules/extensions/$libGLXname - ln -s $libGLXname $out/lib/xorg/modules/extensions/libglx.so - ln -s $libGLXname $out/lib/xorg/modules/extensions/libglx.so.1 - ) - ) + mkdir -p $out/etc/pm/sleep.d + install -Dm644 ../99prltoolsd-hibernate $out/etc/pm/sleep.d fi - - for i in xorg.7.1/usr/lib/libGL.*; do - cp $i $out/lib - done - - cd $out - find -name \*.so\* -type f -exec \ - patchelf --set-rpath "$out/lib:$libPath" {} \; - - cd lib - libGLname=$(echo libGL.so*) - ln -s $libGLname libGL.so - ln -s $libGLname libGL.so.1 ) ''; - dontStrip = true; - dontPatchELF = true; - meta = with lib; { description = "Parallels Tools for Linux guests"; homepage = "https://parallels.com"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.unfree; - # I was making this package blindly and requesting testing from the real user, - # so I can't even test it by myself and won't provide future updates. - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ catap wegank ]; }; } diff --git a/pkgs/os-specific/linux/prl-tools/prl-tools.patch b/pkgs/os-specific/linux/prl-tools/prl-tools.patch new file mode 100644 index 000000000000..561371e1e84c --- /dev/null +++ b/pkgs/os-specific/linux/prl-tools/prl-tools.patch @@ -0,0 +1,143 @@ +diff -puNr prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c +--- prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c ++++ prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c +@@ -382,7 +382,7 @@ static int prl_tg_initialize(struct tg_d + } + #endif + /* Set DMA ability. Only lower 4G is possible to address */ +- rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); ++ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); + if (rc) { + printk(KERN_ERR "no usable DMA configuration\n"); + goto err_out; +diff -puNr prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c +--- prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c ++++ prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c +@@ -76,7 +76,7 @@ static int tg_req_map_internal(struct TG + uple->p[i] = vmalloc_to_page(mem); + page_cache_get(uple->p[i]); + +- dst->RequestPages[i] = pci_map_page(pdev, uple->p[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL) >> PAGE_SHIFT; ++ dst->RequestPages[i] = dma_map_page(&pdev->dev, uple->p[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL) >> PAGE_SHIFT; + if (!dst->RequestPages[i]) { + page_cache_release(uple->p[i]); + goto err; +@@ -88,7 +88,7 @@ static int tg_req_map_internal(struct TG + + err: + for (i = 0; i < uple->count; i++) { +- pci_unmap_page(pdev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&pdev->dev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + page_cache_release(uple->p[i]); + } + kfree(uple); +@@ -129,7 +129,7 @@ static TG_PAGED_BUFFER *tg_req_map_user_ + pfn = (u64 *)dbuf - 1; + + for (; npages > 0; npages--, mapped++) { +- dma_addr_t addr = pci_map_page(pdev, uple->p[npages-1], 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_addr_t addr = dma_map_page(&pdev->dev, uple->p[npages-1], 0, PAGE_SIZE, DMA_BIDIRECTIONAL); + + if (!addr) { + DPRINTK("[3] %d < %d \n", got, npages); +@@ -144,7 +144,7 @@ static TG_PAGED_BUFFER *tg_req_map_user_ + + err_unmap: + for (i = 0; i < mapped; i++, pfn++) +- pci_unmap_page(pdev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&pdev->dev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + + err_put: + for(i = 0; i < got; i++) +@@ -176,7 +176,7 @@ static TG_PAGED_BUFFER *tg_req_map_kerne + goto err; + } + +- addr = pci_map_page(pdev, page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ addr = dma_map_page(&pdev->dev, page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); + if (!addr) { + DPRINTK("[2] va:%p can't map\n", buffer); + goto err; +@@ -189,7 +189,7 @@ static TG_PAGED_BUFFER *tg_req_map_kerne + + err: + for (; i > 0; i--, pfn--) +- pci_unmap_page(pdev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&pdev->dev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + + return ERR_PTR(-ENOMEM); + } +@@ -203,7 +203,7 @@ static inline int tg_req_unmap_internal( + dst->RequestSize + ~PAGE_MASK) >> PAGE_SHIFT; + + for (i = 0; i < count; i++) +- pci_unmap_page(req->dev->pci_dev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&req->dev->pci_dev->dev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + + return count; + } +@@ -264,7 +264,7 @@ static void tg_req_unmap_pages(struct TG + + pfn = (u64 *)(dbuf + 1); + for (; npages > 0; npages--, pfn++) +- pci_unmap_page(pdev, (*pfn) << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&pdev->dev, (*pfn) << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + + dbuf = (TG_PAGED_BUFFER *)pfn; + } +@@ -374,7 +374,7 @@ static int tg_req_submit(struct TG_PENDI + * also no any offset inside page needed. + */ + req->pg = vmalloc_to_page(dst); +- req->phys = pci_map_page(dev->pci_dev, vmalloc_to_page(dst), 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ req->phys = dma_map_page(&dev->pci_dev->dev, vmalloc_to_page(dst), 0, PAGE_SIZE, DMA_BIDIRECTIONAL); + if (!req->phys) { + DPRINTK("Can not allocate memory for DMA mapping\n"); + goto out; +@@ -405,7 +405,7 @@ static int tg_req_submit(struct TG_PENDI + out: + if (ret != TG_STATUS_PENDING) { + page_cache_release(req->pg); +- pci_unmap_page(dev->pci_dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&dev->pci_dev->dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); + } + + DPRINTK("EXIT\n"); +@@ -460,7 +460,7 @@ out_wait: + wait_for_completion(&req->waiting); + out: + page_cache_release(req->pg); +- pci_unmap_page(dev->pci_dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&dev->pci_dev->dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); + DPRINTK("EXIT\n"); + return ret; + } +diff -puNr prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c +--- prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c ++++ prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 40)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)) +@@ -57,7 +58,7 @@ unsigned long *prlfs_dfl( struct dentry + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) +-#define prl_uaccess_kernel() uaccess_kernel() ++#define prl_uaccess_kernel() (false) + #else + #define prl_uaccess_kernel() segment_eq(get_fs(), KERNEL_DS) + #endif +@@ -954,7 +955,7 @@ static const struct address_space_operat + .writepage = prlfs_writepage, + .write_begin = simple_write_begin, + .write_end = prlfs_write_end, +- .set_page_dirty = __set_page_dirty_nobuffers, ++ .dirty_folio = filemap_dirty_folio, + }; + + diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix new file mode 100644 index 000000000000..bb0919698370 --- /dev/null +++ b/pkgs/servers/baserow/default.nix @@ -0,0 +1,172 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, regex +, service-identity +, itsdangerous +, requests +, redis +, channels +, channels-redis +, psycopg2 +, gunicorn +, django-cors-headers +, django-celery-email +, advocate +, django-storages +, pillow +, faker +, uvicorn +, twisted +, django +, drf-jwt +, cryptography +, tqdm +, celery-redbeat +, drf-spectacular +, websockets +, asgiref +, antlr4-python3-runtime +, psutil +, dj-database-url +, django-health-check +, celery +, unicodecsv +, django-celery-beat +, django-redis +, zipp +, boto3 +, cached-property +, importlib-resources +, zope_interface +, freezegun +, pyinstrument +, responses +, pytestCheckHook +, setuptools +, pytest-django +, python +, httpretty +, pytest-unordered +, openapi-spec-validator }: + +let + + baserow_premium = with python.pkgs; ( buildPythonPackage rec { + pname = "baserow_premium"; + version = "1.10.2"; + + src = fetchFromGitLab { + owner = "bramw"; + repo = pname; + rev = version; + sha256 = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w="; + }; + + sourceRoot = "source/premium/backend"; + + doCheck = false; + }); + +in + +buildPythonPackage rec { + pname = "baserow"; + version = "1.10.2"; + + src = fetchFromGitLab { + owner = "bramw"; + repo = pname; + rev = version; + sha256 = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w="; + }; + + sourceRoot = "source/backend"; + + postPatch = '' + # remove dependency constraints + sed 's/[~<>=].*//' -i requirements/base.in requirements/base.txt + sed 's/zope-interface/zope.interface/' -i requirements/base.in requirements/base.txt + ''; + + propagatedBuildInputs = [ + advocate + antlr4-python3-runtime + boto3 + cached-property + celery-redbeat + channels + channels-redis + dj-database-url + django-celery-beat + django-celery-email + django-cors-headers + django-health-check + django-redis + django-storages + drf-jwt + drf-spectacular + faker + gunicorn + importlib-resources + itsdangerous + pillow + psutil + psycopg2 + redis + regex + requests + service-identity + setuptools + tqdm + twisted + unicodecsv + uvicorn + zipp + ]; + + checkInputs = [ + baserow_premium + boto3 + freezegun + httpretty + openapi-spec-validator + pyinstrument + pytestCheckHook + pytest-django + pytest-unordered + responses + zope_interface + ]; + + fixupPhase = '' + cp -r src/baserow/contrib/database/{api,action,trash,formula,file_import} \ + $out/lib/${python.libPrefix}/site-packages/baserow/contrib/database/ + cp -r src/baserow/core/management/backup $out/lib/${python.libPrefix}/site-packages/baserow/core/management/ + ''; + + # Disable linting checks + disabledTests = [ + "flake8_plugins" + ]; + + disabledTestPaths = [ + # Disable premium tests + "../premium/backend/src/baserow_premium" + "../premium/backend/tests/baserow_premium" + # Disable database related tests + "tests/baserow/contrib/database" + "tests/baserow/api" + "tests/baserow/core" + "tests/baserow/ws" + ]; + + DJANGO_SETTINGS_MODULE = "baserow.config.settings.test"; + + meta = with lib; { + homepage = "https://baserow.io"; + description = "No-code database and Airtable alternative"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 1c748f9a6be3..a9d18d5b3f72 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "mattermost"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-i5Ytn0o4gwQEkKzhHbFOn6BWEdYVsg24N0x/gxUzHAM="; + sha256 = "sha256-eo+NfV4S8utWdmYvp+F0sNlgptIC0zNXWXMrh7xfqN8="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-+GxzVTJDD5qIxVif0QjcnggydW7MvzNBvxG+6p7G7Q8="; + sha256 = "sha256-NqCZyUdbw3OrQRuPH6NSWYhHKG3R4QHlH9IVIbIPEeU="; }; vendorSha256 = "sha256-98riYN6MaBsKyaueogjXI7x3Lcionk0xcGt4DH684QU="; diff --git a/pkgs/servers/monitoring/nagios/plugins/smartmon.nix b/pkgs/servers/monitoring/nagios/plugins/smartmon.nix new file mode 100644 index 000000000000..42554cfafe99 --- /dev/null +++ b/pkgs/servers/monitoring/nagios/plugins/smartmon.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +, smartmontools +}: + +stdenv.mkDerivation rec { + pname = "check_smartmon"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "driehuis"; + repo = "Nagios_check_smartmon"; + rev = version; + sha256 = "tiIeFiHdDgqoeznk9XdCE7owIMnnsQ0fmtj8foFoUD8="; + }; + + buildInputs = [ + (python3.withPackages (pp: [ pp.psutil ])) + smartmontools + ]; + + postPatch = '' + patchShebangs check_smartmon.py + substituteInPlace check_smartmon.py \ + --replace '"/usr/sbin/smartctl"' '"${smartmontools}/bin/smartctl"' + ''; + + installPhase = '' + runHook preInstall + install -Dm 755 check_smartmon.py $out/bin/check_smartmon + runHook postInstall + ''; + + meta = with lib; { + description = "A Nagios-Plugin that uses smartmontools to check disk health status and temperature"; + homepage = "https://github.com/driehuis/Nagios_check_smartmon"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mariaa144 ]; + }; +} diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/servers/web-apps/searxng/default.nix new file mode 100644 index 000000000000..937f0ac48c44 --- /dev/null +++ b/pkgs/servers/web-apps/searxng/default.nix @@ -0,0 +1,62 @@ +{ lib +, python3 +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "searxng"; + version = "unstable-2022-06-29"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "107006515ee9fe9cad9a6f6387db658953d32486"; + sha256 = "sha256-uV5XiOVuES9wuBx9S8WhM8jhuxRHlSMvW5Ki8WlDwfM="; + }; + + postPatch = '' + sed -i 's/==.*$//' requirements.txt + ''; + + preBuild = '' + export SEARX_DEBUG="true"; + ''; + + propagatedBuildInputs = with python3Packages; [ + babel + certifi + python-dateutil + flask + flaskbabel + brotli + jinja2 + langdetect + lxml + h2 + pygments + pyyaml + redis + uvloop + setproctitle + httpx + httpx-socks + markdown-it-py + ]; + + # tests try to connect to network + doCheck = false; + + postInstall = '' + # Create a symlink for easier access to static data + mkdir -p $out/share + ln -s ../${python3.sitePackages}/searx/static $out/share/ + ''; + + meta = with lib; { + homepage = "https://github.com/searxng/searxng"; + description = "A fork of Searx, a privacy-respecting, hackable metasearch engine"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/pkgs/stdenv/linux/bootstrap-files/mips64el.nix b/pkgs/stdenv/linux/bootstrap-files/mips64el.nix new file mode 100644 index 000000000000..452a247fb0b9 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/mips64el.nix @@ -0,0 +1,25 @@ +# +# Files came from this Hydra build: +# +# https://hydra.nixos.org/build/182757245 +# +# Which used nixpkgs revision ef3fe254f3c59455386bc92fe84164f9679b92b1 +# to instantiate: +# +# /nix/store/a2bvv663wjnyhq8m7v84aspsd3sgf9h6-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabi64.drv +# +# and then built: +# +# /nix/store/aw3dmsrh22831l83vi3q9apg9qi3x8ms-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabi64 +# +{ + busybox = import { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el/ef3fe254f3c59455386bc92fe84164f9679b92b1/busybox"; + sha256 = "sha256-sTE58ofjqAqX3Xtq1g9wDxzIe6Vo//GHbicfqJoivDI="; + executable = true; + }; + bootstrapTools =import { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el/ef3fe254f3c59455386bc92fe84164f9679b92b1/bootstrap-tools.tar.xz"; + sha256 = "sha256-tTgjeXpd2YgnfP4JvRuO0bXd2j8GqzBcd57JI3wH9x0="; + }; +} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 3b4588a70f9c..723ebf24fe52 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,6 +16,7 @@ armv7l-linux = import ./bootstrap-files/armv7l.nix; aarch64-linux = import ./bootstrap-files/aarch64.nix; mipsel-linux = import ./bootstrap-files/loongson2f.nix; + mips64el-linux = import ./bootstrap-files/mips64el.nix; powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; riscv64-linux = import ./bootstrap-files/riscv64.nix; }; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index de8fdfdea55b..d12b6ecf6606 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "218"; + version = "219"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-W4adsal6l1TdlUhITNGnNUmYUIpEsOZRro2/SEdzV2Y="; + sha256 = "sha256-gD97/2Oyp4PQk63RDXv8l+2dgjqrq/JSmjcB846kP7c="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 38861d36252e..44f0918bd209 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, perl, nixosTests -, brotliSupport ? false, brotli ? null -, c-aresSupport ? false, c-ares ? null -, gnutlsSupport ? false, gnutls ? null -, gsaslSupport ? false, gsasl ? null +, brotliSupport ? false, brotli +, c-aresSupport ? false, c-ares +, gnutlsSupport ? false, gnutls +, gsaslSupport ? false, gsasl , patchNetrcRegression ? false , gssSupport ? with stdenv.hostPlatform; ( !isWindows && @@ -13,18 +13,18 @@ # fixed in mig, but losing gss support on cross compilation to darwin is # not worth the effort. !(isDarwin && (stdenv.buildPlatform != stdenv.hostPlatform)) - ), libkrb5 ? null -, http2Support ? true, nghttp2 ? null -, http3Support ? false, nghttp3, ngtcp2 ? null -, idnSupport ? false, libidn2 ? null -, ldapSupport ? false, openldap ? null -, opensslSupport ? zlibSupport, openssl ? null -, pslSupport ? false, libpsl ? null -, rtmpSupport ? false, rtmpdump ? null -, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null -, wolfsslSupport ? false, wolfssl ? null -, zlibSupport ? true, zlib ? null -, zstdSupport ? false, zstd ? null + ), libkrb5 +, http2Support ? true, nghttp2 +, http3Support ? false, nghttp3, ngtcp2 +, idnSupport ? false, libidn2 +, ldapSupport ? false, openldap +, opensslSupport ? zlibSupport, openssl +, pslSupport ? false, libpsl +, rtmpSupport ? false, rtmpdump +, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 +, wolfsslSupport ? false, wolfssl +, zlibSupport ? true, zlib +, zstdSupport ? false, zstd # for passthru.tests , coeurl @@ -45,23 +45,6 @@ assert !(gnutlsSupport && opensslSupport); assert !(gnutlsSupport && wolfsslSupport); assert !(opensslSupport && wolfsslSupport); -assert brotliSupport -> brotli != null; -assert c-aresSupport -> c-ares != null; -assert gnutlsSupport -> gnutls != null; -assert gsaslSupport -> gsasl != null; -assert gssSupport -> libkrb5 != null; -assert http2Support -> nghttp2 != null; -assert http3Support -> nghttp3 != null; -assert http3Support -> ngtcp2 != null; -assert idnSupport -> libidn2 != null; -assert ldapSupport -> openldap != null; -assert opensslSupport -> openssl != null; -assert pslSupport -> libpsl !=null; -assert rtmpSupport -> rtmpdump !=null; -assert scpSupport -> libssh2 != null; -assert wolfsslSupport -> wolfssl != null; -assert zlibSupport -> zlib != null; -assert zstdSupport -> zstd != null; stdenv.mkDerivation (finalAttrs: { pname = "curl"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e460e36bd4c7..7c70c043d580 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -486,6 +486,7 @@ mapAliases ({ gitinspector = throw "gitinspector has been removed because it doesn't work with python3"; # Added 2022-01-12 gksu = throw "gksu has been removed"; # Added 2022-01-16 glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22 + glimpse = throw "glimpse was removed, as the project was discontinued. You can use gimp instead."; # Added 2022-07-11 gmailieer = lieer; # Added 2020-04-19 gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33b0398c31c8..e66b718e696f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2166,6 +2166,8 @@ with pkgs; stdenv = gcc10StdenvCompat; }; + boron = callPackage ../development/interpreters/boron { }; + botamusique = callPackage ../tools/audio/botamusique { }; boulder = callPackage ../tools/admin/boulder { }; @@ -22037,6 +22039,8 @@ with pkgs; sabnzbd = callPackage ../servers/sabnzbd { }; + baserow = python3Packages.callPackage ../servers/baserow { }; + bftpd = callPackage ../servers/ftp/bftpd {}; bind = callPackage ../servers/dns/bind { }; @@ -22744,6 +22748,8 @@ with pkgs; check-openvpn = callPackage ../servers/monitoring/plugins/openvpn.nix { }; + check_smartmon = callPackage ../servers/monitoring/nagios/plugins/smartmon.nix { }; + checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { }; check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { }; @@ -23085,6 +23091,8 @@ with pkgs; searx = callPackage ../servers/web-apps/searx { }; + searxng = python3Packages.toPythonModule (callPackage ../servers/web-apps/searxng { }); + selfoss = callPackage ../servers/web-apps/selfoss { }; shaarli = callPackage ../servers/web-apps/shaarli { }; @@ -27144,7 +27152,9 @@ with pkgs; freerdpUnstable = freerdp; - friture = libsForQt5.callPackage ../applications/audio/friture { }; + friture = libsForQt5.callPackage ../applications/audio/friture { + python3Packages = python39Packages; + }; fte = callPackage ../applications/editors/fte { }; @@ -34705,6 +34715,9 @@ with pkgs; libjack2 = jack2.override { prefix = "lib"; }; + jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { }; + jack_autoconnect = jack-autoconnect; + jacktrip = libsForQt5.callPackage ../applications/audio/jacktrip { }; j2cli = with python3Packages; toPythonApplication j2cli; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a7376042a6e5..5f7f01589295 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -431,8 +431,7 @@ in { phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; - # Disable for kernels 4.15 and above due to compatibility issues - prl-tools = if lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; + prl-tools = callPackage ../os-specific/linux/prl-tools { }; sch_cake = callPackage ../os-specific/linux/sch_cake { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11f1ca5e1501..ff5c109d671f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1430,6 +1430,8 @@ in { bson = callPackage ../development/python-modules/bson { }; + bsuite = callPackage ../development/python-modules/bsuite { }; + btchip = callPackage ../development/python-modules/btchip { }; bt-proximity = callPackage ../development/python-modules/bt-proximity { }; @@ -1564,6 +1566,8 @@ in { celery = callPackage ../development/python-modules/celery { }; + celery-redbeat = callPackage ../development/python-modules/celery-redbeat { }; + cement = callPackage ../development/python-modules/cement { }; censys = callPackage ../development/python-modules/censys { }; @@ -2318,6 +2322,8 @@ in { distorm3 = callPackage ../development/python-modules/distorm3 { }; + distrax = callPackage ../development/python-modules/distrax { }; + distributed = callPackage ../development/python-modules/distributed { }; distro = callPackage ../development/python-modules/distro { }; @@ -2344,6 +2350,10 @@ in { django-cacheops = callPackage ../development/python-modules/django-cacheops { }; + django-celery-beat = callPackage ../development/python-modules/django-celery-beat { }; + + django-celery-email = callPackage ../development/python-modules/django-celery-email { }; + django_classytags = callPackage ../development/python-modules/django_classytags { }; django-cleanup = callPackage ../development/python-modules/django-cleanup { }; @@ -2384,6 +2394,8 @@ in { django-haystack = callPackage ../development/python-modules/django-haystack { }; + django-health-check = callPackage ../development/python-modules/django-health-check { }; + django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; django_hijack = callPackage ../development/python-modules/django-hijack { }; @@ -2513,8 +2525,12 @@ in { dmenu-python = callPackage ../development/python-modules/dmenu { }; + dm-env = callPackage ../development/python-modules/dm-env { }; + dm-haiku = callPackage ../development/python-modules/dm-haiku { }; + dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; + dm-tree = callPackage ../development/python-modules/dm-tree { abseil-cpp = pkgs.abseil-cpp.override { cxxStandard = "14"; @@ -6761,6 +6777,8 @@ in { plotly = callPackage ../development/python-modules/plotly { }; + plotnine = callPackage ../development/python-modules/plotnine { }; + pluggy = callPackage ../development/python-modules/pluggy { }; plugincode = callPackage ../development/python-modules/plugincode { }; @@ -7539,6 +7557,8 @@ in { pyinsteon = callPackage ../development/python-modules/pyinsteon { }; + pyinstrument = callPackage ../development/python-modules/pyinstrument { }; + pyintesishome = callPackage ../development/python-modules/pyintesishome { }; pyipma = callPackage ../development/python-modules/pyipma { }; @@ -8471,6 +8491,8 @@ in { pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; + pytest-unordered = callPackage ../development/python-modules/pytest-unordered { }; + pytest-vcr = callPackage ../development/python-modules/pytest-vcr { }; pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; @@ -9325,6 +9347,8 @@ in { rki-covid-parser = callPackage ../development/python-modules/rki-covid-parser { }; + rlax = callPackage ../development/python-modules/rlax { }; + rl-coach = callPackage ../development/python-modules/rl-coach { }; rlp = callPackage ../development/python-modules/rlp { }; @@ -10725,6 +10749,8 @@ in { trezor = callPackage ../development/python-modules/trezor { }; + trfl = callPackage ../development/python-modules/trfl { }; + trimesh = callPackage ../development/python-modules/trimesh { }; trio = callPackage ../development/python-modules/trio {