diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
63 files changed, 370 insertions, 342 deletions
diff --git a/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index 1539c1693e64..f73e9a21457f 100644 --- a/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.9" else "8.10.12-10.BETA"; + version = if channel == "stable" then "8.10.16" else "8.10.16-43.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-Ef0ee41WVN46IOYbdyF1w8Ud2s7ncR71/5TFnQwOnVU="; + hash = "sha256-p9JTJUwPqJAAykhfVwlEkPlqgZ0h9VLQR3K2BYABn5I="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-IuRPCphagpx0jynJmhL9ETSzS0JaWCpDaodt0TDm7xs="; + hash = "sha256-RyG1QzmErwJi31pytlOjWE6QfhWjvZQuaTEtIEpg02k="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-KwMYxe6WpLFXaJ3jyEOc18IYO/pwZ7RiPF/7RN2c5xg="; + hash = "sha256-a2U6jmHMZY4PgigLCzTAOOtt5xOSV6sqJy7Tr2y2VvQ="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-MDc2Okc8nZbAPPn0ihoraDe9kNI5xx654DdTe7AlD3E="; + hash = "sha256-0LKAiY+eLYeWG/66d7n92aqI2nHZMijS0YM/d9TqYFo="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-SnfFd+ksJc69r7GGFUYCLH0NAwwiSxEDyaIRTrj/VWo="; + hash = "sha256-7udgyaj84rnh5yn2RuvZzjDC6QsVdHh7vkJrStlW93I="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-5PDlMe/EZNBkfIrf6se4B5TKVYycSSoqiv0iMEPiIrA="; + hash = "sha256-2c5pL5C3BgimI8D4+Be/FkKKDBflo5Oc24nzaI4Oa4Y="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-nn8lnn52MkKcFRluH9k8IoAu4vZ1C9Uk/+k6TQ6CKFs="; + hash = "sha256-f7Wme98qrmdzfipBoEEEa9PSOMiTqAica8gwKfZJLCE="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-ACeFyaDzo1I4w/9CrkQ5iO/JBHYRbxxzMDhTX4oI548="; + hash = "sha256-6hK+qEG5gUo8XBOnxYIC+x5L9ah8m6c6YS/WpIGjENo="; }; }; }; diff --git a/nixpkgs/pkgs/applications/misc/1password/default.nix b/nixpkgs/pkgs/applications/misc/1password/default.nix index d4dddd861f29..a4f0b957c991 100644 --- a/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }: +{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar, _1password, testers }: let inherit (stdenv.hostPlatform) system; @@ -63,6 +63,10 @@ stdenv.mkDerivation { $out/bin/${mainProgram} --version ''; + passthru.tests.version = testers.testVersion { + package = _1password; + }; + meta = with lib; { description = "1Password command-line tool"; homepage = "https://developer.1password.com/docs/cli/"; diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 5d335a5325d1..60b835c719b5 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.4.8.3"; + version = "5.4.9.3"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-ySiN5iPs+EtgzPJJpKvD7BR3Z2xa4HLnTEtqroW478w="; + hash = "sha256-Yp8hnMIeV+ZHY6yISJdFd1yAQipQsU5vcXgxFDvkGnA="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 3b621fe971be..5d353bfdf6b8 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -57,11 +57,11 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.31.0"; sha256 = "1amf0yp5fqdkrr2r6nscpw1h1r3gghhxbczk6j255smdhhy0dzv9"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.32.0"; sha256 = "0rc1d8pwypq44pr15wn8g52zbqz70swdrdmjlzccf6zvwy1vyqkc"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.7.0"; sha256 = "12m9fay2d7jvj00hfpws37vflpqvz4dy4gcm25bjycg1zyfpzvly"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -71,11 +71,11 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.3"; sha256 = "1f2b9ljc3l6lk2qq3ps6pzb5r4dvqvs9j1xav8kj2yy52i2dbz7r"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.0"; sha256 = "1srhqqmnf9pxdbpffr7dh0bihhf09d0iq5g6gh8ql7brfrh99lvb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.3"; sha256 = "0czzs36ybgipn9bga2swkdd653vh0wvs5hsi2lgykhblimdmb947"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.3"; sha256 = "0yi0n8jxf4l6v8bscgi8ws9zf5i84213pf1qj5d7nwx4jb05m23l"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.0"; sha256 = "1sqmk99644fx66zk2qa2ims1zl6741i3wl4rjh4z6jakd4xbc28i"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.0"; sha256 = "1s8ap0ljqssbqp1ilgsidjr948b9szf1cbl3fgl6smxig9im4zrl"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; }) @@ -86,9 +86,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.2"; sha256 = "1r3r2sm97lirfd4sb8vhshl8iy9pg006glrgagapxhrh5kapn44g"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.2"; sha256 = "1ixfyx1pg5j7id6kr3blxpbffmzhw9944ha1k6bp8l41rzcny4z8"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.2"; sha256 = "0251bi5fwqx1vvndw604lsgmhaq1sn74kfmpn5i3nr2j7rs5lyax"; }) + (fetchNuGet { pname = "NLog"; version = "5.2.3"; sha256 = "0srai3s2kk9y2jimdvw1xw86nch38q6nza598dpr81dghx3s6j6w"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.3"; sha256 = "0j19fljxbcc0bysmj7i0fmiax6sp5kjapf2llkimv7dh63rj9ckg"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.3"; sha256 = "0rhha2lwrzwlx0q1a8w9ph9xwayl3kmmy200ygsghcd02srlazkj"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 6c0e749b2085..77f4e9c6e299 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -9,11 +9,11 @@ buildNpmPackage { repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "578e8eacf9eb0367d864ed741017dce23415c1be"; - hash = "sha256-It76gyrTPiZFEj9aSFKwAsj2jhV3zacJS8CNl4sr7OU="; + rev = "0b812a7ab0d2f01a675d27f80008ad7b6972b4aa"; + hash = "sha256-ut0x/qT3DyDASW4QbNT+BF6eXHCIbTol5E+3+tirFDA="; }; - npmDepsHash = "sha256-7404OPGhF7bgdvtyfLM/7zRXGUWPr2RLUCzeaHcCj0A="; + npmDepsHash = "sha256-HpBEoAIGejpHJnUciz4iWILcXdgpw7X1xFuXmx9Z9dw="; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix b/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix index 4c94fa83485c..d5023c64fd1b 100644 --- a/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix @@ -10,12 +10,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "HentaiAtHome"; - version = "1.6.1"; + version = "1.6.2"; src = fetchzip { url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; - hash = - "sha512-j+B0kx6fjUibI3MjVJ5PVTq9xxtSOTTY/XizAJKjeNkpExJF9DIV4VCwf+sfLlg+7W4UBosnyb8hZNNoidRBKA=="; + hash = "sha256-ioL/GcnbYjt1IETH8521d1TcLGtENdFzceJui1ywXTY="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/misc/albert/default.nix b/nixpkgs/pkgs/applications/misc/albert/default.nix index 598086ff3178..c53226f82767 100644 --- a/nixpkgs/pkgs/applications/misc/albert/default.nix +++ b/nixpkgs/pkgs/applications/misc/albert/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.22.0"; + version = "0.22.4"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-x5H7z0rwunfMwtihXEerc47Sdkl6IvSHfavXzXMLse0="; + sha256 = "sha256-M5wMi/yH5c08Y7tpHpOulcz0utnnduGsR5z3EHeBecM="; fetchSubmodules = true; }; @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes synthetica ]; + mainProgram = "albert"; platforms = platforms.linux; }; }) diff --git a/nixpkgs/pkgs/applications/misc/anytype/default.nix b/nixpkgs/pkgs/applications/misc/anytype/default.nix index c7cfbe53d2de..8096dd9ea22f 100644 --- a/nixpkgs/pkgs/applications/misc/anytype/default.nix +++ b/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.34.3"; + version = "0.35.2"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-YJMpCEQ6eJYISGeYgvS6TcQwU2eD6fjgHrHRKA6CQJU="; + sha256 = "RLkAC9rNGHdbX/EfDTfpbBBKaY+BqdFuCMm99mkjOjw="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/nixpkgs/pkgs/applications/misc/archiver/default.nix b/nixpkgs/pkgs/applications/misc/archiver/default.nix index 7fb0de24c114..2389285e99c0 100644 --- a/nixpkgs/pkgs/applications/misc/archiver/default.nix +++ b/nixpkgs/pkgs/applications/misc/archiver/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "1py186hfy4p69wghqmbsyi1r3xvw1nyl55pz8f97a5qhmwxb3mwp"; + hash = "sha256-l9exOq8QF3WSQ/+WQr0NfPeRQ/R6VQwfT+YS76BBwd8="; }; - vendorSha256 = "1y4v95z1ga111g3kdv5wvyikwifl25f36firf1i916rxli6f6g5i"; + vendorHash = "sha256-sTzjTKQ9m5BicDk6M1wR1EU+o9+87DbHCyGoF35Jm/g="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; diff --git a/nixpkgs/pkgs/applications/misc/blender/default.nix b/nixpkgs/pkgs/applications/misc/blender/default.nix index 86409f1491a7..84aaa4295729 100644 --- a/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ++ lib.optional cudaSupport cudaPackages.cudatoolkit ++ lib.optional colladaSupport opencollada ++ lib.optional spaceNavSupport libspnav; - pythonPath = with python310Packages; [ numpy requests ]; + pythonPath = with python310Packages; [ numpy requests zstandard ]; postPatch = '' '' + diff --git a/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix b/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix index 969a2d8178ef..fd0d38f69892 100644 --- a/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix +++ b/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix @@ -1,7 +1,6 @@ { buildFHSEnv , symlinkJoin , bottles-unwrapped -, gst_all_1 , extraPkgs ? pkgs: [ ] , extraLibraries ? pkgs: [ ] }: @@ -37,6 +36,14 @@ let fhsEnv = { libXv libXxf86vm ]; + gstreamerDeps = pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]; in pkgs: with pkgs; [ # https://wiki.winehq.org/Building_Wine @@ -49,12 +56,6 @@ let fhsEnv = { gnutls libglvnd gsm - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-ugly - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav libgphoto2 libjpeg_turbo libkrb5 @@ -91,11 +92,8 @@ let fhsEnv = { p11-kit zlib # Freetype ] ++ xorgDeps pkgs + ++ gstreamerDeps pkgs ++ extraLibraries pkgs; - - profile = '' - export GST_PLUGIN_PATH=/usr/lib32/gstreamer-1.0:/usr/lib64/gstreamer-1.0 - ''; }; in symlinkJoin { diff --git a/nixpkgs/pkgs/applications/misc/cheat/default.nix b/nixpkgs/pkgs/applications/misc/cheat/default.nix index c6e6568eaa09..1b85a1ec65fe 100644 --- a/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { installShellCompletion scripts/cheat.{bash,fish,zsh} ''; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index 0abdb65ca03d..04c30deef773 100644 --- a/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.56"; + version = "1.0.1"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - hash = "sha256-kDbUn81YfSMAX7FKcw+nDSrsNvrhOX0+NmgZUYNqCqQ="; + hash = "sha256-A/4OcsAOECgQnENj2l9BX713KHG+zk5cJE+yyHXw1TM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/cointop/default.nix b/nixpkgs/pkgs/applications/misc/cointop/default.nix index a0ceabf9d105..6e22b443a573 100644 --- a/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/misc/dstask/default.nix b/nixpkgs/pkgs/applications/misc/dstask/default.nix index fb2a5b729ab3..571763be5fef 100644 --- a/nixpkgs/pkgs/applications/misc/dstask/default.nix +++ b/nixpkgs/pkgs/applications/misc/dstask/default.nix @@ -11,12 +11,12 @@ buildGoModule rec { sha256 = "sha256-xZFQQDK+yGAv4IbuNe2dvNa3GDASeJY2mOYw94goAIM="; }; - # Set vendorSha256 to null because dstask vendors its dependencies (meaning + # Set vendorHash to null because dstask vendors its dependencies (meaning # that third party dependencies are stored in the repository). # # Ref <https://github.com/NixOS/nixpkgs/pull/87383#issuecomment-633204382> # and <https://github.com/NixOS/nixpkgs/blob/d4226e3a4b5fcf988027147164e86665d382bbfa/pkgs/development/go-modules/generic/default.nix#L18> - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/flashprint/default.nix b/nixpkgs/pkgs/applications/misc/flashprint/default.nix new file mode 100644 index 000000000000..e698f4857b3b --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/flashprint/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, libGLU, qtbase, fetchurl, dpkg, autoPatchelfHook, wrapQtAppsHook }: + +stdenv.mkDerivation (finalAttrs: { + pname = "flashprint"; + version = "5.7.1"; + + src = fetchurl { + url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; + hash = "sha256-kxvqEgXlKQlfzlCqKb5o3hvop82vDsJmQDK9XOCq61g="; + }; + + nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; + + buildInputs = [ qtbase libGLU ]; + + qtWrapperArgs = [ "--prefix QT_QPA_PLATFORM : xcb" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv etc usr/* $out + ln -s $out/share/FlashPrint5/FlashPrint $out/bin/flashprint + sed -i "/^Exec=/ c Exec=$out/bin/flashprint" $out/share/applications/FlashPrint5.desktop + + runHook postInstall + ''; + + meta = with lib; { + description = "Slicer for the FlashForge 3D printers"; + homepage = "https://www.flashforge.com/"; + license = licenses.unfree; + mainProgram = "flashprint"; + maintainers = [ maintainers.ianliu ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; + }; +}) diff --git a/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/nixpkgs/pkgs/applications/misc/fluidd/default.nix index 5e1802d002bb..ff1630dc3504 100644 --- a/nixpkgs/pkgs/applications/misc/fluidd/default.nix +++ b/nixpkgs/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.25.2"; + version = "1.25.3"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-WlUTRmQ1RWI2HQ5Kn85q+/fzVnTsda2aqgTWRlA+5JY="; + sha256 = "sha256-raslLhVbeUL6Zoz5cw+fKtqdUvAkd7frAncd+q1AVxs="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/nixpkgs/pkgs/applications/misc/font-manager/default.nix index e90c0a4ec18e..40cbeaea6130 100644 --- a/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -18,9 +18,8 @@ , desktop-file-utils , wrapGAppsHook , gobject-introspection -, libsoup -, glib-networking -, webkitgtk +# withWebkit enables the "webkit" feature, also known as Google Fonts +, withWebkit ? true, glib-networking, libsoup, webkitgtk }: stdenv.mkDerivation rec { @@ -29,9 +28,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "FontManager"; - repo = "master"; + repo = "font-manager"; rev = version; - sha256 = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; + hash = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; }; nativeBuildInputs = [ @@ -56,13 +55,15 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas # for font settings gtk3 gnome.adwaita-icon-theme - libsoup + ] ++ lib.optionals withWebkit [ glib-networking # for SSL so that Google Fonts can load + libsoup webkitgtk ]; mesonFlags = [ "-Dreproducible=true" # Do not hardcode build directory… + (lib.mesonBool "webkit" withWebkit) ]; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix b/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix deleted file mode 100644 index 9dd571735e62..000000000000 --- a/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, pkg-config -, vips -}: - -buildGoModule rec { - pname = "go-thumbnailer"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "donovanglover"; - repo = pname; - rev = version; - sha256 = "sha256-sgd5kNnDXcSesGT+OignZ+APjNSxSP0Z60dr8cWO6sU="; - }; - - buildInputs = [ - vips - ]; - - nativeBuildInputs = [ - pkg-config - ]; - - vendorHash = "sha256-4zgsoExdhEqvycGerNVxZ6LnjeRRO+f6DhJdINR5ZyI="; - - postInstall = '' - mkdir -p $out/share/thumbnailers - substituteAll ${./go.thumbnailer} $out/share/thumbnailers/go.thumbnailer - ''; - - meta = with lib; { - description = "A cover thumbnailer written in Go for performance and reliability"; - homepage = "https://github.com/donovanglover/go-thumbnailer"; - license = licenses.mit; - maintainers = with maintainers; [ donovanglover ]; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/go-thumbnailer/go.thumbnailer b/nixpkgs/pkgs/applications/misc/go-thumbnailer/go.thumbnailer deleted file mode 100644 index c105e0674d19..000000000000 --- a/nixpkgs/pkgs/applications/misc/go-thumbnailer/go.thumbnailer +++ /dev/null @@ -1,3 +0,0 @@ -[Thumbnailer Entry] -Exec=@out@/bin/go-thumbnailer %s %i %o -MimeType=inode/directory diff --git a/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix b/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix index 49e9f9df8cdd..ff46b57e1a3c 100644 --- a/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -33,5 +33,6 @@ appimageTools.wrapType2 { maintainers = with lib.maintainers; [ gador adamcstephens ]; license = lib.licenses.gpl2Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + knownVulnerabilities = [ "Vendors libwebp vulnerable to CVE-2023-4863" ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index dd76fe87550a..7b59df8fd4cf 100644 --- a/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -17,12 +17,17 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { name = "gpsprune"; - exec = "gpsprune"; + exec = "gpsprune %F"; icon = "gpsprune"; desktopName = "GpsPrune"; genericName = "GPS Data Editor"; comment = meta.description; categories = [ "Education" "Geoscience" ]; + mimeTypes = [ + "application/gpx+xml" + "application/vnd.google-earth.kml+xml" + "application/vnd.google-earth.kmz" + ]; }) ]; diff --git a/nixpkgs/pkgs/applications/misc/harsh/default.nix b/nixpkgs/pkgs/applications/misc/harsh/default.nix index bf38ae4ffe0c..129de17fb18a 100644 --- a/nixpkgs/pkgs/applications/misc/harsh/default.nix +++ b/nixpkgs/pkgs/applications/misc/harsh/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "harsh"; - version = "0.8.28"; + version = "0.8.29"; src = fetchFromGitHub { owner = "wakatara"; repo = pname; rev = "v${version}"; - hash = "sha256-6BeGyyy4RFBy4TvB3bLTyDtQGljG9xE3VFfbnq9KWcs="; + hash = "sha256-LftLlKevxvjxnRUMaRXnh3TXQSauvnfuX6voglwZmZE="; }; vendorHash = "sha256-zkz7X/qj8FwtQZXGuq4Oaoe5G9a4AJE1kv3j7wwQEp4="; diff --git a/nixpkgs/pkgs/applications/misc/huggle/default.nix b/nixpkgs/pkgs/applications/misc/huggle/default.nix index a136f1f678ae..3a6f25ede695 100644 --- a/nixpkgs/pkgs/applications/misc/huggle/default.nix +++ b/nixpkgs/pkgs/applications/misc/huggle/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { substituteInPlace src/CMakeLists.txt --replace '@libirc_includes@' '${libirc.out}' ''; + cmakeBuildType = "None"; + cmakeFlags = [ "-S" "/build/source/src" - "-DCMAKE_BUILD_TYPE=None" "-DINSTALL_DATA_DIR=bin" "-DQT5_BUILD=ON" "-DWEB_ENGINE=ON" diff --git a/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix b/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix index 874bffbef3a7..0798aadf2f7a 100644 --- a/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix +++ b/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-autoname-workspaces"; - version = "1.1.7"; + version = "1.1.11"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprland-autoname-workspaces"; - rev = "v${version}"; - hash = "sha256-OtKPJZI0YKi98HUY4IDU8LRg6dTaD68OgVi9FzfjDbA="; + rev = version; + hash = "sha256-x9MXp2MZtrnVI3W+6xo34uUHuRnpVeXS+3vbyti1p24="; }; - cargoHash = "sha256-ueT85rKa2PGvp/R/ZXkDGUFIXyYNpDErg4W8WcXAPIw="; + cargoHash = "sha256-mSUtFZvq5+rumefJ6I9C6YzRzu64oJ/bTwaa+rrFlL4="; meta = with lib; { description = "Automatically rename workspaces with icons of started applications"; diff --git a/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix b/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix index 205ef838203e..e82c0f591262 100644 --- a/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -10,11 +10,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.0.2.16660"; + version = "2.0.3.17006"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-iz9bUkeQZs0k3whRZuIl/KtSn7KlTq1urQ2I+D292MM="; + sha256 = "sha256-jZzGoeYv9HxuJmHrQKm5kgReARaoMr2kPe+SWkWOBAw="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/misc/keepass/default.nix b/nixpkgs/pkgs/applications/misc/keepass/default.nix index bde5bd4b44ae..d9f6e5913ff4 100644 --- a/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.53.1"; + version = "2.54"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - hash = "sha256-R7KWxlxrhl55nOaDNYwA/cJJl+kd5ZYy6eZVqyrxxnM="; + hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch b/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch index 5d367b0a8266..b574716b0f2a 100644 --- a/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch +++ b/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch @@ -53,44 +53,43 @@ index af02803..8a32c9d 100644 int iSep = str.IndexOf(':'); diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs -index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs +++ b/KeePass/Util/ClipboardUtil.Unix.cs -@@ -62,7 +62,7 @@ namespace KeePass.Util - // "-out -selection clipboard"); - // if(str != null) return str; +@@ -65,7 +65,7 @@ + // "-out -selection clipboard"); + // if(str != null) return str; -- string str = NativeLib.RunConsoleApp("xsel", -+ string str = NativeLib.RunConsoleApp("@xsel@", - "--output --clipboard", null, XSelFlags); - if(str != null) return str; +- string str = NativeLib.RunConsoleApp("xsel", ++ string str = NativeLib.RunConsoleApp("@xsel@", + "--output --clipboard", null, XSelFlags); + if(str != null) return str; + } +@@ -93,10 +93,10 @@ + if(string.IsNullOrEmpty(str)) + { + // xsel with an empty input can hang, thus use --clear +- if(NativeLib.RunConsoleApp("xsel", "--clear --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", + null, XSelFlags) != null) + { +- NativeLib.RunConsoleApp("xsel", "--clear --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", + null, XSelFlags); + return; + } +@@ -107,10 +107,10 @@ + } -@@ -83,10 +83,10 @@ namespace KeePass.Util - if(string.IsNullOrEmpty(str)) - { - // xsel with an empty input can hang, thus use --clear -- if(NativeLib.RunConsoleApp("xsel", "--clear --primary", -+ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", - null, XSelFlags) != null) + // xsel does not support --primary and --clipboard together +- if(NativeLib.RunConsoleApp("xsel", "--input --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", + str, XSelFlags) != null) { -- NativeLib.RunConsoleApp("xsel", "--clear --clipboard", -+ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", - null, XSelFlags); +- NativeLib.RunConsoleApp("xsel", "--input --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", + str, XSelFlags); return; } -@@ -97,10 +97,10 @@ namespace KeePass.Util - } - - // xsel does not support --primary and --clipboard together -- if(NativeLib.RunConsoleApp("xsel", "--input --primary", -+ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", - str, XSelFlags) != null) - { -- NativeLib.RunConsoleApp("xsel", "--input --clipboard", -+ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", - str, XSelFlags); - return; - } diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs index 291c51d..3c76380 100644 --- a/KeePassLib/Native/ClipboardU.cs diff --git a/nixpkgs/pkgs/applications/misc/keyleds/default.nix b/nixpkgs/pkgs/applications/misc/keyleds/default.nix index c48b30b34dc9..a759b8e393e9 100644 --- a/nixpkgs/pkgs/applications/misc/keyleds/default.nix +++ b/nixpkgs/pkgs/applications/misc/keyleds/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=MinSizeRel" - ]; + cmakeBuildType = "MinSizeRel"; meta = { homepage = "https://github.com/keyleds/keyleds"; diff --git a/nixpkgs/pkgs/applications/misc/kiwix/lib.nix b/nixpkgs/pkgs/applications/misc/kiwix/lib.nix index 144d83f6c150..aa9117997c08 100644 --- a/nixpkgs/pkgs/applications/misc/kiwix/lib.nix +++ b/nixpkgs/pkgs/applications/misc/kiwix/lib.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libkiwix"; - version = "12.0.0"; + version = "12.1.1"; src = fetchFromGitHub { owner = "kiwix"; repo = pname; rev = version; - sha256 = "sha256-4FxLxJxVhqbeNqX4vorHkROUuRURvE6AXlteIZCEBtc="; + sha256 = "sha256-hcwLxfn1fiUAiwsnIddv4HukvVrFePtx7sDQUD1lGUA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/mangal/default.nix b/nixpkgs/pkgs/applications/misc/mangal/default.nix index 26e735039b3f..6edc9da4f602 100644 --- a/nixpkgs/pkgs/applications/misc/mangal/default.nix +++ b/nixpkgs/pkgs/applications/misc/mangal/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix b/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix index 2a9c118d77a1..d25824fefc15 100644 --- a/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix +++ b/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "matcha-rss-digest"; - version = "0.6"; + version = "0.6.1"; src = fetchFromGitHub { owner = "piqoni"; repo = "matcha"; rev = "v${version}"; - hash = "sha256-Zk85k2SllPR9zznLGevwH6hS1EEW2qEa9YXbSguRVeM="; + hash = "sha256-aW/a1rfq/pjRpJzoEfuj0JMnyFwQKPL1+Wxvh7wVbho="; }; - vendorHash = "sha256-Dw1z23DRG0OtakJfrgpTfd71F58KfGsqz215zK0XOdI="; + vendorHash = "sha256-bwl4/4yYm8TC3D+FgyXzhQg8SdNHyXQM9YCn8p8+DF0="; meta = with lib; { homepage = "https://github.com/piqoni/matcha"; diff --git a/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix b/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix index 8d88612b728b..88df68f55979 100644 --- a/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.5.0"; + version = "2.5.4"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-15qs2EsvEmQQPsarozP4HVpa0/3YJBSZ9M+1s/w5LaA="; + hash = "sha256-2+ZY+ca/CTIdCiFrBOkMWKflzKjSYJ8yfwFkULNg7Xk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index 390bc0141337..2e2a02dc5d39 100644 --- a/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4910"; + version = "4912"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-t4SyvDvwNdqKh95MRmHxlX6q84dN0y4ANPIXqS7ynBA="; + sha256 = "sha256-4A6N0bhRLKgpLXUSN1iAmIC4YX+BaiUow2YQqnxguRM="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix b/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix index 51cd4df77bfa..854d8d17b55f 100644 --- a/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-TUS0eTlQA7O59EvJHrQkqDQexv84ucza6kE4t98AGPs="; + sha256 = "sha256-BZYFN6X6UNllwlovnpEwDSocA5ZfSDUOyr8JTg4z9ak="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix b/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix index 35db52a1ae7e..a4d333e594c3 100644 --- a/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix +++ b/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - hash = "sha256-lCo58v2UGolFagci2xHcieTUvqNc1KKNj3Z92oG5WPI="; + hash = "sha256-dP/FbMrjPextwedQeLJHM6f/a+EuZ+hQSLrH/rF2XOg="; }; # No tests diff --git a/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/nixpkgs/pkgs/applications/misc/obsidian/default.nix index cb9b1a7f6aa8..a1d96287edca 100644 --- a/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.4.11"; + version = "1.4.13"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-bJLWXdeVzbVrb8jmIRpyQG6a5H1jMydhO9ioHOGk3Ms=" else "sha256-Z4DojO90PAlGGsItcZugPsi+48UPnOjvCn2BIzrDQpc="; + sha256 = if stdenv.isDarwin then "sha256-FMaEq99D8bCQF91drHrB5icXyQIdnWIwhAM9yuG97aA=" else "sha256-TWDmoXpBhBrrdbqS6dbFq4BxC2Bshap3gbnB4/ONrQE="; }; icon = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/opentrack/default.nix b/nixpkgs/pkgs/applications/misc/opentrack/default.nix index b4c455c0ce04..84edbc567b41 100644 --- a/nixpkgs/pkgs/applications/misc/opentrack/default.nix +++ b/nixpkgs/pkgs/applications/misc/opentrack/default.nix @@ -46,7 +46,6 @@ in dontWrapQtApps = true; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELEASE" "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" "-DSDK_XPLANE=${xplaneSdk}" ]; diff --git a/nixpkgs/pkgs/applications/misc/oranda/default.nix b/nixpkgs/pkgs/applications/misc/oranda/default.nix index 1471afed1d66..ec449c12c376 100644 --- a/nixpkgs/pkgs/applications/misc/oranda/default.nix +++ b/nixpkgs/pkgs/applications/misc/oranda/default.nix @@ -2,34 +2,28 @@ , rustPlatform , fetchFromGitHub , pkg-config +, tailwindcss , oniguruma , stdenv , darwin -, tailwindcss }: rustPlatform.buildRustPackage rec { pname = "oranda"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "oranda"; rev = "v${version}"; - hash = "sha256-v/4FPDww142V5mx+pHhaHkDiIUN70dwei8mTeZELztc="; + hash = "sha256-PHaqWKsZyNZnEAzEWMzJK6MD0b4O6pkYQG403ONIj0w="; }; - cargoHash = "sha256-Q5EY9PB50DxFXFTPiv3RktI37b2TCDqLVNISxixnspY="; - - patches = [ - # oranda-generate-css which is used in the build script tries to download - # tailwindcss from the internet, so we have to patch it to use the - # tailwindcss from nixpkgs - ./tailwind.patch - ]; + cargoHash = "sha256-zV7vG1mcgVusWCa4jKNLD+SqzReLZQRotk6nvzPYCU4="; nativeBuildInputs = [ pkg-config + tailwindcss ]; buildInputs = [ @@ -46,7 +40,7 @@ rustPlatform.buildRustPackage rec { env = { RUSTONIG_SYSTEM_LIBONIG = true; - TAILWINDCSS = lib.getExe tailwindcss; + ORANDA_USE_TAILWIND_BINARY = true; } // lib.optionalAttrs stdenv.isDarwin { # without this, tailwindcss fails with OpenSSL configuration error OPENSSL_CONF = ""; diff --git a/nixpkgs/pkgs/applications/misc/oranda/tailwind.patch b/nixpkgs/pkgs/applications/misc/oranda/tailwind.patch deleted file mode 100644 index 6a1ffb3c959f..000000000000 --- a/nixpkgs/pkgs/applications/misc/oranda/tailwind.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/generate-css/src/lib.rs -+++ b/generate-css/src/lib.rs -@@ -28,48 +28,7 @@ pub fn default_css_output_dir() -> Utf8PathBuf { - } - - pub fn build_css(dist_dir: &Utf8Path) -> Result<()> { -- // Fetch our cache dir -- let project_dir = ProjectDirs::from("dev", "axo", "oranda") -- .expect("Unable to create cache dir for downloading Tailwind!"); -- let cache_dir = project_dir.cache_dir(); -- // Figure out our target "double" (tailwind has weird naming around this) -- let double = match (env::consts::OS, env::consts::ARCH) { -- ("linux", "x86_64") => "linux-x64", -- ("linux", "aarch64") => "linux-arm64", -- ("linux", "arm") => "linux-armv7", -- ("macos", "x86_64") => "macos-x64", -- ("macos", "aarch64") => "macos-arm64", -- ("windows", "x86_64") => "windows-x64.exe", -- ("windows", "aarch64") => "windows-arm64.exe", -- _ => "linux-x64", -- }; -- let mut binary_path = Utf8PathBuf::from(cache_dir.display().to_string()); -- LocalAsset::create_dir_all(&binary_path)?; -- binary_path.push(format!("tailwindcss-{double}")); -- if !binary_path.exists() { -- // Fetch the binary from GitHub if it doesn't exist -- tracing::info!("Fetching Tailwind binary from GitHub release..."); -- let url = format!( -- "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-{double}" -- ); -- let handle = tokio::runtime::Handle::current(); -- let response = handle.block_on(reqwest::get(url))?; -- let bytes = handle.block_on(response.bytes())?; -- let file = LocalAsset::new(&binary_path, Vec::from(bytes))?; -- file.write( -- binary_path -- .parent() -- .expect("Tailwind binary path has no parent!?"), -- )?; -- -- // On non-Windows platforms, we need to mark the file as executable -- #[cfg(target_family = "unix")] -- { -- use std::os::unix::prelude::PermissionsExt; -- let user_execute = std::fs::Permissions::from_mode(0o755); -- std::fs::set_permissions(&binary_path, user_execute)?; -- } -- } -+ let binary_path = env!("TAILWINDCSS"); - - tracing::info!("Building oranda CSS using Tailwind..."); - let css_src_path = manifest_dir().join(CSS_SRC_PATH); diff --git a/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/nixpkgs/pkgs/applications/misc/p2pool/default.nix index a2b403f60f47..31f115a80024 100644 --- a/nixpkgs/pkgs/applications/misc/p2pool/default.nix +++ b/nixpkgs/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "3.5"; + version = "3.6.2"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-qwdEmDfH+TE0WF2HIVCn23RlzelLBvCOu9VKpScdO68="; + sha256 = "sha256-wpWdJSaX1PrAgQkOF+aiAWUWfDja1FIkLO3W+rM3cVI="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/misc/pagefind/default.nix b/nixpkgs/pkgs/applications/misc/pagefind/default.nix new file mode 100644 index 000000000000..1b7505dc3651 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/pagefind/default.nix @@ -0,0 +1,110 @@ +{ lib +, callPackage +, rustPlatform +, fetchFromGitHub +, fetchNpmDeps +, npmHooks +, binaryen +, gzip +, nodejs +, rustc-wasm32 +, wasm-bindgen-cli +, wasm-pack +}: + +let + + wasm-bindgen-84 = wasm-bindgen-cli.override { + version = "0.2.84"; + hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; + cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; + }; + +in + +rustPlatform.buildRustPackage rec { + pname = "pagefind"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "cloudcannon"; + repo = "pagefind"; + rev = "refs/tags/v${version}"; + hash = "sha256-vQbLaZug3gySMIbMdNqU7XcL4GZ7XqZ3ZkwdDBC5T9o="; + }; + + cargoHash = "sha256-ubuzO/67HguWPqd3y/IapO07L2pg2Q4vo1yTpEthdoU="; + + env.npmDeps_web_js = fetchNpmDeps { + name = "npm-deps-web-js"; + src = "${src}/pagefind_web_js"; + hash = "sha256-pGE4lUFZ4dA++8kBklcMBoaN/1Z92dfOzQKhukbuEyc="; + }; + env.npmDeps_ui_default = fetchNpmDeps { + name = "npm-deps-ui-default"; + src = "${src}/pagefind_ui/default"; + hash = "sha256-voCs49JneWYE1W9U7aB6G13ypH6JqathVDeF58V57U8="; + }; + env.npmDeps_ui_modular = fetchNpmDeps { + name = "npm-deps-ui-modular"; + src = "${src}/pagefind_ui/modular"; + hash = "sha256-O0RqZUsRFtByxMQdwNGNcN38Rh+sDqqNo9YlBcrnsF4="; + }; + + postPatch = '' + # Tricky way to run npmConfigHook multiple times + ( + local postPatchHooks=() # written to by npmConfigHook + source ${npmHooks.npmConfigHook}/nix-support/setup-hook + npmRoot=pagefind_web_js npmDeps=$npmDeps_web_js npmConfigHook + npmRoot=pagefind_ui/default npmDeps=$npmDeps_ui_default npmConfigHook + npmRoot=pagefind_ui/modular npmDeps=$npmDeps_ui_modular npmConfigHook + ) + ''; + + nativeBuildInputs = [ + binaryen + gzip + nodejs + rustc-wasm32 + rustc-wasm32.llvmPackages.lld + wasm-bindgen-84 + wasm-pack + ]; + + # build wasm and js assets + # based on "test-and-build" in https://github.com/CloudCannon/pagefind/blob/main/.github/workflows/release.yml + preBuild = '' + export HOME=$(mktemp -d) + ( + cd pagefind_web_js + npm run build-coupled + ) + + ( + cd pagefind_web + export RUSTFLAGS="-C linker=lld" + bash ./local_build.sh + ) + + ( + cd pagefind_ui/default + npm run build + ) + + ( + cd pagefind_ui/modular + npm run build + ) + ''; + + buildFeatures = [ "extended" ]; + + meta = with lib; { + description = "Generate low-bandwidth search index for your static website"; + homepage = "https://pagefind.app/"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/perkeep/default.nix b/nixpkgs/pkgs/applications/misc/perkeep/default.nix index 2b14079ae609..7ce8b03c08b5 100644 --- a/nixpkgs/pkgs/applications/misc/perkeep/default.nix +++ b/nixpkgs/pkgs/applications/misc/perkeep/default.nix @@ -3,12 +3,12 @@ let gouiJS = fetchurl { url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js"; - sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g"; + hash = "sha256-z8A5vbkAaXCw/pv9t9sFJ2xNbEOjg4vkr/YBkNptc3U="; }; publisherJS = fetchurl { url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js"; - sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; + hash = "sha256-4iKMkOEKPCo6Xrq0L5IglVZpB9wyLymCgRYz3cE9DSY="; }; packages = [ @@ -19,7 +19,8 @@ let "perkeep.org/cmd/pk-mount" ]; -in buildGoModule rec { +in +buildGoModule rec { pname = "perkeep"; version = "0.11"; @@ -27,10 +28,10 @@ in buildGoModule rec { owner = "perkeep"; repo = "perkeep"; rev = version; - sha256 = "07j5gplk4kcrbazyg4m4bwggzlz5gk89h90r14jvfcpms7v5nrll"; + hash = "sha256-lGZb9tH1MrclCRkkmNB85dP/Hl+kkue/WplNMul9RR4="; }; - vendorSha256 = "1af9a6r9qfrak0n5xyv9z8n7gn7xw2sdjn4s9bwwidkrdm81iq6b"; + vendorHash = "sha256-y+AYUG15tsj5SppY2bTg/dh3LPpp+14smCo7nLJRyak="; deleteVendor = true; # Vendor is out of sync with go.mod buildPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/pot/Cargo.lock b/nixpkgs/pkgs/applications/misc/pot/Cargo.lock index 9e2076047a94..3c025d6e88ee 100644 --- a/nixpkgs/pkgs/applications/misc/pot/Cargo.lock +++ b/nixpkgs/pkgs/applications/misc/pot/Cargo.lock @@ -629,22 +629,6 @@ dependencies = [ ] [[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.23.1", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] name = "cocoa-foundation" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3760,7 +3744,6 @@ dependencies = [ "tiny_http", "walkdir", "window-shadows", - "window-vibrancy", "windows 0.44.0", "zip", ] @@ -5080,7 +5063,7 @@ dependencies = [ "bitflags 1.3.2", "cairo-rs", "cc", - "cocoa 0.24.1", + "cocoa", "core-foundation", "core-graphics 0.22.3", "crossbeam-channel", @@ -5157,7 +5140,7 @@ dependencies = [ "anyhow", "base64 0.21.3", "bytes", - "cocoa 0.24.1", + "cocoa", "dirs-next", "embed_plist", "encoding_rs", @@ -5375,7 +5358,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b" dependencies = [ - "cocoa 0.24.1", + "cocoa", "gtk", "percent-encoding", "rand 0.8.5", @@ -6280,25 +6263,13 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29d30320647cfc3dc45554c8ad825b84831def81f967a2f7589931328ff9b16d" dependencies = [ - "cocoa 0.24.1", + "cocoa", "objc", "raw-window-handle", "windows-sys 0.42.0", ] [[package]] -name = "window-vibrancy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0a73f45692662acb5dfe1ac22f33fbd5b3db2f1ef413985b480e655b61f5ee" -dependencies = [ - "cocoa 0.25.0", - "objc", - "raw-window-handle", - "windows-sys 0.48.0", -] - -[[package]] name = "windows" version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6665,7 +6636,7 @@ checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" dependencies = [ "base64 0.13.1", "block", - "cocoa 0.24.1", + "cocoa", "core-graphics 0.22.3", "crossbeam-channel", "dunce", diff --git a/nixpkgs/pkgs/applications/misc/pot/default.nix b/nixpkgs/pkgs/applications/misc/pot/default.nix index a2b1971b369e..bb907e30df0c 100644 --- a/nixpkgs/pkgs/applications/misc/pot/default.nix +++ b/nixpkgs/pkgs/applications/misc/pot/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pot"; - version = "2.2.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; rev = version; - hash = "sha256-PvbqPGT8BTHEufYp+TUSd0tTSBnTBDIYHxaeI7FEVDE="; + hash = "sha256-n12uO5QbD/HgD5Rq5d+TQ8j8Gn5hl6wTi27TqFmunIM="; }; sourceRoot = "${src.name}/src-tauri"; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-iHFzv8dMC0TT6PtMJmL0EufZ8TnbyjmsoBH3Z8U48D0="; + outputHash = "sha256-/5bB4czTPS3ZM9f7NBIHbwd95BqY2dRwKaBOWVsef04="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index 6b1f95d0bd08..402162689caa 100644 --- a/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -69,7 +69,7 @@ let in stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.6.0"; + version = "2.6.1"; nativeBuildInputs = [ cmake @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-6AZdwNcgddHePyB0bNS7xGmpz38uzhAwUxgo48OQLuU="; + hash = "sha256-t5lnBL7SZVfyR680ZK29YXgE3pag+uVv4+BGJZq40/A="; rev = "version_${version}"; }; diff --git a/nixpkgs/pkgs/applications/misc/remnote/default.nix b/nixpkgs/pkgs/applications/misc/remnote/default.nix index 1a2ccae164d2..b1039e17a757 100644 --- a/nixpkgs/pkgs/applications/misc/remnote/default.nix +++ b/nixpkgs/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.12.22"; + version = "1.12.36"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-lsTs9Xf0gDRvHQkteNu2JK2eZvF7XK0ryZZgMwTRWvk="; + hash = "sha256-uVncAEKCuUvJCeKMqflWq3R6BVHfbt1Bo+PwNk/pOu4="; }; appexec = appimageTools.wrapType2 { inherit pname version src; diff --git a/nixpkgs/pkgs/applications/misc/rlaunch/default.nix b/nixpkgs/pkgs/applications/misc/rlaunch/default.nix index 9b00abd14cd9..15f26a24d602 100644 --- a/nixpkgs/pkgs/applications/misc/rlaunch/default.nix +++ b/nixpkgs/pkgs/applications/misc/rlaunch/default.nix @@ -7,25 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rlaunch"; - version = "1.3.13"; + version = "1.3.14"; src = fetchFromGitHub { owner = "PonasKovas"; repo = pname; rev = version; - sha256 = "1w8qvny72l5358wnk4dmqnrv4mrpzxrzf49svav9grzxzzf8mqy2"; + hash = "sha256-PyCR/ob947W+6T56y1se74aNy1avJDb2ELyv2aGf1og="; }; - cargoSha256 = "00lnw48kn97gp45lylv5c6v6pil74flzpsq9k69xgvvjq9yqjzrx"; - - patches = [ - # Fixes "error[E0308]: mismatched types; expected `u8`, found `i8`" on aarch64 - # Remove with next version update - (fetchpatch { - url = "https://github.com/PonasKovas/rlaunch/commit/f78f36876bba45fe4e7310f58086ddc63f27a57e.patch"; - hash = "sha256-rTS1khw1zt3i1AJ11BhAILcmaohAwVc7Qfl6Fc76Kvs="; - }) - ]; + cargoHash = "sha256-/a1SjGDcauOy1vmXvmWBZmag8G+T2au+Z7b0y1Vj3C8="; # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' diff --git a/nixpkgs/pkgs/applications/misc/sampler/default.nix b/nixpkgs/pkgs/applications/misc/sampler/default.nix index bea22977097a..e5e090e7da4d 100644 --- a/nixpkgs/pkgs/applications/misc/sampler/default.nix +++ b/nixpkgs/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, libiconv, alsa-lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, alsa-lib, stdenv }: buildGoModule rec { pname = "sampler"; @@ -8,18 +8,18 @@ buildGoModule rec { owner = "sqshq"; repo = pname; rev = "v${version}"; - sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z"; + hash = "sha256-H7QllAqPp35wHeJ405YSfPX3S4lH0/hdQ8Ja2OGLVtE="; }; patches = [ # fix build with go 1.17 (fetchpatch { url = "https://github.com/sqshq/sampler/commit/97a4a0ebe396a780d62f50f112a99b27044e832b.patch"; - sha256 = "1czns7jc85mzdf1mg874jimls8x32l35x3lysxfgfah7cvvwznbk"; + hash = "sha256-c9nP92YHKvdc156OXgYVoyNNa5TkoFeDa78WxOTR9rM="; }) ]; - vendorSha256 = "02cfzqadpsk2vkzsp7ciji9wisjza0yp35pw42q44navhbzcb4ji"; + vendorHash = "sha256-UZLF/oJbWUKwIPyWcT1QX+rIU5SRnav/3GLq2xT+jgk="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/semver/default.nix b/nixpkgs/pkgs/applications/misc/semver/default.nix index 5453467b9ef6..cdafd3202719 100644 --- a/nixpkgs/pkgs/applications/misc/semver/default.nix +++ b/nixpkgs/pkgs/applications/misc/semver/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0v3j7rw917wnmp4lyjscqzk4qf4azfiz70ynbq3wl4gwp1m783vv"; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ git ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/nixpkgs/pkgs/applications/misc/skytemple/default.nix index 8aa1da1568f9..43e41b253bf8 100644 --- a/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-brt1bNQonAjbqCsMLHgOS8leDb3Y8MWKIxV+BXoJ1lY="; + hash = "sha256-7sv0TzYMQLEaohy45JPPiK2wS3x4sXaevT/BfHaSbWw="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/snagboot/default.nix b/nixpkgs/pkgs/applications/misc/snagboot/default.nix index 35ac8b28aa99..61c906ec464a 100644 --- a/nixpkgs/pkgs/applications/misc/snagboot/default.nix +++ b/nixpkgs/pkgs/applications/misc/snagboot/default.nix @@ -10,27 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snagboot"; - version = "1.1"; + version = "1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "bootlin"; repo = "snagboot"; rev = "v${version}"; - hash = "sha256-MU6LzjH6s2MS7T3u1OUeJ5ZmWgL0otA/q0ylwTNH4fA="; - }; - - passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = ".(rc|beta).*"; - }; - - tests.version = testers.testVersion { - package = snagboot; - command = "snagrecover --version"; - version = "v${version}"; - }; + hash = "sha256-OuHY5+2puZAERtwmXduUW5Wjus6KeQLJLcGcl48umLA="; }; nativeBuildInputs = [ @@ -69,6 +56,19 @@ python3.pkgs.buildPythonApplication rec { # There are no tests doCheck = false; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = ".(rc|beta).*"; + }; + + tests.version = testers.testVersion { + package = snagboot; + command = "snagrecover --version"; + version = "v${version}"; + }; + }; + meta = { homepage = "https://github.com/bootlin/snagboot"; description = "Generic recovery and reflashing tool for embedded platforms"; diff --git a/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix b/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix index 5685dea60823..e60fbf7412aa 100644 --- a/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix @@ -97,6 +97,7 @@ python3Packages.buildPythonApplication rec { description = "Linux compatible UI for the Elgato Stream Deck"; homepage = "https://streamdeck-linux-gui.github.io/streamdeck-linux-gui/"; license = licenses.mit; + mainProgram = "streamdeck"; maintainers = with maintainers; [ majiir ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/sunwait/default.nix b/nixpkgs/pkgs/applications/misc/sunwait/default.nix index 71c174a07e46..f824011f1b86 100644 --- a/nixpkgs/pkgs/applications/misc/sunwait/default.nix +++ b/nixpkgs/pkgs/applications/misc/sunwait/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "sunwait"; - version = "2020-10-26"; + version = "0.9.1"; src = fetchFromGitHub { owner = "risacher"; repo = "sunwait"; - rev = "102cb417ecbb7a3757ba9ee4b94d6db3225124c4"; - sha256 = "0cs8rdcnzsl10zia2k49a6c2z6gvp5rnf31sgn3hn5c7kgy7l3ax"; + rev = finalAttrs.version; + hash = "sha256-v2cNjecJ4SstOsvDe/Lu0oOyBd8I8LMHZIH+f9ZC7Fc="; }; makeFlags = [ "C=${stdenv.cc.targetPrefix}c++" ]; @@ -17,11 +17,12 @@ stdenv.mkDerivation { install -Dm755 sunwait -t $out/bin ''; - meta = with lib; { + meta = { description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights"; homepage = "https://github.com/risacher/sunwait"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; - platforms = platforms.all; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ eclairevoyant ]; + mainProgram = "sunwait"; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix b/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix index 174b95df67bb..525e25ae7e06 100644 --- a/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sway-launcher-desktop"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Biont"; repo = "sway-launcher-desktop"; rev = "v${version}"; - sha256 = "HCGUFXrj6b9Pb6b5y9yupBumFLQyH1QVMrfoBM4HbMg="; + hash = "sha256-lv1MLPJsJJjm6RLzZXWEz1JO/4EXTQ8wj225Di+98G4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 627f09979638..c464fddcc702 100644 --- a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -11,6 +11,7 @@ , qtutilities , qtforkawesome , boost +, wrapQtAppsHook , cmake , kio , plasma-framework @@ -29,14 +30,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ , autostartExecPath ? "syncthingtray" }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.4.6"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/HAqO0eVFt4YLGeTbZSZcH2pOojvykukAGTBHZTfKLQ="; }; @@ -54,6 +55,7 @@ mkDerivation rec { ; nativeBuildInputs = [ + wrapQtAppsHook cmake qttools ] @@ -64,7 +66,7 @@ mkDerivation rec { # Don't test on Darwin because output is .app doInstallCheck = !stdenv.isDarwin; installCheckPhase = '' - $out/bin/syncthingtray --help | grep ${version} + $out/bin/syncthingtray --help | grep ${finalAttrs.version} ''; cmakeFlags = [ @@ -85,4 +87,4 @@ mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix index b44b4bd0a703..f0b4d20b1a76 100644 --- a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "jmhobbs"; repo = "terminal-parrot"; rev = version; - sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; + hash = "sha256-Qhy5nCbuC9MmegXA48LFCDk4Lm1T5MBmcXfeHzTJm6w="; }; - vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c"; + vendorHash = "sha256-DJEoJjItusN1LTOOX1Ep+frF03yF/QmB/L66gSG0VOE="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix b/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix index 9840da035e5a..4aee5fccfbd1 100644 --- a/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , rustPlatform , pkg-config +, libgit2 , openssl , sqlite , libiconv @@ -10,20 +12,24 @@ rustPlatform.buildRustPackage rec { pname = "terminal-typeracer"; - version = "2.0.8"; + version = "2.1.3"; src = fetchFromGitLab { owner = "ttyperacer"; repo = pname; rev = "v${version}"; - sha256 = "Fb2MCQaQaJseXa8Csesz1s5Yel4wcSMxfMeKSW7rlU4="; + hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU="; }; - cargoSha256 = "sha256-SAVDSUm2jpDwTfwo4L6MVUKzBxZvCfjn4UNIGUJziSY="; + cargoHash = "sha256-OwbFIbKB/arj+3gq2tfEq8yTKSUPBQNYJNzrWvDv4A4="; - buildInputs = [ openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libgit2 openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + + OPENSSL_NO_VENDOR = 1; + LIBGIT2_NO_VENDOR = 1; + meta = with lib; { description = "An open source terminal based version of Typeracer written in rust"; homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; diff --git a/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix b/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix index 8fb6bb3a1043..04c9cfad1af1 100644 --- a/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix +++ b/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "timewarrior-synchronize"; repo = pname; rev = "v${version}"; - sha256 = "GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M="; + hash = "sha256-GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M="; }; - vendorSha256 = "iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs="; + vendorHash = "sha256-iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs="; meta = with lib; { homepage = "https://github.com/timewarrior-synchronize/timew-sync-server"; diff --git a/nixpkgs/pkgs/applications/misc/tty-share/default.nix b/nixpkgs/pkgs/applications/misc/tty-share/default.nix index 6bf83be75703..cd741b8338d6 100644 --- a/nixpkgs/pkgs/applications/misc/tty-share/default.nix +++ b/nixpkgs/pkgs/applications/misc/tty-share/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; # Upstream has a `./vendor` directory with all deps which we rely upon. - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/applications/misc/ultralist/default.nix b/nixpkgs/pkgs/applications/misc/ultralist/default.nix index af2b6be2b2ff..4ca7283631c0 100644 --- a/nixpkgs/pkgs/applications/misc/ultralist/default.nix +++ b/nixpkgs/pkgs/applications/misc/ultralist/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Simple GTD-style todo list for the command line"; diff --git a/nixpkgs/pkgs/applications/misc/valentina/default.nix b/nixpkgs/pkgs/applications/misc/valentina/default.nix index c00159c0c64d..09b3eabf1845 100644 --- a/nixpkgs/pkgs/applications/misc/valentina/default.nix +++ b/nixpkgs/pkgs/applications/misc/valentina/default.nix @@ -2,17 +2,18 @@ , qmake, qttools , qtsvg, qtxmlpatterns , wrapQtAppsHook +, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "valentina"; - version = "0.7.51"; + version = "0.7.52"; src = fetchFromGitLab { owner = "smart-pattern"; repo = "valentina"; rev = "v${version}"; - hash = "sha256-N9fC2tCP4TVNncatHaz5W5Mp3jOmAcEWYCl30+0myaE="; + hash = "sha256-DmNRBxqyBvDTdA7Sz9X04Dhejtxx7tOVpST+SkUNguM="; }; postPatch = '' @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease' ''; - nativeBuildInputs = [ qmake qttools wrapQtAppsHook installShellFiles ]; + nativeBuildInputs = [ qmake qttools wrapQtAppsHook installShellFiles autoPatchelfHook ]; buildInputs = [ qtsvg qtxmlpatterns ]; diff --git a/nixpkgs/pkgs/applications/misc/waypaper/default.nix b/nixpkgs/pkgs/applications/misc/waypaper/default.nix index cfb7ec3abf69..b17e8b974e41 100644 --- a/nixpkgs/pkgs/applications/misc/waypaper/default.nix +++ b/nixpkgs/pkgs/applications/misc/waypaper/default.nix @@ -2,8 +2,8 @@ , python3 , fetchFromGitHub , gobject-introspection -, gtk3 , wrapGAppsHook +, killall }: python3.pkgs.buildPythonApplication rec { @@ -22,8 +22,9 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook ]; - propagatedBuildInputs = with python3.pkgs; [ - pygobject3 + propagatedBuildInputs = [ + python3.pkgs.pygobject3 + killall ]; # has no tests |