diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index 3d5f84af2cf4..f7ee952e7f61 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -23,7 +23,7 @@ in SSH_AUTH_SOCK to point at yubikey-agent. Note that yubikey-agent will use whatever pinentry is - specified in programs.gnupg.agent.pinentryFlavor. + specified in programs.gnupg.agent.pinentryPackage. ''; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index dce8a6d05300..64d2efe8aac6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8798,6 +8798,18 @@ final: prev: meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; + persisted-nvim = buildVimPlugin { + pname = "persisted.nvim"; + version = "2024-04-04"; + src = fetchFromGitHub { + owner = "olimorris"; + repo = "persisted.nvim"; + rev = "ca9900c31ee6e254a0ba7011ba49f48ebf4c8db2"; + sha256 = "0s9g1jmq1qzkxi1gcvmyf0nmwgqrh11r0swy9pl32916k37zvqzl"; + }; + meta.homepage = "https://github.com/olimorris/persisted.nvim/"; + }; + persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; version = "2024-01-19"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 735a74026e20..1b9b60f35e49 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -739,6 +739,7 @@ https://github.com/roobert/palette.nvim/,HEAD, https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, +https://github.com/olimorris/persisted.nvim/,HEAD, https://github.com/folke/persistence.nvim/,, https://github.com/andsild/peskcolor.vim/,, https://github.com/pest-parser/pest.vim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 101d2e4faeb9..21e7c8a32fba 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4202,6 +4202,21 @@ let }; }; + teabyii.ayu = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ayu"; + publisher = "teabyii"; + version = "1.0.5"; + sha256 = "sha256-+IFqgWliKr+qjBLmQlzF44XNbN7Br5a119v9WAnZOu4="; + }; + meta = { + description = "A simple theme with bright colors and comes in three versions — dark, light and mirage for all day long comfortable work."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=teabyii.ayu"; + homepage = "https://github.com/ayu-theme/vscode-ayu"; + license = lib.licenses.mit; + }; + }; + techtheawesome.rust-yew = buildVscodeMarketplaceExtension { mktplcRef = { name = "rust-yew"; diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 51454ea7ab16..2b3f5e28a8cf 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-73"; + version = "2.0-74"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-uiAga19DTFMq4/7ndOafkY/QvSJhWDSMMg8RV+KxN+E="; + hash = "sha256-taV2HEKRUQ7k5BpgA3nwVzX8qkTN02O9kqswjdCHod0="; }; patches = [ diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index a064e27a6657..9a6afd183756 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -2,36 +2,32 @@ , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler , gspell, libtiff, libwebp +, gphoto2, imagemagick, yad, exiftool, gnome, libnotify , wrapGAppsHook, fetchpatch, doxygen , nix-update-script }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - hash = "sha256-qkM/7auZ9TMF2r8KLnitxmvlyPmIjh7q9Ugh+QKh8hw="; + hash = "sha256-13Ayr6r4JhqexaUvwzdc6XHT+j2l2D5YBws6gSAhU3Y="; }; patches = [ + # Remove changelog from menu (fetchpatch { - name = "exiv2-0.28.0-support-1.patch"; - url = "https://github.com/BestImageViewer/geeqie/commit/c45cca777aa3477eaf297db99f337e18d9683c61.patch"; - hash = "sha256-YiFzAj3G3Z2w7p+8zZlDBjWqUqnfSqvaxMkESfPFdzc="; + url = "https://salsa.debian.org/debian/geeqie/-/raw/debian/master/debian/patches/Remove-changelog-from-menu-item.patch"; + hash = "sha256-0awKKTLg/gUZhmwluVbHCOqssog9SneFOaUtG89q0go="; }) + # Fix missing execute permissions for geocode-parametres.awk plugin (fetchpatch { - name = "exiv2-0.28.0-support-2.patch"; - url = "https://github.com/BestImageViewer/geeqie/commit/b04f7cd0546976dc4f7ea440648ac0eedd8df3ce.patch"; - hash = "sha256-V0ZOHbAZOrhLcNN+Al1/kvxvbw0vc/R7r99CegjuBQg="; - }) - (fetchpatch { - name = "fix-compilation-with-lua.patch"; - url = "https://github.com/BestImageViewer/geeqie/commit/a132645ee87e612217ac955b227cad04f21a5722.patch"; - hash = "sha256-BozarBPoIKxZS3qpjuzHHAWZGIWZAwvJyqsNC8v+TMk="; + url = "https://github.com/BestImageViewer/geeqie/commit/4d3ddcf5b9c0668bfdaf1dfe24219ee57c2f0237.patch"; + hash = "sha256-Na2qiwCTbOv1yt251oaSZiLaOwJCkjWew+us4lQju0I="; }) ]; @@ -54,8 +50,29 @@ stdenv.mkDerivation rec { postInstall = '' # Allow geeqie to find exiv2 and exiftran, necessary to # losslessly rotate JPEG images. + # Requires exiftran (fbida package) and exiv2. sed -i $out/lib/geeqie/geeqie-rotate \ -e '1 a export PATH=${lib.makeBinPath [ exiv2 fbida ]}:$PATH' + # Zenity and yad are used in some scripts for reporting errors. + # Allow change quality of image. + # Requires imagemagick and yad. + sed -i $out/lib/geeqie/geeqie-resize-image \ + -e '1 a export PATH=${lib.makeBinPath [ imagemagick yad ]}:$PATH' + # Allow to crop image. + # Requires imagemagick, exiv2 and exiftool. + sed -i $out/lib/geeqie/geeqie-image-crop \ + -e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool gnome.zenity ]}:$PATH' + # Requires gphoto2 and libnotify + sed -i $out/lib/geeqie/geeqie-tethered-photography \ + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity libnotify ]}:$PATH' + # Import images from camera. + # Requires gphoto2. + sed -i $out/lib/geeqie/geeqie-camera-import \ + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity ]}:$PATH' + # Export jpeg from raw file. + # Requires exiv2, exiftool and lcms2. + sed -i $out/lib/geeqie/geeqie-export-jpeg \ + -e '1 a export PATH=${lib.makeBinPath [ gnome.zenity exiv2 exiftool lcms2 ]}:$PATH' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 7f97818c7452..40530d16391f 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4918"; + version = "4919"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-oQ/2KY6xA/kwAroHiPqcIJlcPsTTeStUu8WN/95ZUTw="; + sha256 = "sha256-WMFZEGTXVAaBlEKUqclmkw3pKnWSdbvulDvSi7TQn8k="; }; patches = [ diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 13eafe35d655..263169fff80a 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "123.0.2420.53"; + version = "124.0.2478.19"; revision = "1"; - hash = "sha256-6mE/zxVvGYrI7Emk5RBW+GC5W1FbVPFUeKMjev1yeFQ="; + hash = "sha256-+CanF7AadFQJj3t8OnZyoxPG2f2KO2e+EVBofKG3slg="; }; dev = import ./browser.nix { channel = "dev"; - version = "124.0.2464.2"; + version = "125.0.2492.1"; revision = "1"; - hash = "sha256-vNvSzoVSVewTbKrnE6f+0Hx/1N5gOvRcdRGsmunBJHA="; + hash = "sha256-S6DfXJfxR8FsHyRtCcvUialaVYP/1rPivjRVSm9XAtg="; }; stable = import ./browser.nix { channel = "stable"; - version = "123.0.2420.53"; + version = "123.0.2420.81"; revision = "1"; - hash = "sha256-7C6wZCIRodqWKimbnUl32TOhizsiE3U/be3tlpSNtt0="; + hash = "sha256-3c4DHs0p2YDW17nzCXB+O6PR9wTMb9h98EvN11imvsM="; }; } diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 74635d158829..b9ced38b5fe4 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DIEWmXqs4yNIJsBBhH7khOY6RJQ9qRoSTIHN/aeBuA4="; + hash = "sha256-9lzzjb6tDfgqjAT9mS/cWfC6ucNXoJ8JJwtZ0FZqlDA="; }; - cargoHash = "sha256-5946aMSndBkXCY0jjnhPc5x9wFOC1zjJNkFkMFFOuxo="; + cargoHash = "sha256-yeijJl94v+yKMVnU/Fjzapab/nExlvoznrx8Ydz/RvM="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/by-name/ga/garnet/deps.nix b/pkgs/by-name/ga/garnet/deps.nix new file mode 100644 index 000000000000..daad19f76445 --- /dev/null +++ b/pkgs/by-name/ga/garnet/deps.nix @@ -0,0 +1,88 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Azure.Core"; version = "1.25.0"; sha256 = "0wyrv74kqrr0scfz84sxniab88412fi91dw2h7sv315x2qkvindz"; }) + (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.14.1"; sha256 = "1k7jsin7p7zzqbfxvfz5xrzb46vqbbn569m3hd498mvf2f664yz4"; }) + (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.13.0"; sha256 = "06ngbyrqabnmbwac7p0yhayjvva7nj6cb3n9agmhd5mvrwhanbvf"; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.27"; sha256 = "11sfm0vb8grybwdfzl9y3y1v9jg94rn3fpsf0995xm1qgk57piiv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.16"; sha256 = "1nrk00w3jkb1r3m8zn7c05snan02b6s7n5s93aq2dl9kz0bm530c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.27"; sha256 = "078vz7l3sw25jxkhxf646hwc1csasna4n04rjq6vcv30c9kx3lp9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.16"; sha256 = "0g4zxka97q3bdc72yql296hx2laim5b4rfb8vxmknzdpzj0ydiks"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.27"; sha256 = "0cdvdbvvbky0y60732j2n2jjycgpm2ngx38hl6zq198xm1d4g43x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.16"; sha256 = "0zy1zarikg4d1g06ax3zdjvfysw2393b9fgg7xnracqi17hr38ah"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.27"; sha256 = "11l2a80xxinf08m9i6jdy0nkjpdjs9llqb8gs7x0762cnyhds7la"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.16"; sha256 = "1wgmbbn81rbqlx44hg9zqrrcmiinss1qhgfsq37vzy2i8ycyn59w"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.27"; sha256 = "0r7qqwkqm9lraqwc25aadbg856v006h17yj8cxmp800iz7288k07"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.16"; sha256 = "1ggcy57k31bxqk6k1hsbmzxkyly9bzch7dw7fgl2yx4a439nkh54"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "7.0.0"; sha256 = "1f5fhpvzwyrwxh3g1ry027s4skmklf6mbm2w0p13h0x6fbmxcb24"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "7.0.0"; sha256 = "1m8ri2m3vlv9vzk0068jkrx0vkk4sqmk1kxmn8pc3wys38d38qaf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.28.1"; sha256 = "0g5a5w34263psh90mp1403m9bh3pcfw6z29vlzdpllzbifk0licr"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.34.0"; sha256 = "0dgn51k142f73l6fk4bsqrpwqhcw6s8y98548kczbzy7qxcnyp82"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.34.0"; sha256 = "0c01dqya958z9ypf0155aqdkvkz9j4j5mgnygxzkisri2cs2w7gs"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.28.1"; sha256 = "15bq83wi4h8f1lqinijdqd7vg6n2v77hyza20mjqcp1h3hl2vj43"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.34.0"; sha256 = "0fm4nrihhqn4wrcj2q06rzfrfzgzilb7ch3izkv89c4q74x0yhkb"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.28.1"; sha256 = "03zmp6bsxg4chm89pl5sh506jc19aljxbfsvbqazcci5wqyacnr8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.28.1"; sha256 = "0p1ib8559h2i290v7qyz8rq2aybdknplx1p36ylik695l7b3rqvm"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.28.1"; sha256 = "0ckpjjdy2rv1z7ivqrkc7z16rcqygxzs0la80g8df68p4xxfa0c5"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.34.0"; sha256 = "1vkjwryz4wdsaawfq3r80qrmfiyv2zp9y6fzkf2014sqw4nf1vwl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.27"; sha256 = "0p0apwm7xpwwvjl453livb8ngvc0izjp5yfpgv116vhig2mxszsa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.16"; sha256 = "0wxa2mm34l32324rywns3bphxrkxm265wxck93z030klwvxdalri"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.27"; sha256 = "1vglh2l7brp6qbdngiiwsjwsp3cyzbzjcjw7dwqhfk0whc7n96kg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.16"; sha256 = "1xiq43br5lk1xa4d4wzhdpn9lz3mixmyxggzbsf4i4q5692rv35f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.27"; sha256 = "14zd7mgl866bhqqrcb6q3xbwrllks1nmfzhnbm8rf7h5cqqrqwbn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.16"; sha256 = "0ln013191h2rkhm8xss4aqbb52ywp44rjfnn7pip99wdx66bkazs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.27"; sha256 = "1kf3sm7hkqz5a4y5rb49yna10041f1h3lcqx885xlbhyb4q67gi9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.16"; sha256 = "1b8w278n8hcxysjs56ghx4pdbfall66nnmk1kx5a0my7lp7yp6xf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.27"; sha256 = "15fwbjq2r406fq175j2lsh4f91iiipmvaq96nsba3q2fh0c433zm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.16"; sha256 = "19lnkab2p8nkfc4jag0whkv51v3qabwdyzjk6xgj61i6s8lnnz1f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.27"; sha256 = "1dxvssf7rx05bipj03g8jm36j2mmdm13sg8rdwn6aa6whbwpip0r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.16"; sha256 = "1qb3pk1kgvwjc2n4kqfx4bqjmaihjf8cd9cfkqkkwmnnw9jd7f83"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.27"; sha256 = "1j913pm78h35kvcm70276cnfvjn1r7r6jsc3jm1y0vb395qy6nfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.16"; sha256 = "1w41xwdikkyplxr1kqfn1fwjvbglgsaripgdglhdx9qdxgr3nfi3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.27"; sha256 = "1mbjbj9c7sxw0hfq25ypv56hi9kik3vrrvr8ika3wcwv1ilpvczj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.16"; sha256 = "0xgd5nj5nx3w3m9cbh3b6r0c2w5svxjkslwqq35w445vjhq435fz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.27"; sha256 = "0dr1y76wgkqnkjxk5m8ps2g086sn4kp3a04v0ynarw5j0cipg994"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.16"; sha256 = "0mghc3ihk2j60yyrb57k200ddmhj5impl81lldpxxx9821pb0qha"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.6.0"; sha256 = "07pff0y96hj0k0izgmqlxydnx8cpsvfymicwi4m3dix979sdly09"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.34.0"; sha256 = "150ybq4ba9sm3c37d758ngja6wz72f0840d8vfs6bhy6pw0svzwy"; }) + (fetchNuGet { pname = "System.Interactive.Async"; version = "6.0.1"; sha256 = "17zzdxx7ibfwnxspxxi197a0gfgcqdzgrcza8dlwj13yi9vf8b73"; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) + (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) +] diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix new file mode 100644 index 000000000000..4684f924750b --- /dev/null +++ b/pkgs/by-name/ga/garnet/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + garnet, + dotnetCorePackages, +}: +buildDotnetModule { + pname = "garnet"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "garnet"; + rev = "v${garnet.version}"; + hash = "sha256-elUmM9Yw1/gazIV194P+noIm7ajQpRTccEhD5gN9D2Q="; + }; + + projectFile = "main/GarnetServer/GarnetServer.csproj"; + nugetDeps = ./deps.nix; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + dotnetInstallFlags = ["-f" "net8.0"]; + + meta = with lib; { + mainProgram = "GarnetServer"; + description = "A remote cache-store from Microsoft Research"; + longDescription = '' + A remote cache-store that offers strong performance, scalability, + storage, recovery, cluster sharding, key migration, replication features, + and compatibility with existing Redis clients + ''; + homepage = "https://microsoft.github.io/garnet/"; + changelog = "https://github.com/microsoft/garnet/releases/tag/v${garnet.version}"; + license = licenses.mit; + maintainers = with maintainers; [getchoo]; + }; +} diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/by-name/gv/gvisor/package.nix similarity index 87% rename from pkgs/applications/virtualization/gvisor/default.nix rename to pkgs/by-name/gv/gvisor/package.nix index 0a1d737b2eed..ceb122a2c08d 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/by-name/gv/gvisor/package.nix @@ -10,7 +10,7 @@ buildGoModule { pname = "gvisor"; - version = "20240311.0-unstable-2024-03-25"; + version = "20240401.0"; # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go) # that can be used to build gvisor without bazel. @@ -19,8 +19,8 @@ buildGoModule { src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "b1e227737fd6e3bb3b11a403a1a5013bc89b3b60"; - hash = "sha256-EfXzXkoEgtEerNMacRhbITCRig+t23WlIRya0BlJZcE="; + rev = "9d995324d058812a5476f8c06b20167012511e9c"; + hash = "sha256-idgUEbYAfnm/HphVs12Sj1FwG+jmL2BBr0PJnG9BC3A="; }; vendorHash = "sha256-jbMXeNXzvjfJcIfHjvf8I3ePjm6KFTXJ94ia4T2hUs4="; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 4c08223458b8..6e4a404f4f87 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-/mWXtAu+4B0VTZsID7FOQkSnuTxOLUUrl+vubqPClCw="; + hash = "sha256-NMDPOvSTBEw0469BKEAjL5T/OfVw807KESOpflNe3GI="; }; - cargoHash = "sha256-iMRcQL7/Q/9UmwPwaQslMruyUQ2QSU+5y7VNeAFMzk8="; + cargoHash = "sha256-50fJ7Pb4MLICv3JkeeqiXEcu5cYYU0653YYWEd8HlJU="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/ng/ngrid/package.nix b/pkgs/by-name/ng/ngrid/package.nix new file mode 100644 index 000000000000..b609689663ec --- /dev/null +++ b/pkgs/by-name/ng/ngrid/package.nix @@ -0,0 +1,69 @@ +{ lib +, fetchFromGitHub +, python3 +, expect +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ngrid"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "twosigma"; + repo = "ngrid"; + rev = version; + hash = "sha256-69icp0m+bAHBsQFIDGd8NjfMsMYsB1sUfzuP/OBl5jc="; + }; + + nativeBuildInputs = [ + python3.pkgs.setuptools + python3.pkgs.wheel + ]; + + propagatedBuildInputs = [ + python3.pkgs.six + python3.pkgs.numpy + python3.pkgs.pytz + python3.pkgs.pandas + ]; + + pythonImportsCheck = [ "ngrid.main" ]; + + nativeCheckInputs = [ python3.pkgs.pytest expect ]; + checkPhase = '' + runHook preCheck + + pytest test/formatters.py + + echo -e "a,b,c\n1.98423,some string,5824.2" > test.csv + + expect <=3.1.0 <4.0.0", - "flutter": ">=3.13.0" + "dart": ">=3.2.0 <4.0.0", + "flutter": ">=3.16.0" } } diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix index 9b6ac34559c7..0b2e17aee851 100644 --- a/pkgs/by-name/st/stirling-pdf/package.nix +++ b/pkgs/by-name/st/stirling-pdf/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; - version = "0.22.7"; + version = "0.22.8"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; - hash = "sha256-BB9O5nf47IrBbrnjU1sWw6xKT4XR1c+fWrno4liH5Xs="; + hash = "sha256-wFxIMubZ6327iBRyHxeo/hsPyq572gk6K8waJ3KyMEw="; }; patches = [ diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix index e15ab121a41f..6026a107f70b 100644 --- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix +++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix @@ -45,26 +45,37 @@ stdenvNoCC.mkDerivation rec { propagatedUserEnvPkgs = [ ] ++ lib.optional (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ] - ++ lib.optional (lib.elem "qt6" variants) [ qt6.qt5compat ]; + ++ lib.optional (lib.elem "qt6" variants) [ + qt6.qt5compat + qt6.qtsvg + ]; installPhase = '' mkdir -p $out/share/sddm/themes/ '' - + lib.optionalString (lib.elem "qt6" variants) '' - cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ - '' - + lib.optionalString (lib.elem "qt5" variants) '' - cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ - '' - + lib.optionalString (lib.isAttrs themeConfig) '' - ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user - ''; + + lib.optionalString (lib.elem "qt6" variants) ( + '' + cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ + '' + + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user + '' + ) + + lib.optionalString (lib.elem "qt5" variants) ( + '' + cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ + '' + + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user + '' + ); meta = with lib; { description = "The most minimalistic SDDM theme among all themes"; homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ name-snrl ]; }; } diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index 2a27122da5db..8d4467e3abad 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "pop-icon-theme"; - version = "3.3.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "pop-os"; repo = "icon-theme"; rev = "v${version}"; - sha256 = "sha256-7cDXEkqtPNQsyZvuYZhBSgAYshkDlP8o8umWGbNLtjw="; + sha256 = "sha256-V8xBZj6T4Ly/GHV0CVLZ1a4UZbmCkhYRe05qUfJk7Wg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 08909063ce46..a5a3de81bd5a 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -1,6 +1,5 @@ { cmake , fetchFromGitHub -, fetchgit , git , lib , libffi @@ -28,7 +27,7 @@ # Build with libc++ (LLVM) rather than stdlibc++ (GCC). # This is experimental and not all features work. -, useLLVMLibcxx ? false +, useLLVMLibcxx ? clangStdenv.isDarwin }: let @@ -53,7 +52,7 @@ let clingSrc = fetchFromGitHub { owner = "root-project"; repo = "cling"; - rev = "v1.0"; + rev = "v${version}"; sha256 = "sha256-Ye8EINzt+dyNvUIRydACXzb/xEPLm0YSkz08Xxw3xp4="; }; @@ -66,8 +65,6 @@ let patches = [ ./no-clang-cpp.patch - - # ./force-install-cling-targets.patch ]; nativeBuildInputs = [ python3 git cmake ]; @@ -122,10 +119,10 @@ let cxxFlags = if useLLVMLibcxx then [ "-I" "${lib.getDev llvmPackages_13.libcxx}/include/c++/v1" "-L" "${llvmPackages_13.libcxx}/lib" - "-l" "${llvmPackages_13.libcxx}/lib/libc++.so" + "-l" "${llvmPackages_13.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}" ] else [ "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}" - "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/x86_64-unknown-linux-gnu" + "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/${stdenv.hostPlatform.config}" ]; # The flags passed to the wrapped cling should diff --git a/pkgs/development/interpreters/cling/force-install-cling-targets.patch b/pkgs/development/interpreters/cling/force-install-cling-targets.patch deleted file mode 100644 index 627e2593298e..000000000000 --- a/pkgs/development/interpreters/cling/force-install-cling-targets.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tools/cling/cmake/modules/CMakeLists.txt b/tools/cling/cmake/modules/CMakeLists.txt ---- a/tools/cling/cmake/modules/CMakeLists.txt -+++ b/tools/cling/cmake/modules/CMakeLists.txt -@@ -54,10 +54,8 @@ set(CLING_CONFIG_EXPORTS_FILE) - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - get_property(cling_has_exports GLOBAL PROPERTY CLING_HAS_EXPORTS) -- if(cling_has_exports) -- install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR} -- COMPONENT cling-cmake-exports) -- endif() -+ install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR} -+ COMPONENT cling-cmake-exports) - - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/ClingConfig.cmake diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 84e2dbc05644..c2611a8b8dff 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,37 +1,72 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut, libX11, xorgproto -, libXi, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libGLU +, libGL +, freeglut +, libX11 +, libXcursor +, libXinerama +, libXrandr +, xorgproto +, libXi +, pkg-config +, Carbon +, Cocoa +, Kernel +, OpenGL +, settingsFile ? "include/box2d/b2_settings.h" +}: -stdenv.mkDerivation rec { +let + inherit (lib) cmakeBool optionals; + +in +stdenv.mkDerivation (finalAttrs: { pname = "box2d"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "erincatto"; repo = "box2d"; - rev = "v${version}"; - sha256 = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-cL8L+WSTcswj+Bwy8kSOwuEqLyWEM6xa/j/94aBiSck="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ]; + + buildInputs = [ + libGLU + libGL + freeglut + libX11 + libXcursor + libXinerama + libXrandr + xorgproto + libXi + ] ++ optionals stdenv.isDarwin [ + Carbon Cocoa Kernel OpenGL + ]; cmakeFlags = [ - "-DBOX2D_INSTALL=ON" - "-DBOX2D_BUILD_SHARED=ON" - "-DBOX2D_BUILD_EXAMPLES=OFF" + (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.doCheck) ]; prePatch = '' - cd Box2D - substituteInPlace Box2D/Common/b2Settings.h \ - --replace 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' + substituteInPlace ${settingsFile} \ + --replace-fail 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' ''; + # tests are broken on 2.4.1 and 2.3.x doesn't have tests: https://github.com/erincatto/box2d/issues/677 + doCheck = lib.versionAtLeast finalAttrs.version "2.4.2"; + meta = with lib; { description = "2D physics engine"; homepage = "https://box2d.org/"; - maintainers = [ maintainers.raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.zlib; }; -} +}) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 5ce8c4289dd1..6da6713a7f79 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -30,6 +30,11 @@ let version = "6.1.1"; hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo="; }; + + v7 = { + version = "7.0"; + hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; + }; in rec { @@ -45,6 +50,10 @@ rec { ffmpeg_6-headless = mkFFmpeg v6 "headless"; ffmpeg_6-full = mkFFmpeg v6 "full"; + ffmpeg_7 = mkFFmpeg v7 "small"; + ffmpeg_7-headless = mkFFmpeg v7 "headless"; + ffmpeg_7-full = mkFFmpeg v7 "full"; + # Please make sure this is updated to the latest version on the next major # update to ffmpeg # Packages which use ffmpeg as a library, should pin to the relevant major diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index cf10ac50d698..259e6e03edea 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -414,6 +414,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e06ce6d2b45edac4a2df04f304e18d4727417d24"; hash = "sha256-73mlX1rdJrguw7OXaSItfHtI7gflDrFj+7SepVvvUIg="; } + ]) + ++ (lib.optionals (lib.versionAtLeast version "7.0") [ + { + # Will likely be obsolete in >7.0 + name = "fate_avoid_dependency_on_samples"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834"; + hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I="; + } ])); configurePlatforms = []; diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index 0f7859be9dbb..bcc676b1b040 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -1,23 +1,18 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "libhugetlbfs"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "https://github.com/libhugetlbfs/libhugetlbfs/releases/download/${version}/libhugetlbfs-${version}.tar.gz"; - sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp"; + hash = "sha256-1QHfqRyOrREGlno9OCnyunOMP6wKZcs1jtKrOHDdxe8="; }; - patches = [ - (fetchurl { - url = "https://build.opensuse.org/public/source/openSUSE:Factory/libhugetlbfs/glibc-2.34-fix.patch?rev=50"; - sha256 = "sha256-eRQa6M0ZdHMtwA5nnzDTWYv/x4AnRZhj+MpDiwyCvVM="; - }) - ]; - outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; + nativeBuildInputs = [ autoreconfHook ]; + postConfigure = '' patchShebangs ld.hugetlbfs ''; @@ -43,6 +38,8 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-docs" ]; meta = with lib; { + homepage = "https://github.com/libhugetlbfs/libhugetlbfs"; + changelog = "https://github.com/libhugetlbfs/libhugetlbfs/blob/${version}/NEWS"; description = "library and utilities for Linux hugepages"; maintainers = with maintainers; [ qyliss ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index e1e69b9f10b4..0c50c9e3649b 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,31 +1,51 @@ -{lib, stdenv, qtdeclarative, fetchFromGitHub, qmake }: +{ lib, stdenv, qtbase, qtdeclarative, fetchFromGitHub, cmake, pkg-config, box2d }: + +let + inherit (lib) cmakeBool; + + # 2.3.1 is the only supported version + box2d' = (box2d.override { settingsFile = "Box2D/Common/b2Settings.h"; }).overrideAttrs (old: rec { + version = "2.3.1"; + src = fetchFromGitHub { + owner = "erincatto"; + repo = "box2d"; + rev = "v${version}"; + hash = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs="; + }; + sourceRoot = "source/Box2D"; + cmakeFlags = old.cmakeFlags or [ ] ++ [ + (cmakeBool "BOX2D_INSTALL" true) + (cmakeBool "BOX2D_BUILD_SHARED" true) + (cmakeBool "BOX2D_BUILD_EXAMPLES" false) + ]; + }); + +in stdenv.mkDerivation { pname = "qml-box2d"; - version = "unstable-2018-04-06"; + version = "unstable-2022-08-25"; + src = fetchFromGitHub { owner = "qml-box2d"; repo = "qml-box2d"; - sha256 = "0gb8limy6ck23z3k0k2j7c4c4s95p40f6lbzk4szq7fjnnw22kb7"; - rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62"; + rev = "0bb88a6f871eef72b3b9ded9329c15f1da1f4fd7"; + hash = "sha256-sfSVetpHIAIujpgjvRScAkJRlQQYjQ/yQrkWvp7Yu0s="; }; dontWrapQtApps = true; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtdeclarative ]; + nativeBuildInputs = [ cmake pkg-config ]; - patchPhase = '' - substituteInPlace box2d.pro \ - --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" - qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out" - ''; + buildInputs = [ box2d' qtbase qtdeclarative ]; - installFlags = [ "INSTALL_ROOT=$(out)" ]; + cmakeFlags = [ + (cmakeBool "USE_SYSTEM_BOX2D" true) + ]; meta = with lib; { description = "A QML plugin for Box2D engine"; homepage = "https://github.com/qml-box2d/qml-box2d"; - maintainers = [ maintainers.guibou ]; + maintainers = with maintainers; [ guibou ]; platforms = platforms.linux; license = licenses.zlib; }; diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 65f15fa639d5..10c311c220c9 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -1,44 +1,57 @@ -{ lib -, aiomisc-pytest -, aiormq -, buildPythonPackage -, fetchFromGitHub -, pamqp -, poetry-core -, pytestCheckHook -, pythonOlder -, shortuuid -, yarl +{ + lib, + aiomisc-pytest, + aiormq, + buildPythonPackage, + docker, + fetchFromGitHub, + pamqp, + poetry-core, + pytestCheckHook, + pythonOlder, + shortuuid, + testcontainers, + wrapt, + yarl, }: buildPythonPackage rec { pname = "aio-pika"; - version = "9.4.0"; + version = "9.4.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mosquito"; repo = "aio-pika"; rev = "refs/tags/${version}"; - hash = "sha256-EntV/CBvT4II4nxsVe3KjNA4EPV7Oc6h2G0fX0fHKTU="; + hash = "sha256-aRXYFW4fl3iXH3bwP30+TllRm4BkIUcGMX/lNfhiqjo="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiormq yarl ]; nativeCheckInputs = [ aiomisc-pytest + docker pamqp pytestCheckHook shortuuid + testcontainers + wrapt + ]; + + disabledTests = [ + # Tests attempt to connect to a RabbitMQ server + "test_connection_interleave" + "test_connection_happy_eyeballs_delay" + "test_robust_connection_interleave" + "test_robust_connection_happy_eyeballs_delay" ]; disabledTestPaths = [ @@ -53,9 +66,7 @@ buildPythonPackage rec { "tests/test_types.py" ]; - pythonImportsCheck = [ - "aio_pika" - ]; + pythonImportsCheck = [ "aio_pika" ]; meta = with lib; { description = "AMQP 0.9 client designed for asyncio and humans"; diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 33f3c963f5ea..51ae6eb2509f 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.14"; + version = "0.4.16"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-KlQKRcgxaWqRKIusnZGoBDEfKYF1Gn9EkrhJAftdUTc="; + hash = "sha256-rtZRl1doTBg8CdX0p9fLzo6m2dx8YKCQOOZyvIPSr9A="; }; prePatch = '' diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 54faa5fd47c8..ee6a1eb6bc64 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -1,30 +1,31 @@ -{ lib -, buildPythonPackage -, clarifai-grpc -, fetchFromGitHub -, inquirerpy -, llama-index-core -, numpy -, opencv4 -, pandas -, pillow -, pycocotools -, pypdf -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, rich -, schema -, setuptools -, tabulate -, tqdm -, tritonclient +{ + lib, + buildPythonPackage, + clarifai-grpc, + fetchFromGitHub, + inquirerpy, + llama-index-core, + numpy, + opencv4, + pandas, + pillow, + pycocotools, + pypdf, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + rich, + schema, + setuptools, + tabulate, + tqdm, + tritonclient, }: buildPythonPackage rec { pname = "clarifai"; - version = "10.2.1"; + version = "10.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,21 +34,16 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-jI85xMApeEd0Hl6h4Am5qxWoSSTWHsmb7FxUjJPmBQM="; + hash = "sha256-8EPs6kGB+Px9Fs2Z+YwDcmEYI5+z/kOIKLraJFMykF0="; }; - pythonRelaxDeps = [ - "clarifai-grpc" - ]; + pythonRelaxDeps = [ "clarifai-grpc" ]; - pythonRemoveDeps = [ - "opencv-python" - ]; + pythonRemoveDeps = [ "opencv-python" ]; - build-system = [ - pythonRelaxDepsHook - setuptools - ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ clarifai-grpc @@ -67,14 +63,10 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - all = [ - pycocotools - ]; + all = [ pycocotools ]; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) @@ -99,9 +91,7 @@ buildPythonPackage rec { "clarifai/models/model_serving/repo_build/static_files/base_test.py" ]; - pythonImportsCheck = [ - "clarifai" - ]; + pythonImportsCheck = [ "clarifai" ]; meta = with lib; { description = "Clarifai Python Utilities"; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 18a126dd3822..a15ce6edf0f7 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -1,19 +1,20 @@ -{ lib -, beautifulsoup4 -, buildPythonPackage -, fetchPypi -, llama-index-core -, poetry-core -, pymupdf -, pypdf -, pythonOlder -, pythonRelaxDepsHook -, striprtf +{ + lib, + beautifulsoup4, + buildPythonPackage, + fetchPypi, + llama-index-core, + poetry-core, + pymupdf, + pypdf, + pythonOlder, + pythonRelaxDepsHook, + striprtf, }: buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.13"; + version = "0.1.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-gw8G7Hs0Q3/Du18mjSNcXHZAKWrbFI2Pkid9zrfwhG0="; + hash = "sha256-mAh9mDofLSaWGAUhfxPSSw8jy76OMtIyeuhrHuZo07I="; }; pythonRelaxDeps = [ @@ -29,14 +30,9 @@ buildPythonPackage rec { "pypdf" ]; - pythonRemoveDeps = [ - "bs4" - ]; + build-system = [ poetry-core ]; - build-system = [ - poetry-core - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ beautifulsoup4 @@ -49,9 +45,7 @@ buildPythonPackage rec { # Tests are only available in the mono repo doCheck = false; - pythonImportsCheck = [ - "llama_index.readers.file" - ]; + pythonImportsCheck = [ "llama_index.readers.file" ]; meta = with lib; { description = "LlamaIndex Readers Integration for files"; diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index de1ae5e6c72e..7a57a73338ad 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, griffe -, mkdocs-material -, mkdocstrings -, pdm-backend -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + griffe, + mkdocs-material, + mkdocstrings, + pdm-backend, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.9.0"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,14 +21,12 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-RzyOhlfjLtiG5jelrRG8yS7AWQJuaJMVuNkGpNBGO64="; + hash = "sha256-UJSDnkdohFn+U7i5fYiRVMLZZ8Nyb0fdihBZl2z2RBc="; }; - nativeBuildInputs = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ griffe mkdocstrings ]; @@ -37,9 +36,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "mkdocstrings_handlers" - ]; + pythonImportsCheck = [ "mkdocstrings_handlers" ]; meta = with lib; { description = "Python handler for mkdocstrings"; diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 3f472ef12733..3c52cc3f49aa 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -1,38 +1,39 @@ -{ lib -, asgiref -, buildPythonPackage -, certifi -, charset-normalizer -, cvss -, deepl -, django -, fetchFromGitHub -, gql -, idna -, markdown-it-py -, mdurl -, pygments -, pytest -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, reptor -, requests -, rich -, setuptools -, sqlparse -, termcolor -, tomli -, tomli-w -, tomlkit -, urllib3 -, xmltodict +{ + lib, + asgiref, + buildPythonPackage, + certifi, + charset-normalizer, + cvss, + deepl, + django, + fetchFromGitHub, + gql, + idna, + markdown-it-py, + mdurl, + pygments, + pytest, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + reptor, + requests, + rich, + setuptools, + sqlparse, + termcolor, + tomli, + tomli-w, + tomlkit, + urllib3, + xmltodict, }: buildPythonPackage rec { pname = "reptor"; - version = "0.17"; + version = "0.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,15 +42,14 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-3GINDFKgvFv03xF+77K+sTKSm0+kLF5m70dQ/iksZeM="; + hash = "sha256-sojU2Asop0b/b/gfKXoRseuT1zHEO00JNrRWhMYh0Vo="; }; pythonRelaxDeps = true; - build-system = [ - pythonRelaxDepsHook - setuptools - ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ asgiref @@ -74,12 +74,8 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - ghostwriter = [ - gql - ] ++ gql.optional-dependencies.aiohttp; - translate = [ - deepl - ]; + ghostwriter = [ gql ] ++ gql.optional-dependencies.aiohttp; + translate = [ deepl ]; }; nativeCheckInputs = [ @@ -91,9 +87,7 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; - pythonImportsCheck = [ - "reptor" - ]; + pythonImportsCheck = [ "reptor" ]; disabledTestPaths = [ # Tests want to use pip install dependencies @@ -104,7 +98,6 @@ buildPythonPackage rec { # Tests need network access "TestDummy" "TestIntegration" - ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index b570fa8541fe..5efe78255f18 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1124"; + version = "3.0.1125"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-ubQI4+5WYj3zWikDaRMunyObxW6dqDxOQ4nTv/8/sv4="; + hash = "sha256-4oof7FDgwTORGnaI+C5pTd1Fj5EgyBFfsVJPhRhu96o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/development/tools/ttfb/default.nix index e8a86c21bc5d..145144528fef 100644 --- a/pkgs/development/tools/ttfb/default.nix +++ b/pkgs/development/tools/ttfb/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "ttfb"; - version = "1.10.0"; + version = "1.11.0"; src = fetchCrate { inherit pname version; - hash = "sha256-94gBofb7H7+qU50+cp+rq14Vtbk2vuXFQksNITvICm4="; + hash = "sha256-38mhwYfWoMZzdbkgv65hBpX23wCpAWwiahuzO5xRpmA="; }; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-CUisxtUQXkStqSZikIoAN0GwpUjvQqon7KqI0beHL5U="; + cargoHash = "sha256-Gqv4XvG3aYMRdMP1mzUlsCPN+NMLHq2nf283KBQCems=="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix index ef01000065f8..92031aa6dddf 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.26.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-xlPBz0FVG/bAUGH/RlguVG5rDcKMty7rX8Y+1VBbEpI="; + sha256 = "sha256-74kmEjJTcFYRgbuH8hFPS+sadVWk7FkFE+MrapQw/lw="; }; - vendorHash = "sha256-1NhcP/iEfEMtPSBP6wbTKi/fznoJ8HjaH88BPzVnf7w="; + vendorHash = "sha256-hNEM8U+3T4biEqGoN2ClKLSgKlfT/eoUkQQGiTrR2vM="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index d51cb21750fd..bc96eb5cfcc3 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, imagemagick , gettext, glibcLocalesUtf8, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, zlib +, libiconv , gitUpdater }: @@ -17,7 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ imagemagick ]; - buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; + buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; makeFlags = [ "FHEROES2_STRICT_COMPILATION=1" @@ -67,6 +69,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = [ maintainers.karolchmist ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 786df2273522..c8db9c5c5df9 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -22,13 +22,13 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.3-unstable-2024-03-30"; - rev = "deb7a84231aff8d772bb4ce9fa486d1886f1a2b6"; + version = "2.2.3-unstable-2024-04-09"; + rev = "28520cad2500b60ce8653e431990e33f77ff08f7"; isUnstable = true; tests = [ nixosTests.zfs.unstable ]; - hash = "sha256-d9ZoUFuHPmJmIBbJKENVTCTJ5U3As+3NYHk9ghWxCCA="; + hash = "sha256-lGoiTmCWOxqACSYY0WA0gN6CN/1FyYhSVHmtYC1Izhg="; } diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 0b9fc0523bf1..d55258485de5 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -219,6 +219,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage rec { requests scp semver + setuptools six sshtunnel tabulate diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index fb718c567c62..d8a42d82ed34 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.96.0"; + version = "0.97.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-/QGRxQRkVXuP3H6AWSqc1U7sA1n0jTNYLa+gQA25Q5M="; + hash = "sha256-0zTEaSylZEU7mCCrMf9aV8V0MMD4Au4y0zacWSLcujg="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-n548376djwz4Qd9vlid0V9Dr9trLb09gKOP4J+9Znp4="; + vendorHash = "sha256-/8WxTtTTuwdPP/4Bix8d9nkR/w6MDKLyumv4KBx5VqU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index a9a842f8451d..6395412e412c 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.23.0"; + version = "2.23.1"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-ucuksG3T4cI/cuEsHe4+7RtY+n05p3RvW/tijZ49lVY="; + sha256 = "sha256-5VoRl7pA37QJkgQ6ClyTC6Ya4ZLuVs6aqiAwk1kBFMY="; }; - vendorHash = "sha256-ZWCwSiKoU/zXD9JJ/8qW2tiXWAMqkh0Md0MLz0V4P4E="; + vendorHash = "sha256-31QMyqJcyWYIq12EA/B0tip70yixFAi7EqIeeo11ZS8="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/tools/misc/rfc/default.nix b/pkgs/tools/misc/rfc/default.nix index 60d77bfbaca2..d747cbf185e4 100644 --- a/pkgs/tools/misc/rfc/default.nix +++ b/pkgs/tools/misc/rfc/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "rfc"; - version = "0.2.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "bfontaine"; repo = "rfc"; rev = "v${version}"; - hash = "sha256-dfaeTdJiJuKp8/k6LBP+RC60gTRHfHR5hhLD4ZWJufE="; + hash = "sha256-zN+MQtHh69PkzbrfceHFpBYCPmTg9qrOf/ML2efq6Xk="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index a88ead4f6f16..147388e08831 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "10.11.0"; + version = "10.11.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-z8pWAazoafyrsz3EmfhtHDBhmHHjkGFEIL5BftW79fg="; + hash = "sha256-rLKECheCsJldeiUn1PtOLN5T4y+pu8TGC95q11KF4NU="; }; proxyVendor = true; - vendorHash = "sha256-6MVl8QuzxzcyFVP04ikO7B4Gk17e0TA4hxmL17OehCo="; + vendorHash = "sha256-INkE3jOTrJGOqXj/M/s142CFdhN1XzbW1h6SKmlbhJw="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch index 7fb7d53e352f..7378878a648a 100644 --- a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch +++ b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch @@ -1,3 +1,16 @@ +From ffb6777d58f068db7e14372415154cd93f77766e Mon Sep 17 00:00:00 2001 +From: roblabla +Date: Wed, 31 Jan 2024 13:19:55 +0100 +Subject: [PATCH] Use com.google.protobuf:protobuf-gradle-plugin + +--- + Ghidra/Debug/Debugger-gadp/build.gradle | 7 +- + Ghidra/Debug/Debugger-isf/build.gradle | 8 +- + Ghidra/Debug/Debugger-rmi-trace/build.gradle | 14 +-- + build.gradle | 6 ++ + gradle/debugger/hasProtobuf.gradle | 94 -------------------- + 5 files changed, 26 insertions(+), 103 deletions(-) + diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle index 9e1c57faf..3a3242eb5 100644 --- a/Ghidra/Debug/Debugger-gadp/build.gradle @@ -43,7 +56,7 @@ index d135294a0..785681ca2 100644 api project(':Framework-AsyncComm') api project(':Framework-Debugging') diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle -index eec00786e..666cccafc 100644 +index 40fbc17ab..7517ffe6e 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle +++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle @@ -18,12 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" @@ -63,17 +76,23 @@ index eec00786e..666cccafc 100644 + } +} dependencies { + api project(':Pty') api project(':Debugger') - } -@@ -36,7 +41,7 @@ task generateProtoPy { +@@ -44,12 +49,9 @@ task generateProtoPy { ext.outdir = file("build/generated/source/proto/main/py") outputs.dir(outdir) inputs.files(src) - dependsOn(configurations.protocArtifact) + dependsOn(protobuf.generateProtoTasks.all()) doLast { - def exe = configurations.protocArtifact.first() - if (!isCurrentWindows()) { +- def exe = configurations.protocArtifact.first() +- if (!isCurrentWindows()) { +- exe.setExecutable(true) +- } ++ def exe = protobuf.tools.protoc.path + exec { + commandLine exe, "--python_out=$outdir", "-I$srcdir" + args src diff --git a/build.gradle b/build.gradle index b0c717fb1..5f56506a5 100644 --- a/build.gradle @@ -92,10 +111,9 @@ index b0c717fb1..5f56506a5 100644 } else { diff --git a/gradle/debugger/hasProtobuf.gradle b/gradle/debugger/hasProtobuf.gradle -deleted file mode 100644 -index 23b4ce74b..000000000 +index 23b4ce74b..e69de29bb 100644 --- a/gradle/debugger/hasProtobuf.gradle -+++ /dev/null ++++ b/gradle/debugger/hasProtobuf.gradle @@ -1,94 +0,0 @@ -/* ### - * IP: GHIDRA @@ -191,3 +209,6 @@ index 23b4ce74b..000000000 - } -} -zipSourceSubproject.dependsOn generateProto +-- +2.42.0 + diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 8b9f2aaca007..cb658615f304 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -10,19 +10,18 @@ , icoutils , xcbuild , protobuf -, fetchurl }: let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "11.0"; + version = "11.0.2"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-LVtDqgceZUrMriNy6+yK/ruBrTI8yx6hzTaPa1BTGlc="; + hash = "sha256-Q5nolgqBG2LFVoEeEtzEPTt/cAHubPlRIFt3SYX9z1Y="; }; gradle = gradle_7; @@ -92,7 +91,7 @@ HERE ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-KT+XXowCNaNfOiPzYLwbPMaF84omKFobHkkNqZ6oyUA="; + outputHash = "sha256-nKfJiGoZlDEpbCmYVKNZXz2PYIosCd4nPFdy3MfprHc="; }; in stdenv.mkDerivation { @@ -106,13 +105,6 @@ in stdenv.mkDerivation { patches = [ ./0001-Use-protobuf-gradle-plugin.patch - # we use fetchurl since the fetchpatch normalization strips the whole diff - # https://github.com/NixOS/nixpkgs/issues/266556 - (fetchurl { - name = "0002-remove-executable-bit.patch"; - url = "https://github.com/NationalSecurityAgency/ghidra/commit/e2a945624b74e5d42dc85e9c1f992315dd154db1.diff"; - sha256 = "07mjfl7hvag2akk65g4cknp330qlk07dgbmh20dyg9qxzmk91fyq"; - }) ]; buildPhase = '' @@ -124,8 +116,6 @@ in stdenv.mkDerivation { sed -i "s#mavenLocal()#mavenLocal(); maven { url '${deps}/maven' }#g" build.gradle - rm -v Ghidra/Debug/Debugger-rmi-trace/build.gradle.orig - gradle --offline --no-daemon --info -Dorg.gradle.java.home=${openjdk17} buildGhidra ''; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 5e183e44ebab..1f95c78530b8 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-rcFgSblSXQUGu58cLbjGtvVfEa3AJUwkYEcrizqJTwM="; + hash = "sha256-xrIR2QVizORxR2OO09Qj5h8avv2xeIsQ+VfmlZotML8="; }; - vendorHash = "sha256-Ttv25D7GAFjbP25AcRfKPu4wT3SMroAAf3px48IWZLA="; + vendorHash = "sha256-s2h0ayBEuHUHcqYvyQTMNu9+NR5OVjzRshKzILDlrKs="; subPackages = [ "cmd/nuclei/" ]; diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index 94838c9a4d0e..d0c6e430e726 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -1,21 +1,22 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, python3 +{ + lib, + fetchFromGitHub, + rustPlatform, + python3, }: rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.27"; + version = "0.4.28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "sad"; rev = "refs/tags/v${version}"; - hash = "sha256-hb09YwF59I8zQ6dIrGkCWJ98VeB5EYoNloTGg5v2BIs="; + hash = "sha256-9zsNYUYUQ3RmJQN7uf+YQjywr7rRAIx5zz6EYkbN8/o="; }; - cargoHash = "sha256-wFmC19uGEaS8Rn+bKdljAZY24/AL9VDV183xXBjt79M="; + cargoHash = "sha256-OSVG1sFSLKkVsgI0I2mYTszcPGlfOL1Md/aCpMf6Eow="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index fcea411e1a73..33173396f267 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "5.1.1"; + version = "5.1.3"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZMBu8hewPuwpm64Oe6JselynEv04JTR/OTbpbmkfe3Y="; + hash = "sha256-ap0akp787pr1gRGFTGQ6ZPwkABgloqQ05XnmM7filGs="; }; buildInputs = [ diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 861b3e6b899e..9fa3c12ccc88 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "3.3.1"; + version = "3.4.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-6hj8fm2eCGQeWY3+eaJlKeZglJUSMY4/Yz2ySGp6m58="; + hash = "sha256-fD2KBKDfKTNYuzP/zKkAx9h/HMxOlAyiWtp9EsWxop8="; }; vendorHash = "sha256-HMzFLSmO6sBDNU89UoIvHcPPd3ubpti2ii4sFMKUDmI="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7023602a767c..967c5f0e679b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20381,7 +20381,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - box2d = callPackage ../development/libraries/box2d { }; + box2d = callPackage ../development/libraries/box2d { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL; + }; boxfort = callPackage ../development/libraries/boxfort { }; @@ -20872,6 +20874,9 @@ with pkgs; ffmpeg_6 ffmpeg_6-headless ffmpeg_6-full + ffmpeg_7 + ffmpeg_7-headless + ffmpeg_7-full ffmpeg ffmpeg-headless ffmpeg-full; @@ -31728,8 +31733,6 @@ with pkgs; gv = callPackage ../applications/misc/gv { }; - gvisor = callPackage ../applications/virtualization/gvisor { }; - guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; gwc = callPackage ../applications/audio/gwc { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index e136faf2fb29..eb04beaef279 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -65,6 +65,7 @@ makeScopeWithSplicing' { }; qcoro = callPackage ../development/libraries/qcoro { }; qgpgme = callPackage ../development/libraries/gpgme { }; + qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; qt6ct = callPackage ../tools/misc/qt6ct { };