diff options
Diffstat (limited to 'pkgs/applications/misc')
404 files changed, 1612 insertions, 2242 deletions
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index c151bedd29e61..965d6b487a057 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.30" else "8.10.30-20.BETA"; + version = if channel == "stable" then "8.10.33" else "8.10.34-10.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-q1PKFpBgjada7jmeXZYmH8dvy2A4lwfrQ0jQSoHVNcg="; + hash = "sha256-njSvRi/sA7l5+XxfCpv3FY9SmCv5oPix9l2EZewZg1M="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-Zv/mnykPi9PCDX44JtGi0GPrOujSmjx1BBJuEB81CwE="; + hash = "sha256-g4RMTlBQvJQaPD/6scYjpe7NWrL6gkjvh5b9LubTWaE="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-unC1cz5ooSdu4Csf7/daCyPdMy3/Lp3a76B7TBa/VXk="; + hash = "sha256-YzAYMk3SR+paIQYAZCx840u/k77soy17F15owpqRAU0="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-DS6oCdr6srF+diL68a2gOskS4x+uj1i8DtL3uaaxv/I="; + hash = "sha256-FlJnPMIv7mWh3dSACq01f16mB9EkVD2LOg3IIpvjwdY="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-6I/3o+33sIkfyef8xGUWczaWykHPcvvAGv0xy/jCkKI="; + hash = "sha256-eX7D8D5KErFIQtyvg4oT+lR3A7sfRFpDMT7duigZTz0="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-ph6DBBUzdUHtYCAQiA1me3bevtVPEgIxtwbgbdgQcGY="; + hash = "sha256-dajdeU8TtD9Dbnp2MFedAl8tuQr275cUqGAnm/VF+OE="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-XzZOj1pfoCTGMTsqZlI8hKTDRJ4w7debAPYHIIwsyyY="; + hash = "sha256-Dm8v7B8qDSBe1i7OJKQFn7YDPkw3Qj8YVtQkaQmdKuc="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-s+hnKhI2s6E1ZyJQxs3Wggy60LxCEr+u3tRtjTgjmZk="; + hash = "sha256-QSxJoVPlOQU7hbvbuVcB/kf5umRjJQuygMkXq6lE1CQ="; }; }; }; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 71f93ae40e7a4..9ecc38a9abbbc 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.28.0"; + version = "2.29.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-rF0HWKLdLDmT5nXqZyn+nwd3DZxkP76Jm+xofvA1dpU=" "zip"; - i686-linux = fetch "linux_386" "sha256-b9OPsZJTGoAeedj/dv88lkX2Q4p9HG585mWyl7ZfDz4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-5ZiMQaQLYUR9BZroyG0o+M79cR4GQb6rDyVmIcTZh3o=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-5VmogWqCYMdrg9dyRt4lurPmSRdUUHt4LT3lkOEKdEI=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-sBbdkoacGI/gawM4YH+BBCLDhC2B+cE4iKVGHBhwkic=" "zip"; + i686-linux = fetch "linux_386" "sha256-TTd5juT0Aqp1+OfunXcuk0KbL6HIHQV31+1Q1e0GYMY=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-Bb6fNoeNxlbDfwt7Jr8BaKCmFUwSdsLQdVoCmQCNmLA=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-/ryklZnGhrgJggDIa8HmuDsHAXkdrWeXKCQGGVwUAAo=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 7c334fb804558..ce23bd8ee3f18 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.1.24"; + version = "6.0.3.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-IgsiL5YUeOWQ/WIaTfs0Kmv2XFori8ntGZhrx7xeMkg="; + hash = "sha256-qYB94SJYCwcUrXdKtD+ZdiPRpwXg3rOHVmFWD+Y1ZXg="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; @@ -26,22 +26,20 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; projectFile = "ArchiSteamFarm.sln"; - executables = [ "ArchiSteamFarm" ]; + executable = "ArchiSteamFarm"; dotnetFlags = [ - "-p:PublishSingleFile=true" - "-p:PublishTrimmed=true" + "-p:UseAppHost=false" ]; dotnetInstallFlags = [ "--framework=net8.0" ]; - selfContainedBuild = true; runtimeDeps = [ libkrb5 zlib openssl ]; doCheck = true; preBuild = '' - export projectFile=(ArchiSteamFarm) + dotnetProjectFiles=(ArchiSteamFarm) ''; preInstall = '' @@ -58,11 +56,17 @@ buildDotnetModule rec { dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \ -p:UseAppHost=false - } + } - buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher - buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator - buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher + buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator + buildPlugin ArchiSteamFarm.OfficialPlugins.Monitoring + buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + + chmod +x $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll + wrapDotnetProgram $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll $out/bin/ArchiSteamFarm + substituteInPlace $out/bin/ArchiSteamFarm \ + --replace-fail "exec " "exec dotnet " ''; passthru = { diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index cc47f6d75949f..79ed6cdf624a5 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -57,10 +57,14 @@ (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.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.36.2"; sha256 = "02d658sjxd853lmqhhh13yhycm9nlmghl3p3fdn6iwmwhkly9qvy"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; sha256 = "0pcysg74pvhqs13087dh5r90xnixklmnz7bwv02304927mkv5345"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; sha256 = "0h5qkhmazlvwvjmxxj9pp2404rmvk55yf6npwcmlskv9mgfkli4r"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "05y1xb5fw8lzvb4si77a5qwfwfz1855crqbphrwky6x9llivbhkx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "18zdbcb2bn7wy1dp14z5jyqiiwr9rkad1lcb158r5ikjfq1rg5iw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "1nbxzmj6cnccylxis67c54c0ik38ma4rwdvgg6sxd6r04219maqm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1wqkbjd1ywv9w397l7rsb89mijc5n0hv7jq9h09xfz6wn9qsp152"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; sha256 = "0s0v7jmrq85n356xv7zixvwa4z94fszjcr5vll8x4im1a2lp00f9"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) @@ -76,54 +80,60 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.0"; sha256 = "0nigij1vz1biw1sl64mflx68fgm34lmnvq47z2n5p0qs534kvkhb"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.0"; sha256 = "025ixbv7jq294n8yw4y1bbd92iz08q4jqnnzqp0s8lgi49sk9dad"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.0"; sha256 = "1qyyfxww980s7xzw048kc8iqzarzbaj11cb5lrsisv777ccipma5"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.0"; sha256 = "0ns56pws3zlwjk8mjyfr02zl3nnhzka76wabfabplfci62bgi3h0"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.0"; sha256 = "18g4j9n47387k4ym3kl2dzhhhs6fs5rq96757fc4lcdql2rpkmp0"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.0"; sha256 = "11znwbbg44hhz3ly6j6q81qz83yqf97jj5zhpldng5zq0h791srl"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.0"; sha256 = "1slkzygcn4abpqip4rmi73h9096ihjkkaiwgmkaiba9pidn9lzlx"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.0"; sha256 = "1blj1ayw9qpjpsnb4k95s03pdkin0032mxgznfaw1z1qhhiqdnsi"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; sha256 = "13g8fwl09li8fc71nk13dgkb7gahd4qhamyg2xby7am63nlchhdf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "0gwqmkmr7jy3sjh9gha82amlry41gp8nwswy2iqfw54f28db63n7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "042cjvnwrrjs3mw5q8q5kinh0cwkks33i3n1vyifaid2jbr3wlc0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "06ndp4wh1cap01dql3nixka4g56bf6ipmqys7xaxvg4xisf79x8d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1kh5bnaf6h9mr4swcalrp304625frjiw6mlz1052rxwzsdq98a96"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.2"; sha256 = "00psv2mvynd2bz8xnzvqvb32qr33glqxg4ni5j91b93k84yjy5ma"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.0.2"; sha256 = "09yn3hi9npgi8rs2vyfyzcl8vbfa1lqcl6lgpymw5d7lg0hc511w"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.2"; sha256 = "0c65fsc23xxw648xh83sjcmrn9hvs9q58l5lb36wflvaajbsjf2r"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.2"; sha256 = "0bq46f4v2r4nzwly7g0dsakyc1lcql9nh85sp59d1fwzaknf1n94"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.2"; sha256 = "1vjqrpqjx3z1irqgy0ckmkgyvrzqqqcikxs36q6gadyj643ra1c5"; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; sha256 = "1wr8crmjg4gznm3jqgz9s9p285vrwb8a6baqc6gz3b58rn4m88km"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; sha256 = "1a6hyd3szjjpjkbr0ncfria0x2qijv3lwr4drhxm15xamfy23azw"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; sha256 = "19309m0b9cjy1642m99ipjvr6gxq6qb008bam3l10m1mz8m81j31"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; sha256 = "1bly8375zng21yjbfdi08c14lgapngv06p1dlzbryimxicqzxixx"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; sha256 = "0zlbqmvdb1vxnvmxh6lk65mz57c7mz6dqb1s8in0cfww8kxg058k"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; sha256 = "07674xnhc84h36pvzswx6ibjy0bgfi2bxhqm1zyq9fidmim0ch07"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; sha256 = "07j69cw8r39533w4p39mnj00kahazz38760in3jfc45kmlcdb26x"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; sha256 = "1bl471s7fx9jycr0cc8rylwf34mrvlg9qn1an6l86nisavfcyb7v"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest"; version = "3.2.2"; sha256 = "19pkywdlmgccv2ri52gbpb3pgci1ymb2ba5qhyp9j19vks6gf6cj"; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.2.2"; sha256 = "1ap7imbqxmz2namgli796pxj91gyn01k6xxnllldpwwbxpd0ijgd"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.2"; sha256 = "14nrxg1cd3lzaxw7zz8z91168sgnsf1xxnrpdy7wkd6ggk22hi19"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.2"; sha256 = "0igdrjr300bqz5lnibf9vl8pkaky1l27f889gza3a9xs83mpd06p"; }) + (fetchNuGet { pname = "MSTest"; version = "3.4.3"; sha256 = "070avma2zdxdpn23a9chgz9n1kglxh8nbb1g2ggzk3xxi5sdjj0n"; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; sha256 = "14a6rzh4cvaf9bw63qlxw242fbmk4agyx9qgl19swpciqcaq7pxi"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; sha256 = "0hsslndnfyb6shgkmgy10f1c9p6b47ry20zr2l1msagmkrk49s5q"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; sha256 = "0hviglzfv16dd3aczny455sy1k0rikzd5w34smfpjyxc0wqx6xvp"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) (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.8"; sha256 = "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.8"; sha256 = "05a6bzvdf63lbnn6sj3yfggxcgv96j91kdbcw0ac5hxl58df58r6"; }) + (fetchNuGet { pname = "NLog"; version = "5.3.2"; sha256 = "01qnzmwvc93yywhvy5g29fb8jnalfi82az7296nblyqjalhbzz3g"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; sha256 = "0j276q0a14qk9nc3f03265jl5wp38bnm7dyyx0s4kxkyb3kx3z8c"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; sha256 = "17xvaj54liyk9zq0f80z1ai6wq4rgj6xy93znvsdcnldmin1icz9"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.0-rc.1"; sha256 = "0scpylqwqmp7lpmixci88v6zf7jzf3zrcbrhl30bd4p7r4alw2lp"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0"; sha256 = "099yivazj5078076xydssf38r71c5nk3n7hy0lr51p80gln1vdha"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0-rc.1"; sha256 = "0rnl9pkwbz2srkss3ay05jjrfkyzibxa6vx0hg7rzfpyjinhaycs"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0"; sha256 = "1j7bxhpwpcrjr4am7s4mavjjpasikv4kp8glmxiw5x9zvc0x0ix7"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0-rc.1"; sha256 = "18r7m4zjimkkwjqw8hd9xa85lnj1fy45xyd338fbpp9nm73j9r2g"; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.8.0-rc.1"; sha256 = "0fiz7qpzn64by4dlc5r9ha2qrp1j9w9lm6c7bzpvshzwz8ifamv7"; }) - (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.0-rc.1"; sha256 = "0p5sybp1b8fkccibhlmjlvdnhryscqh9f435c34bwp6vvllxf17z"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.7.1"; sha256 = "19r12csxwdrvl5yx88mv68rzj2cy43004pwldy6q89v42sr01kyi"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.7.1"; sha256 = "0mvrcz2mg3caf4lcwi1ai7i7ldb27p4y2qx9vckfjal203bps352"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.7.0"; sha256 = "0klyd24akymj2hpjlnzmz7x9kggj4amhaqx1zh9nxjvlmmy64gxy"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; sha256 = "0y16qp3xrypk48f27pfvccic47p9wpl4qx8mar4rf2b78ca21c9p"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; sha256 = "1slyjdzbiv179sq91bq6bhbqw20jmk6j9x1g5fhvnqsymfqmnmq2"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; sha256 = "1i09vjjrimg0bwraamsjdqx886apscwj72skds3ysvc9c7n0hpl2"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0"; sha256 = "0s402mz4gz1chlg29159awawpi6ms4ln5gdds01y38wx6cia6lb9"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; sha256 = "0c2dvnnnizn5g50js336lkgfxh6klcdb0h8pppf68v3liwlhxly5"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; sha256 = "1ayy2q9cg6482ahvz3cx7a3cikjrnmr5kr7yk9qnbbwy0wfmb6gw"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0"; sha256 = "1vhl02w068ynhpak0pyjn2xmrnisl9m73lmsckwkncrhinplw7hz"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; sha256 = "0lys1l0qsna2h82j2rbxi5fc8barrq43fs0lradr85r7sy3x91cg"; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; sha256 = "1777nbj78yppmqmwvv0bsl4l0vp8lfc5fpsdmknf6wl354f0z1f8"; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; sha256 = "01vi9sqb2j25i6926c581w067nadf4q4hs0hkwjg8wpzhxz0n3xq"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.8.1"; sha256 = "0s5kxqjhmwm2p2sblmmsavvmknqb8yr0b07ngq8hk0w8b48kyc0h"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.8.1"; sha256 = "0p3mw08vi9ljf06239n8b1hfj0cqqb198qn89sf39mdjsy13ca95"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.8.1"; sha256 = "0j2i01378848nvib1krk948lp74x8ykgspka05g37a3s284p1nyd"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; sha256 = "08bjdn8dbqpzn5c9fw89y5766irwplgyzhyxcrjzpywkwpj75r4i"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; sha256 = "01mgw4s0b2vxf55v6fa3n5l9jwk6bkl60aaqv7azl198wwslkjhq"; }) (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; sha256 = "01lrbkbpfqdkhba9hsfg9fqyh1sa9r2cp54r2wlb83zfr3f5q8l8"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; sha256 = "0lq774iggpvsmykbrplvv2a5z2ylsslv5wynmvpnlznd4lvgxb4h"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; sha256 = "1snz71ws87kr8pz4c3zcla51mqbly015ib6b0y20xvkj25qx7gl8"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; sha256 = "0j93y0krn5fzvji0k7g4cxi22b7j8n3brxw4698pjq2pqqf2d8qy"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; sha256 = "00lar7246mncidflm15xz5b9hpni9bf8wj37dc0l2sj3hhv9nvwj"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; sha256 = "0w0h2cs8n5avczzm5plzmkvkc6xn0pj425f4400fk21h8ysvhg8h"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; }) @@ -141,5 +151,4 @@ (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) - (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 535f161e24723..004aadbe781ea 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "f70253c96e76fff5c5537c7be57a57de4e273eb8"; + version = "78188871dfce90fb04096e9fd0b6ce2411312dae"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-hw6M8O486vnWqdO4DqljOoGEevykpxhez3QL745VfIk="; + hash = "sha256-NBxN3pQFiDsRYp2Ro0WwWdGzKVjPTKx4/xWQrMNuv0M="; }; - npmDepsHash = "sha256-GpGVM9c5yaLHi77qpShm30/uObg1TdLFCIhmFvLEhaU="; + npmDepsHash = "sha256-9pLbSOMfKwkWtzmKNmeKNrgdtzh3riWWJlrbuoDRUrw="; installPhase = '' runHook preInstall @@ -25,7 +25,7 @@ buildNpmPackage rec { ''; meta = with lib; { - description = "The official web interface for ASF"; + description = "Official web interface for ASF"; license = licenses.asl20; homepage = "https://github.com/JustArchiNET/ASF-ui"; inherit (ArchiSteamFarm.meta) maintainers platforms; diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix deleted file mode 100644 index bca7697f758ae..0000000000000 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ buildPackages -, fetchzip -, javaOpts ? "-XX:+UseZGC" -, jdk -, jre_headless -, lib -, makeWrapper -, stdenvNoCC -, -}: -stdenvNoCC.mkDerivation rec { - pname = "HentaiAtHome"; - version = "1.6.3"; - - src = fetchzip { - url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; - hash = "sha512-kBB5mn9MwpkZ0z+Fl5ABs4YWBkXkMRcADYSAPkeifyhbYQQPOnijXKYZCkzE4UB3uQ1j6Kj6WnpO/4jquYEiOQ=="; - stripRoot = false; - }; - - nativeBuildInputs = [ jdk makeWrapper ]; - - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc") - "${buildPackages.glibcLocales}/lib/locale/locale-archive"; - - buildPhase = '' - make all - ''; - - installPhase = '' - mkdir -p $out/share/java - cp build/HentaiAtHome.jar $out/share/java - - mkdir -p $out/bin - makeWrapper ${jre_headless}/bin/java $out/bin/HentaiAtHome \ - --add-flags "${javaOpts} -jar $out/share/java/HentaiAtHome.jar" - ''; - - doInstallCheck = true; - installCheckPhase = '' - pushd $(mktemp -d) - $out/bin/HentaiAtHome - popd - ''; - - strictDeps = true; - - meta = with lib; { - homepage = "https://ehwiki.org/wiki/Hentai@Home"; - description = - "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; - license = licenses.gpl3; - maintainers = with maintainers; [ terrorjack ]; - mainProgram = "HentaiAtHome"; - }; -} diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix deleted file mode 100644 index 67b21e5199de5..0000000000000 --- a/pkgs/applications/misc/ablog/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, python3 -, fetchPypi -}: - -python3.pkgs.buildPythonApplication rec { - pname = "ablog"; - version = "0.11.8"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-PpNBfa4g14l8gm9+PxOFc2NDey031D7Ohutx2OGUeak="; - }; - - nativeBuildInputs = with python3.pkgs; [ - setuptools - setuptools-scm - wheel - ]; - - propagatedBuildInputs = with python3.pkgs; [ - docutils - feedgen - invoke - packaging - python-dateutil - sphinx - watchdog - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - "-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning" - "--rootdir" "src/ablog" - "-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError - ]; - - meta = with lib; { - description = "ABlog for blogging with Sphinx"; - mainProgram = "ablog"; - homepage = "https://ablog.readthedocs.io/en/latest/"; - license = licenses.mit; - maintainers = with maintainers; [ rgrinberg ]; - }; -} diff --git a/pkgs/applications/misc/acpic/default.nix b/pkgs/applications/misc/acpic/default.nix index 7a53e564c57c5..eeef043f106ee 100644 --- a/pkgs/applications/misc/acpic/default.nix +++ b/pkgs/applications/misc/acpic/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "Daemon extending acpid event handling capabilities."; + description = "Daemon extending acpid event handling capabilities"; mainProgram = "acpic"; homepage = "https://github.com/psliwka/acpic"; license = licenses.wtfpl; diff --git a/pkgs/applications/misc/actiona/default.nix b/pkgs/applications/misc/actiona/default.nix index 0d1500448a140..069473ce3c0fc 100644 --- a/pkgs/applications/misc/actiona/default.nix +++ b/pkgs/applications/misc/actiona/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A cross-platform automation tool"; + description = "Cross-platform automation tool"; homepage = "https://github.com/Jmgr/actiona"; license = lib.licenses.gpl3Only; mainProgram = "actiona"; diff --git a/pkgs/applications/misc/activate-linux/default.nix b/pkgs/applications/misc/activate-linux/default.nix index 3515f190fe770..143e8cf0809f8 100644 --- a/pkgs/applications/misc/activate-linux/default.nix +++ b/pkgs/applications/misc/activate-linux/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "The \"Activate Windows\" watermark ported to Linux"; + description = "\"Activate Windows\" watermark ported to Linux"; homepage = "https://github.com/MrGlockenspiel/activate-linux"; license = licenses.gpl3; maintainers = with maintainers; [ alexnortung donovanglover ]; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 8fe269ddab230..5b1e1aac20c1a 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A fast and flexible keyboard launcher"; + description = "Fast and flexible keyboard launcher"; longDescription = '' Albert is a desktop agnostic launcher. Its goals are usability and beauty, performance and extensibility. It is written in C++ and based on the Qt diff --git a/pkgs/applications/misc/anup/default.nix b/pkgs/applications/misc/anup/default.nix index 94c21164184da..91cf5c9540a5b 100644 --- a/pkgs/applications/misc/anup/default.nix +++ b/pkgs/applications/misc/anup/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/Acizza/anup"; - description = "An anime tracker for AniList featuring a TUI"; + description = "Anime tracker for AniList featuring a TUI"; license = licenses.agpl3Only; maintainers = with maintainers; [ natto1784 ]; mainProgram = "anup"; diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index c89bbde6569a5..c81d4f65d785e 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -9,7 +9,8 @@ let wtforms = super.wtforms.overridePythonAttrs (oldAttrs: rec { version = "2.3.1"; - src = oldAttrs.src.override { + src = fetchPypi { + pname = "WTForms"; inherit version; sha256 = "sha256-hhoTs65SHWcA2sOydxlwvTVKY7pwQ+zDqCtSiFlqGXI="; }; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index 0dfc3285c0615..ee22c2776c5a1 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus-glib gtk2 wordnet ]; meta = with lib; { - description = "An offline thesaurus based on WordNet"; + description = "Offline thesaurus based on WordNet"; homepage = "https://artha.sourceforge.net"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 6762fbe25742f..f469ef5f0fed8 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "An audio resampling library"; + description = "Audio resampling library"; homepage = "https://soxr.sourceforge.net"; license = licenses.lgpl21Plus; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index c39430091e0d5..33a4edbdbe579 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -37,31 +37,28 @@ stdenv.mkDerivation (finalAttrs: rec { makeFlags = [ "PERLPATH=${perl}/bin/perl" - # We *need* to pass DESTDIR, as the Makefile ignores PREFIX. - "DESTDIR=$(out)" - # Relative paths. - "BINDIR=/bin" - "PERLDIR=/share/perl5" - "MODSDIR=/lib" # At runtime, AMC will test for that dir before - # defaulting to the "portable" strategy we use, so this test - # *must* fail. *But* this variable cannot be set to anything but - # "/lib" , because that name is hardcoded in the main executable - # and this variable controls both both the path AMC will check at - # runtime, AND the path where the actual modules will be stored at - # build-time. This has been reported upstream as - # https://project.auto-multiple-choice.net/issues/872 - "TEXDIR=/tex/latex/" # what texlive.combine expects - "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this? - "MAN1DIR=/share/man/man1" - "DESKTOPDIR=/share/applications" - "METAINFODIR=/share/metainfo" - "ICONSDIR=/share/auto-multiple-choice/icons" - "APPICONDIR=/share/icons/hicolor" - "LOCALEDIR=/share/locale" - "MODELSDIR=/share/auto-multiple-choice/models" - "DOCDIR=/share/doc/auto-multiple-choice" - "SHARED_MIMEINFO_DIR=/share/mime/packages" - "LANG_GTKSOURCEVIEW_DIR=/share/gtksourceview-4/language-specs" + # We *need* to set DESTDIR as empty and use absolute paths below, + # because the Makefile ignores PREFIX and MODSDIR is required to + # be an absolute path to not trigger "portable distribution" check + # in auto-multiple-choice.in. + "DESTDIR=" + # Set variables from Makefile.conf to absolute paths + "BINDIR=${placeholder "out"}/bin" + "PERLDIR=${placeholder "out"}/share/perl5" + "MODSDIR=${placeholder "out"}/lib" + "TEXDIR=${placeholder "out"}/tex/latex/" # what texlive.combine expects + "TEXDOCDIR=${placeholder "out"}/share/doc/texmf/" # TODO where to put this? + "MAN1DIR=${placeholder "out"}/share/man/man1" + "DESKTOPDIR=${placeholder "out"}/share/applications" + "METAINFODIR=${placeholder "out"}/share/metainfo" + "ICONSDIR=${placeholder "out"}/share/auto-multiple-choice/icons" + "CSSDIR=${placeholder "out"}/share/auto-multiple-choice/gtk" + "APPICONDIR=${placeholder "out"}/share/icons/hicolor" + "LOCALEDIR=${placeholder "out"}/share/locale" + "MODELSDIR=${placeholder "out"}/share/auto-multiple-choice/models" + "DOCDIR=${placeholder "out"}/share/doc/auto-multiple-choice" + "SHARED_MIMEINFO_DIR=${placeholder "out"}/share/mime/packages" + "LANG_GTKSOURCEVIEW_DIR=${placeholder "out"}/share/gtksourceview-4/language-specs" # Pretend to be redhat so `install` doesn't try to chown/chgrp. "SYSTEM_TYPE=rpm" "GCC=${stdenv.cc.targetPrefix}cc" @@ -93,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: rec { XMLWriter ]}:"$out/share/perl5 \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix PATH : "$out/bin" \ --set TEXINPUTS ":.:$out/tex/latex" ''; @@ -143,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: rec { }; meta = with lib; { - description = "Create and manage multiple choice questionnaires with automated marking."; + description = "Create and manage multiple choice questionnaires with automated marking"; mainProgram = "auto-multiple-choice"; longDescription = '' Create, manage and mark multiple-choice questionnaires. diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix index 77d942797abcd..0b05e9ce5499f 100644 --- a/pkgs/applications/misc/avizo/default.nix +++ b/pkgs/applications/misc/avizo/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A neat notification daemon for Wayland"; + description = "Neat notification daemon for Wayland"; homepage = "https://github.com/misterdanb/avizo"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index ff441f672a502..2c2c00d8b24ab 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -188,7 +188,7 @@ stdenv.mkDerivation rec { meta = { maintainers = with lib.maintainers; [ xavierzwirtz ]; - description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; + description = "Data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; diff --git a/pkgs/applications/misc/base16-universal-manager/default.nix b/pkgs/applications/misc/base16-universal-manager/default.nix index 98a255f873983..44b521ae0d166 100644 --- a/pkgs/applications/misc/base16-universal-manager/default.nix +++ b/pkgs/applications/misc/base16-universal-manager/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-U28OJ5heeiaj3aGAhR6eAXzfvFMehAUcHzyFkZBRK6c="; meta = with lib; { - description = "A universal manager to set base16 themes for any supported application"; + description = "Universal manager to set base16 themes for any supported application"; homepage = "https://github.com/pinpox/base16-universal-manager"; license = licenses.mit; maintainers = with maintainers; [ jo1gi ]; diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index f4e25200835b7..f0f82a6f626cd 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A collection of small bash scripts for heavy terminal users"; + description = "Collection of small bash scripts for heavy terminal users"; homepage = "https://github.com/alexanderepstein/Bash-Snippets"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 5cda5ec969bc5..d017f4306fe73 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lheckemann ]; + maintainers = with maintainers; [ ]; mainProgram = "bemenu"; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index f49477fae234d..aa24399dbde84 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://www.bibletime.info/"; - description = "A powerful cross platform Bible study tool"; + description = "Powerful cross platform Bible study tool"; mainProgram = "bibletime"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix index dfb424ea9da56..11f63b7a868f4 100644 --- a/pkgs/applications/misc/bicon/default.nix +++ b/pkgs/applications/misc/bicon/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A bidirectional console"; + description = "Bidirectional console"; homepage = "https://github.com/behdad/bicon"; license = [ licenses.lgpl21 licenses.psfl licenses.bsd0 ]; maintainers = [ ]; diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix index 5e067ac807d94..bfb1d646a9196 100644 --- a/pkgs/applications/misc/bitwarden-menu/default.nix +++ b/pkgs/applications/misc/bitwarden-menu/default.nix @@ -1,33 +1,40 @@ { lib , buildPythonApplication +, python3Packages , fetchPypi , pynput -, xdg +, xdg-base-dirs }: buildPythonApplication rec { pname = "bitwarden-menu"; - version = "0.4.1"; - format = "setuptools"; + version = "0.4.3"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-OC+MHEiUU6bDT2wSSDtu0KnwDwBpbLTBta0xjfuzlOI="; + pname = "bitwarden_menu"; + inherit version; + hash = "sha256-tuIolWvQ/vKSJr6oUTL7ZLPgdkYsIZods5yQNNfWbWY="; }; + nativeBuildInputs = with python3Packages; [ + hatch-vcs + hatchling + ]; + propagatedBuildInputs = [ pynput - xdg + xdg-base-dirs ]; doCheck = false; meta = with lib; { changelog = "https://github.com/firecat53/bitwarden-menu/releases/tag/v${version}"; - description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database."; + description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database"; mainProgram = "bwm"; homepage = "https://github.com/firecat53/bitwarden-menu"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ aman9das ]; }; } diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index bb0e777186a28..57d55cedbc684 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -11,13 +11,13 @@ python3Packages.buildPythonApplication rec { pname = "bleachbit"; - version = "4.4.0"; + version = "4.6.0"; format = "other"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0kqqfzq6bh03n7kxb9vd483bqi1cklfvj35a7h4iqk96sq1xv8z6"; + sha256 = "sha256-UwUphuUeXFy71I+tmKnRH858dPrA2+xDxnG9h26a+kE="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "http://bleachbit.sourceforge.net"; - description = "A program to clean your computer"; + description = "Program to clean your computer"; longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = licenses.gpl3; maintainers = with maintainers; [ leonardoce mbprtpmnr ]; diff --git a/pkgs/applications/misc/blogc/default.nix b/pkgs/applications/misc/blogc/default.nix index 86d52625dc2e1..4360cc6f20a04 100644 --- a/pkgs/applications/misc/blogc/default.nix +++ b/pkgs/applications/misc/blogc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A blog compiler"; + description = "Blog compiler"; license = licenses.bsd3; homepage = "https://blogc.rgm.io"; platforms = platforms.unix; diff --git a/pkgs/applications/misc/boatswain/default.nix b/pkgs/applications/misc/boatswain/default.nix index 62912798b535b..5d2b1540aebe7 100644 --- a/pkgs/applications/misc/boatswain/default.nix +++ b/pkgs/applications/misc/boatswain/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "Control Elgato Stream Deck devices."; + description = "Control Elgato Stream Deck devices"; homepage = "https://gitlab.gnome.org/World/boatswain"; mainProgram = "boatswain"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 434ffd76852e8..495a945d32d3c 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -103,7 +103,7 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - description = "An easy-to-use wineprefix manager"; + description = "Easy-to-use wineprefix manager"; homepage = "https://usebottles.com/"; downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/calcure/default.nix b/pkgs/applications/misc/calcure/default.nix index a9fd65a4d99df..bc82942ffccf7 100644 --- a/pkgs/applications/misc/calcure/default.nix +++ b/pkgs/applications/misc/calcure/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "calcure"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "calcure"; rev = "refs/tags/${version}"; - hash = "sha256-rs3TCZjMndeh2N7e+U62baLs+XqWK1Mk7KVnypSnWPg="; + hash = "sha256-2yWg/9NQxFIwoSLj1e0y1+tgKer8GtOmjzwlTRX/Q+c="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 07faa52710dfd..49d8a9e42d421 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A calendar and scheduling application for the command line"; + description = "Calendar and scheduling application for the command line"; longDescription = '' calcurse is a calendar and scheduling application for the command line. It helps keep track of events, appointments and everyday tasks. A configurable notification diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 013f41d352581..0e19d15973651 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.10.0"; + version = "7.12.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-GvvvoqLBzapveKFSqlED471pUyRjLoYqU5YjN/L/nEs="; + hash = "sha256-XHkORTUx3+O+i2vbTiZAHI/0hY3xPIXvvNAVuXy4wzk="; }; patches = [ diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 4cf13498be942..0b7630b53f099 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/L1L1/cardpeek"; - description = "A tool to read the contents of ISO7816 smart cards"; + description = "Tool to read the contents of ISO7816 smart cards"; license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ embr ]; diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix index 6481805cc9969..3674d61fafcae 100644 --- a/pkgs/applications/misc/cartridges/default.nix +++ b/pkgs/applications/misc/cartridges/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cartridges"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; rev = "v${finalAttrs.version}"; - hash = "sha256-x6utIvU4LxM/CJogy5JrFrDTLFmXbgItgqtT+lM7FGA="; + hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4="; }; pythonPath = with python3Packages; [ @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A GTK4 + Libadwaita game launcher"; + description = "GTK4 + Libadwaita game launcher"; mainProgram = "cartridges"; longDescription = '' A simple game launcher for all of your games. diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 9576ee2ebc6c7..860a49b5ce03e 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://cgg.bzatek.net/"; - description = "A simple static web photo gallery, designed to be clean and easily usable"; + description = "Simple static web photo gallery, designed to be clean and easily usable"; license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index 9ec41576c1a85..7310b1c7f19d8 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/npiv/chatblade/"; - description = "A CLI Swiss Army Knife for ChatGPT"; + description = "CLI Swiss Army Knife for ChatGPT"; mainProgram = "chatblade"; license = licenses.gpl3Only; maintainers = with maintainers; [ deejayem ]; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 48d382e284ff3..f3429399b1633 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An hierarchical note taking application"; + description = "Hierarchical note taking application"; mainProgram = "cherrytree"; longDescription = '' Cherrytree is an hierarchical note taking application, featuring rich diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index a51279c73a261..f4416738e0e83 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A simple application for encoding and decoding text, designed for elementary OS"; + description = "Simple application for encoding and decoding text, designed for elementary OS"; homepage = "https://github.com/arshubham/cipher"; maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 3b0189ddb5c1c..882c29f4b36e4 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A C daemon that turns your webcam into a light sensor"; + description = "C daemon that turns your webcam into a light sensor"; homepage = "https://github.com/FedeDP/Clight"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 999bc4e0cc896..49e3f13b6d2e5 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -94,10 +94,10 @@ buildPythonApplication rec { ''; meta = with lib; { - description = "A QR code scanner desktop app for Linux"; + description = "QR code scanner desktop app for Linux"; homepage = "https://github.com/hongquan/CoBang"; license = licenses.gpl3Only; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; mainProgram = "cobang"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index ca96bd3d2eec8..99841742786e1 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; meta = with lib; { - description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; + description = "Fastest and most interactive terminal based UI application for tracking cryptocurrencies"; longDescription = '' cointop is a fast and lightweight interactive terminal based UI application for tracking and monitoring cryptocurrency coin stats in diff --git a/pkgs/applications/misc/colorstorm/default.nix b/pkgs/applications/misc/colorstorm/default.nix index ddb429dae33f7..63014eb51e60f 100644 --- a/pkgs/applications/misc/colorstorm/default.nix +++ b/pkgs/applications/misc/colorstorm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "A color theme generator for editors and terminal emulators"; + description = "Color theme generator for editors and terminal emulators"; homepage = "https://github.com/benbusby/colorstorm"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix index 2716e2d464bcf..e7f3429fe8d7c 100644 --- a/pkgs/applications/misc/colort/default.nix +++ b/pkgs/applications/misc/colort/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "A program for 'tinting' color values"; + description = "Program for 'tinting' color values"; homepage = "https://github.com/neeasade/colort"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/misc/coltrane/default.nix b/pkgs/applications/misc/coltrane/default.nix index 5d77f8dd6d567..f4c1ccb41e9ab 100644 --- a/pkgs/applications/misc/coltrane/default.nix +++ b/pkgs/applications/misc/coltrane/default.nix @@ -12,7 +12,7 @@ bundlerApp rec { meta = with lib; { homepage = "https://github.com/pedrozath/coltrane"; - description = "A music calculation library/CLI"; + description = "Music calculation library/CLI"; longDescription = '' coltrane allows to search for Notes, Chords, Scales for guitar, bass, piano and ukelele diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix index 2d780d5d514b6..b9fd5ea28ba9a 100644 --- a/pkgs/applications/misc/comodoro/default.nix +++ b/pkgs/applications/misc/comodoro/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "CLI to manage your time."; + description = "CLI to manage your time"; homepage = "https://pimalaya.org/comodoro/"; changelog = "https://github.com/soywod/comodoro/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/applications/misc/conceal/default.nix b/pkgs/applications/misc/conceal/default.nix index 177162499230c..8579e54f33fd2 100644 --- a/pkgs/applications/misc/conceal/default.nix +++ b/pkgs/applications/misc/conceal/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A trash collector written in Rust"; + description = "Trash collector written in Rust"; homepage = "https://github.com/TD-Sky/conceal"; license = licenses.mit; maintainers = with maintainers; [ jedsek kashw2 ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index bb7201de590f6..e6b2fabd24e1f 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "CopyQ"; - version = "8.0.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-Ewunl4k9f0aDjilhKAsVxwR3S6uSZ1xwtu6ccNsNOgk="; + hash = "sha256-Dxiytspqs4+bcnUM+B3lO8iQp9rrCvMfI+WMFMCtM7g="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index a7397da8d7cf7..9240635aa5421 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-zTH7iSPN7VIhXvWFndOulvGnfUZ+uGWnW53WcnSW+e4="; + sha256 = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; }; patches = [ ./polkit-dir.patch diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 827a76fdd4518..14c8ee0edd4e2 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-Qr4pHtTQfJjRiFI4vZAynRWyJWYqWHYhZH4Mgd6OgR8="; + hash = "sha256-6FriNAwxo+YnJWmCrScyafUEkJvEJz3O9Zoj9yerpSI="; }; - cargoHash = "sha256-U/kVN8oaNuZ9CdLkAQWK3H5kZv5qZgzWQwi8pHMVPcM="; + cargoHash = "sha256-/CW0CGhPjKd5oU2LYW4lPWKMATn9aJdjIy44yZJyU/E="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 5209368a6b229..8f6bc27438faf 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; + description = "Simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; homepage = "https://crow-translate.github.io/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 315d5ffc34cf5..16c1ac90aea94 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://ctodo.apakoh.dk/"; - description = "A simple ncurses-based task list manager"; + description = "Simple ncurses-based task list manager"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index fd07542b7fa90..35d2ab7117947 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; homepage = "https://github.com/Cubitect/cubiomes-viewer"; - description = "A graphical Minecraft seed finder and map viewer"; + description = "Graphical Minecraft seed finder and map viewer"; mainProgram = "cubiomes-viewer"; longDescription = '' Cubiomes Viewer provides a graphical interface for the efficient and flexible seed-finding diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index 818e9da4494ed..cd6363f5a1006 100644 --- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A side bar for showing widgets from the C Suite"; + description = "Side bar for showing widgets from the C Suite"; mainProgram = "coreaction"; homepage = "https://gitlab.com/cubocore/coreapps/coreaction"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index 6bbd8ed8f7854..79e1e206ea02d 100644 --- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A lightwight filemanager from the C Suite"; + description = "Lightwight filemanager from the C Suite"; mainProgram = "corefm"; homepage = "https://gitlab.com/cubocore/coreapps/corefm"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 8a7050e5538ac..6c181da0b112d 100644 --- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A settings manager for the C Suite"; + description = "Settings manager for the C Suite"; mainProgram = "coregarage"; homepage = "https://gitlab.com/cubocore/coreapps/coregarage"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index d802a6f448afd..1c4d643488eb5 100644 --- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A file finder utility from the C Suite"; + description = "File finder utility from the C Suite"; mainProgram = "corehunt"; homepage = "https://gitlab.com/cubocore/coreapps/corehunt"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index cbb5fba861fb2..61e20afa5eeb0 100644 --- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "An image viewer from the C Suite"; + description = "Image viewer from the C Suite"; mainProgram = "coreimage"; homepage = "https://gitlab.com/cubocore/coreapps/coreimage"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index 6093c1176b808..32ccccf4b2a41 100644 --- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A file information tool from the C Suite"; + description = "File information tool from the C Suite"; mainProgram = "coreinfo"; homepage = "https://gitlab.com/cubocore/coreapps/coreinfo"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index dcd05b4bf77f3..0a6b7b15e1424 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A virtual keyboard for X11 from the C Suite"; + description = "Virtual keyboard for X11 from the C Suite"; mainProgram = "corekeyboard"; homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix index 8db13988b0b0b..3a1cd9f87c1c8 100644 --- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A document editor from the C Suite"; + description = "Document editor from the C Suite"; mainProgram = "corepad"; homepage = "https://gitlab.com/cubocore/coreapps/corepad"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 345a9b26e666c..01a495bfcbaf8 100644 --- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A paint app from the C Suite"; + description = "Paint app from the C Suite"; mainProgram = "corepaint"; homepage = "https://gitlab.com/cubocore/coreapps/corepaint"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index 242422fd8a3f5..a343f84baf8c7 100644 --- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A PDF viewer from the C Suite"; + description = "PDF viewer from the C Suite"; mainProgram = "corepdf"; homepage = "https://gitlab.com/cubocore/coreapps/corepdf"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix index cb31415ef5d04..e7306691b02c0 100644 --- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A bookmarking app from the C Suite"; + description = "Bookmarking app from the C Suite"; mainProgram = "corepins"; homepage = "https://gitlab.com/cubocore/coreapps/corepins"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index 6d48c65fc95fd..92d8cd04c95b4 100644 --- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A batch file renamer from the C Suite"; + description = "Batch file renamer from the C Suite"; mainProgram = "corerenamer"; homepage = "https://gitlab.com/cubocore/coreapps/corerenamer"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index 3603becfc1e32..ed9339251756a 100644 --- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A screen capture utility from the C Suite"; + description = "Screen capture utility from the C Suite"; mainProgram = "coreshot"; homepage = "https://gitlab.com/cubocore/coreapps/coreshot"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix index e01691b9f6182..a6d12a0d2c28a 100644 --- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A system resource viewer from the C Suite"; + description = "System resource viewer from the C Suite"; mainProgram = "corestats"; homepage = "https://gitlab.com/cubocore/coreapps/corestats"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index 933a09bbd188d..08b8629da6525 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "An activity viewer from the C Suite"; + description = "Activity viewer from the C Suite"; mainProgram = "corestuff"; homepage = "https://gitlab.com/cubocore/coreapps/corestuff"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index c4a8ea5c90e96..d2dc3599bd34a 100644 --- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A terminal emulator from the C Suite"; + description = "Terminal emulator from the C Suite"; mainProgram = "coreterminal"; homepage = "https://gitlab.com/cubocore/coreapps/coreterminal"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix index b8ac4c39a1a3a..626b7cf8eda41 100644 --- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A time related task manager from the C Suite"; + description = "Time related task manager from the C Suite"; mainProgram = "coretime"; homepage = "https://gitlab.com/cubocore/coreapps/coretime"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index 90df8e546e7bd..d4b15ead4ec00 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A library for bookmarking, saving recent activites, managing settings of C-Suite"; + description = "Library for bookmarking, saving recent activites, managing settings of C-Suite"; homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 1155ce8e8e8e1..70283d49fea93 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; + description = "Powerful, fast and robust engine for processing 3D models into 3D printing instruction"; homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3Only; platforms = platforms.linux; diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/applications/misc/darkman/default.nix index 1b33b9fac3ed8..33918b41329ba 100644 --- a/pkgs/applications/misc/darkman/default.nix +++ b/pkgs/applications/misc/darkman/default.nix @@ -1,29 +1,38 @@ -{ lib, fetchFromGitLab, buildGoModule, scdoc, nix-update-script }: +{ lib +, fetchFromGitLab +, buildGoModule +, scdoc +, nix-update-script +}: buildGoModule rec { pname = "darkman"; - version = "1.5.4"; + version = "2.0.1"; src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "darkman"; rev = "v${version}"; - sha256 = "sha256-6SNXVe6EfVwcXH9O6BxNw+v4/uhKhCtVS3XE2GTc2Sc="; + sha256 = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o="; }; - vendorHash = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY="; - - nativeBuildInputs = [ scdoc ]; + patches = [ + ./go-mod.patch + ./makefile.patch + ]; postPatch = '' substituteInPlace darkman.service \ - --replace "/usr/bin/darkman" "$out/bin/darkman" + --replace-fail /usr/bin/darkman $out/bin/darkman substituteInPlace contrib/dbus/nl.whynothugo.darkman.service \ - --replace "/usr/bin/darkman" "$out/bin/darkman" + --replace-fail /usr/bin/darkman $out/bin/darkman substituteInPlace contrib/dbus/org.freedesktop.impl.portal.desktop.darkman.service \ - --replace "/usr/bin/darkman" "$out/bin/darkman" + --replace-fail /usr/bin/darkman $out/bin/darkman ''; + vendorHash = "sha256-3lILSVm7mtquCdR7+cDMuDpHihG+gDJTcQa1cM2o7ZU="; + nativeBuildInputs = [ scdoc ]; + buildPhase = '' runHook preBuild make build @@ -32,6 +41,7 @@ buildGoModule rec { installPhase = '' runHook preInstall + install -Dm755 darkman -t $out/bin make PREFIX=$out install runHook postInstall ''; diff --git a/pkgs/applications/misc/darkman/go-mod.patch b/pkgs/applications/misc/darkman/go-mod.patch new file mode 100644 index 0000000000000..8fbb26dfc5a03 --- /dev/null +++ b/pkgs/applications/misc/darkman/go-mod.patch @@ -0,0 +1,28 @@ +diff --git a/go.mod b/go.mod +index 2d396a4..c4fea4b 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,14 +1,19 @@ + module gitlab.com/WhyNotHugo/darkman + +-go 1.16 ++go 1.18 + + require ( + github.com/adrg/xdg v0.3.3 + github.com/godbus/dbus/v5 v5.0.4 +- github.com/kr/pretty v0.2.0 // indirect + github.com/rxwycdh/rxhash v0.0.0-20230131062142-10b7a38b400d + github.com/sj14/astral v0.1.2 +- github.com/spf13/cobra v1.7.0 // indirect +- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ++ github.com/spf13/cobra v1.7.0 + gopkg.in/yaml.v3 v3.0.1 + ) ++ ++require ( ++ github.com/inconshreveable/mousetrap v1.1.0 // indirect ++ github.com/kr/pretty v0.2.0 // indirect ++ github.com/spf13/pflag v1.0.5 // indirect ++ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ++) diff --git a/pkgs/applications/misc/darkman/makefile.patch b/pkgs/applications/misc/darkman/makefile.patch new file mode 100644 index 0000000000000..1374c37cf061c --- /dev/null +++ b/pkgs/applications/misc/darkman/makefile.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index 9048e45..0fb1f5a 100644 +--- a/Makefile ++++ b/Makefile +@@ -26,7 +26,6 @@ site/index.html: darkman.1 + mandoc -T html -O style=man-style.css < darkman.1 > site/index.html + + install: build +- @install -Dm755 darkman ${DESTDIR}${PREFIX}/bin/darkman + @install -Dm644 darkman.service ${DESTDIR}${PREFIX}/lib/systemd/user/darkman.service + @install -Dm644 darkman.1 ${DESTDIR}${PREFIX}/share/man/man1/darkman.1 + @install -Dm644 LICENCE ${DESTDIR}${PREFIX}/share/licenses/darkman/LICENCE diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 5551ebe1750f7..e6fed669c72d6 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -55,7 +55,7 @@ in mkDerivation rec { echo "${systemd-service}" > $out/lib/systemd/user/deadd-notification-center.service ''; - description = "A haskell-written notification center for users that like a desktop with style"; + description = "Haskell-written notification center for users that like a desktop with style"; homepage = "https://github.com/phuhl/linux_notification_center"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ melkor333 sna ]; diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix index 03e5e05852ad0..2261b7c516bc9 100644 --- a/pkgs/applications/misc/deckmaster/default.nix +++ b/pkgs/applications/misc/deckmaster/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "An application to control your Elgato Stream Deck on Linux"; + description = "Application to control your Elgato Stream Deck on Linux"; mainProgram = "deckmaster"; homepage = "https://github.com/muesli/deckmaster"; changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}"; diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix index a39f6b4f0bad1..5efa22e8843c9 100644 --- a/pkgs/applications/misc/deco/default.nix +++ b/pkgs/applications/misc/deco/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ebzzry/deco"; - description = "A simple root image setter"; + description = "Simple root image setter"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix index c6307cb3fa9a1..21cf63adc8948 100644 --- a/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -24,7 +24,7 @@ in appimageTools.wrapType2 rec { ''; meta = with lib; { - description = "A full-featured desktop app for DevDocs.io"; + description = "Full-featured desktop app for DevDocs.io"; longDescription = '' DevDocs.io combines multiple API documentations in a fast, organized, and searchable interface. This is an unofficial desktop app for it. ''; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 8ea982f6059f9..830bfd19471a2 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A window matching utility"; + description = "Window matching utility"; longDescription = '' Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created. For diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index 9eb7db6212cc7..8ce0a162174bc 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , wrapGAppsHook4 , python3 -, appstream-glib , blueprint-compiler , desktop-file-utils , meson @@ -15,21 +14,21 @@ , libsoup_3 , glib-networking , libadwaita +, libsecret , nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "dialect"; - version = "2.3.0"; - - format = "other"; + version = "2.4.1"; + pyproject = false; # built with meson src = fetchFromGitHub { owner = "dialect-app"; repo = "dialect"; rev = version; fetchSubmodules = true; - hash = "sha256-A6jZHcSzHSmHLvyegyzxjQ6+jL6rLb7oefhryXoSrH4="; + hash = "sha256-WEeTdUdhDSfStu+rBYcuk6miuh5e0AsodbyF93Mg4mo="; }; nativeBuildInputs = [ @@ -51,6 +50,7 @@ python3.pkgs.buildPythonApplication rec { libsoup_3 glib-networking libadwaita + libsecret ]; propagatedBuildInputs = with python3.pkgs; [ @@ -74,12 +74,12 @@ python3.pkgs.buildPythonApplication rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://github.com/dialect-app/dialect"; - description = "A translation app for GNOME"; - maintainers = with maintainers; [ aleksana ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + description = "Translation app for GNOME"; + maintainers = with lib.maintainers; [ aleksana ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "dialect"; }; } diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix index eb45e2c4eba0a..3bf71ddab71cb 100644 --- a/pkgs/applications/misc/diebahn/default.nix +++ b/pkgs/applications/misc/diebahn/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; rev = version; - hash = "sha256-Oj+y3BFAVzWUt+S0iOtKzFBiJGOGHuTj41FHHuOrWh8="; + hash = "sha256-cVCq7iVurX5SlCs7A5FSds6KaxMW3Qv/JIhhO69FTrk="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${src}"; inherit src; - hash = "sha256-//tr1CLn5Qoc+XMFzwNIvmsQD4SrjNRTX3hUPqlhwNs="; + hash = "sha256-J8KOmvSiUNBpt4qSFnNEwSKFJMSaTFd14G2INDYwPUE="; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.rev}/CHANGELOG.md"; - description = "Travel with all your train information in one place. Also known as Railway."; + description = "Travel with all your train information in one place. Also known as Railway"; homepage = "https://gitlab.com/schmiddi-on-mobile/railway"; license = lib.licenses.gpl3Plus; mainProgram = "diebahn"; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 8c8f4a1c94670..418c4996eb3b3 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -121,7 +121,7 @@ in mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A QT based application for the Digital Bitbox hardware wallet"; + description = "QT based application for the Digital Bitbox hardware wallet"; longDescription = '' Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices. diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 073a6e348c2be..584ede1831fb0 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files"; + description = "Big set of CLI tools to make/modify/optimize/show/export DJVU files"; homepage = "https://djvu.sourceforge.net"; license = licenses.gpl2Plus; maintainers = with maintainers; [ Anton-Latukha ]; diff --git a/pkgs/applications/misc/dmenu-rs/default.nix b/pkgs/applications/misc/dmenu-rs/default.nix index 3340171c2da6c..37ddb8922a830 100644 --- a/pkgs/applications/misc/dmenu-rs/default.nix +++ b/pkgs/applications/misc/dmenu-rs/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { - description = "A pixel perfect port of dmenu, rewritten in Rust with extensive plugin support"; + description = "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support"; homepage = "https://github.com/Shizcow/dmenu-rs"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ benjaminedwardwebb ]; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 890c1886a4177..109befe7594ce 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A generic, highly customizable, and efficient menu for the X Window System"; + description = "Generic, highly customizable, and efficient menu for the X Window System"; homepage = "https://tools.suckless.org/dmenu"; license = licenses.mit; maintainers = with maintainers; [ pSub globin qusic ]; diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 35a50481bea7c..2e4e62acae634 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.mit; platforms = platforms.linux; - description = "An efficient dynamic menu for wayland (wlroots)"; + description = "Efficient dynamic menu for wayland (wlroots)"; homepage = "https://github.com/nyyManni/dmenu-wayland"; maintainers = with maintainers; [ rewine ]; mainProgram = "dmenu-wl"; diff --git a/pkgs/applications/misc/dnd-tools/default.nix b/pkgs/applications/misc/dnd-tools/default.nix index 130b4bd63126a..4959f29ec7e14 100644 --- a/pkgs/applications/misc/dnd-tools/default.nix +++ b/pkgs/applications/misc/dnd-tools/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/savagezen/dnd-tools"; - description = "A set of interactive command line tools for Dungeons and Dragons 5th Edition"; + description = "Set of interactive command line tools for Dungeons and Dragons 5th Edition"; mainProgram = "dnd-tools"; license = licenses.agpl3Only; maintainers = [ maintainers.urlordjames ]; diff --git a/pkgs/applications/misc/doctave/default.nix b/pkgs/applications/misc/doctave/default.nix index 3ebe50311d575..487d8340265de 100644 --- a/pkgs/applications/misc/doctave/default.nix +++ b/pkgs/applications/misc/doctave/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "A batteries-included developer documentation site generator"; + description = "Batteries-included developer documentation site generator"; homepage = "https://github.com/doctave/doctave"; changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix index c5114eccc77fd..2c49361c2bb4c 100644 --- a/pkgs/applications/misc/doing/default.nix +++ b/pkgs/applications/misc/doing/default.nix @@ -11,7 +11,7 @@ bundlerEnv { passthru.updateScript = bundlerUpdateScript "doing"; meta = with lib; { - description = "A command line tool for keeping track of what you’re doing and tracking what you’ve done"; + description = "Command line tool for keeping track of what you’re doing and tracking what you’ve done"; longDescription = '' doing is a basic CLI for adding and listing "what was I doing" reminders in a TaskPaper-formatted text file. It allows for multiple diff --git a/pkgs/applications/misc/done/default.nix b/pkgs/applications/misc/done/default.nix index cbc23dc9eb4f1..47238cd9cb9cf 100644 --- a/pkgs/applications/misc/done/default.nix +++ b/pkgs/applications/misc/done/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "The ultimate task management solution for seamless organization and efficiency"; + description = "Ultimate task management solution for seamless organization and efficiency"; homepage = "https://done.edfloreshz.dev/"; changelog = "https://github.com/done-devs/done/blob/${src.rev}/CHANGES.md"; license = licenses.mpl20; diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix index c0bedb728aa62..5991f260f53ea 100644 --- a/pkgs/applications/misc/dozenal/default.nix +++ b/pkgs/applications/misc/dozenal/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = "rm $out/bin/gdozdc"; meta = { - description = "A complete suite of dozenal (base twelve) programs"; + description = "Complete suite of dozenal (base twelve) programs"; longDescription = '' Programs diff --git a/pkgs/applications/misc/dwmbar/default.nix b/pkgs/applications/misc/dwmbar/default.nix index 0d942eff73d7a..3f7e9c821a2ed 100644 --- a/pkgs/applications/misc/dwmbar/default.nix +++ b/pkgs/applications/misc/dwmbar/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/thytom/dwmbar"; - description = "A Modular Status Bar for dwm"; + description = "Modular Status Bar for dwm"; license = licenses.gpl3Plus; maintainers = with maintainers; [ baitinq ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index f8914a7bb8f45..910e21528eb51 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "A Bitcoin Cash SPV Wallet"; + description = "Bitcoin Cash SPV Wallet"; mainProgram = "electron-cash"; longDescription = '' An easy-to-use Bitcoin Cash client featuring wallets generated from diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 8250ebfe289b9..96afa4d39a1b1 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , fetchFromGitHub -, fetchpatch , wrapQtAppsHook , python3 , zbar @@ -14,7 +13,7 @@ }: let - version = "4.5.4"; + version = "4.5.5"; python = python3.override { self = python; @@ -47,7 +46,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-fDu2PlEQOF7ftlS6dYw15S2XiAx+D/bng4zC9ELj6uk="; + sha256 = "sha256-CbhI/q+zjk9odxuvdzpogi046FqkedJooiQwS+WAkJ8="; postFetch = '' mv $out ./all @@ -63,7 +62,7 @@ python.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-lDuwXhOjcbCx8x/oIoigrklDwCbhn1trf5lDf/X/1Qc="; + sha256 = "1jiagz9avkbd158pcip7p4wz0pdsxi94ndvg5p8afvshb32aqwav"; }; postUnpack = '' @@ -99,7 +98,7 @@ python.pkgs.buildPythonApplication { keepkey trezor bitbox02 - cbor + cbor2 pyserial ] ++ lib.optionals enableQt [ pyqt5 @@ -110,30 +109,7 @@ python.pkgs.buildPythonApplication { pyqt6 ]; - patches = [ - # aiorpcx 0.23.1 compatibility - # Note: this patches `/run_electrum`. - # In the source repo, `/electrum/electrum` - # is a symlink to `../run_electrum`, - # so that path would also be affected by the patch. - # However, in the distribution tarball used here, - # `/electrum/electrum` is simply an exact copy of - # `/run_electrum` and is thereby *not* affected. - # So we have to manually copy the patched `/run_electrum` - # over `/electrum/electrum` after the patching (see below). - # XXX remove the copy command in `postPatch` - # as soon as the patch itself is removed! - (fetchpatch { - url = "https://github.com/spesmilo/electrum/commit/5f95d919dfa9868eaf82889903b94faa8c6443e0.patch"; - hash = "sha256-cEkduLsL6A8qPhXS2KPQWzVtkQPYQhHSbuwQ2SnanHw="; - }) - ]; - postPatch = '' - # copy the patched `/run_electrum` over `/electrum/electrum` - # so the aiorpcx compatibility patch is used - cp run_electrum electrum/electrum - # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ --replace "protobuf>=3.20,<4" "protobuf>=3.20" diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/applications/misc/elfx86exts/default.nix index 7e11d90f5d2ee..727102b9dccb7 100644 --- a/pkgs/applications/misc/elfx86exts/default.nix +++ b/pkgs/applications/misc/elfx86exts/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-NH7QK8a+ndhZGlLa3gWlnQdBQil1pi2AAi5TtFgkVf0="; meta = with lib; { - description = "Decode x86 binaries and print out which instruction set extensions they use."; + description = "Decode x86 binaries and print out which instruction set extensions they use"; longDescription = '' Disassemble a binary containing x86 instructions and print out which extensions it uses. Despite the utterly misleading name, this tool supports ELF and MachO binaries, and diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index ef429ac4c0845..043be629fd28e 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -30,7 +30,7 @@ EOF meta = with lib; { homepage = "https://github.com/ebzzry/emem"; - description = "A trivial Markdown to HTML converter"; + description = "Trivial Markdown to HTML converter"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/emoji-picker/default.nix b/pkgs/applications/misc/emoji-picker/default.nix index a0475bc943717..6a6d9a4815b05 100644 --- a/pkgs/applications/misc/emoji-picker/default.nix +++ b/pkgs/applications/misc/emoji-picker/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-Xeh5JKIBiyOXRGVx9udoUNs+Wv49BMyFvmnAbDfG3rA="; meta = with lib; { - description = "A CLI Emoji Picker"; + description = "CLI Emoji Picker"; homepage = "https://github.com/bcongdon/ep"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 840165dcedee3..ec43e5a18ca6d 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://packages.debian.org/wheezy/epdfview"; - description = "A lightweight PDF document viewer using Poppler and GTK"; + description = "Lightweight PDF document viewer using Poppler and GTK"; longDescription = '' ePDFView is a free lightweight PDF document viewer using Poppler and GTK libraries. The aim of ePDFView is to make a simple PDF document diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index b3ea4b96b9151..4473fbdbe78d4 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; - description = "A Go based command line tool for exercism.io"; + description = "Go based command line tool for exercism.io"; license = licenses.mit; maintainers = [ maintainers.rbasso maintainers.nobbz ]; mainProgram = "exercism"; diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index 0bca959b8b04c..6d66ab12c3dba 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "An interactive command line expense logger"; + description = "Interactive command line expense logger"; license = licenses.mit; maintainers = [ maintainers.manojkarthick ]; mainProgram = "expenses"; diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index 3b1cdf51321b8..b243dccf9734c 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A self-hostable, statically generated bandcamp alternative"; + description = "Self-hostable, statically generated bandcamp alternative"; mainProgram = "faircamp"; longDescription = '' Faircamp takes a directory on your disk - your Catalog - and from it diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 2c7320fdd9ef2..813869496cb9b 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -97,10 +97,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A daemon to provide haptic (and later more) feedback on events"; + description = "Daemon to provide haptic (and later more) feedback on events"; homepage = "https://source.puri.sm/Librem5/feedbackd"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pacman99 tomfitzhenry ]; + maintainers = with maintainers; [ pacman99 ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index e1a3e8e405b6f..fb2548f26a951 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.fetchmail.info/"; - description = "A full-featured remote-mail retrieval and forwarding utility"; + description = "Full-featured remote-mail retrieval and forwarding utility"; longDescription = '' A full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; license = licenses.gpl2Plus; + mainProgram = "fetchmail"; }; } diff --git a/pkgs/applications/misc/fetchmail/v7.nix b/pkgs/applications/misc/fetchmail/v7.nix index 7962f4a94b61d..9fa51a34d5965 100644 --- a/pkgs/applications/misc/fetchmail/v7.nix +++ b/pkgs/applications/misc/fetchmail/v7.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.fetchmail.info/"; - description = "A full-featured remote-mail retrieval and forwarding utility"; + description = "Full-featured remote-mail retrieval and forwarding utility"; longDescription = '' A full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/applications/misc/ff2mpv/default.nix index a87e84ea3892d..3efadca5f3a88 100644 --- a/pkgs/applications/misc/ff2mpv/default.nix +++ b/pkgs/applications/misc/ff2mpv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Native Messaging Host for ff2mpv firefox addon."; + description = "Native Messaging Host for ff2mpv firefox addon"; homepage = "https://github.com/woodruffw/ff2mpv"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Enzime ]; diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/applications/misc/filet/default.nix index b13f24be307d0..2c03c6e76ea24 100644 --- a/pkgs/applications/misc/filet/default.nix +++ b/pkgs/applications/misc/filet/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "A fucking fucking fast file fucker (afffff)"; + description = "Fucking fucking fast file fucker (afffff)"; homepage = "https://github.com/buffet/filet"; license = licenses.mpl20; platforms = platforms.all; diff --git a/pkgs/applications/misc/findex/default.nix b/pkgs/applications/misc/findex/default.nix index 8af4fc35d7de8..891ac664149ff 100644 --- a/pkgs/applications/misc/findex/default.nix +++ b/pkgs/applications/misc/findex/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "findex"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mdgaziur"; repo = "findex"; rev = "v${version}"; - hash = "sha256-rxOVrl2Q27z5oo1J6D4ft4fKaOMOadmidflD0jK0+3k="; + hash = "sha256-IpgmeH5oREstud0nw4i2xYeZcJYG6eCWyw3hhid/DfU="; }; - cargoHash = "sha256-MiD96suB88NZWg7Ay/ACZfOeE66WOe9dLsvtOhCQgGo="; + cargoHash = "sha256-wsqsPh1kevkIz235qnkLkp47CnCh6qi56sZP95Upymc="; postPatch = '' # failing rust documentation tests and faulty quotes "`README.md`" @@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mdgaziur/findex"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ maintainers.pinkcreeper100 ]; + maintainers = []; }; } diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/applications/misc/firefly-desktop/default.nix index 0db1a801c5dac..6e32f7431b642 100644 --- a/pkgs/applications/misc/firefly-desktop/default.nix +++ b/pkgs/applications/misc/firefly-desktop/default.nix @@ -27,7 +27,7 @@ in appimageTools.wrapType2 { description = "IOTA's New Wallet"; homepage = "https://firefly.iota.org"; license = licenses.asl20; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "firefly-desktop"; }; diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index affc8c5ad2be5..182e219d0e57f 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-6vBEthQD0HM2D+l+2dwWmdU+XPJpcvZQM+2GMuaf5Pw="; + hash = "sha256-Gr76yG3Qz7bnbm5YerHbpb+yzqhw1LthUb4qIH03VQw="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index ca3c5956e3c23..ffb329129d8e8 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "An easy to use base16 scheme manager/builder that integrates with any workflow"; + description = "Easy to use base16 scheme manager/builder that integrates with any workflow"; homepage = "https://github.com/Misterio77/flavours"; changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix index 7172ce535071a..d42179aa0a959 100644 --- a/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/pkgs/applications/misc/fluxboxlauncher/default.nix @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - description = "A Gui editor (gtk) to configure applications launching on a fluxbox session"; + description = "Gui editor (gtk) to configure applications launching on a fluxbox session"; mainProgram = "fluxboxlauncher"; homepage = "https://github.com/mothsART/fluxboxlauncher"; maintainers = with maintainers; [ mothsart ]; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix deleted file mode 100644 index 95594cb030d06..0000000000000 --- a/pkgs/applications/misc/font-manager/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, gettext -, python3 -, pkg-config -, libxml2 -, json-glib -, sqlite -, itstool -, yelp-tools -, vala -, gsettings-desktop-schemas -, gtk3 -, gnome -, desktop-file-utils -, fetchpatch2 -, wrapGAppsHook3 -, gobject-introspection -# withWebkit enables the "webkit" feature, also known as Google Fonts -, withWebkit ? true, glib-networking, libsoup, webkitgtk -}: - -stdenv.mkDerivation rec { - pname = "font-manager"; - version = "0.8.8"; - - src = fetchFromGitHub { - owner = "FontManager"; - repo = "font-manager"; - rev = version; - hash = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; - }; - - patches = [ - # see https://github.com/FontManager/font-manager/issues/355 - # should be removed on next release - (fetchpatch2 { - name = "fix-build-with-newer-vala.patch"; - url = "https://github.com/FontManager/font-manager/commit/600f498946c3904064b4e4fdf96e5841f6a827e4.patch"; - hash = "sha256-DC9+pvG88t+PPdGQ2oemeEYK9PaD0C2yWBYYCh4Wn9g="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - python3 - itstool - desktop-file-utils - vala - yelp-tools - wrapGAppsHook3 - # For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build - gobject-introspection - ]; - - buildInputs = [ - libxml2 - json-glib - sqlite - gsettings-desktop-schemas # for font settings - gtk3 - gnome.adwaita-icon-theme - ] ++ 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 = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - meta = with lib; { - homepage = "https://fontmanager.github.io/"; - description = "Simple font management for GTK desktop environments"; - mainProgram = "font-manager"; - longDescription = '' - Font Manager is intended to provide a way for average users to - easily manage desktop fonts, without having to resort to command - line tools or editing configuration files by hand. While designed - primarily with the Gnome Desktop Environment in mind, it should - work well with other GTK desktop environments. - - Font Manager is NOT a professional-grade font management solution. - ''; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 8f5c4c9c6b322..e56ee22c506e8 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A simple formatter designed for elementary OS"; + description = "Simple formatter designed for elementary OS"; homepage = "https://github.com/Djaler/Formatter"; maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; diff --git a/pkgs/applications/misc/fspy/default.nix b/pkgs/applications/misc/fspy/default.nix index 96178649efe7f..0227e889fd6b9 100644 --- a/pkgs/applications/misc/fspy/default.nix +++ b/pkgs/applications/misc/fspy/default.nix @@ -12,7 +12,7 @@ in appimageTools.wrapType2 { inherit pname version src; meta = with lib; { - description = "A cross platform app for quick and easy still image camera matching"; + description = "Cross platform app for quick and easy still image camera matching"; license = licenses.gpl3; homepage = "https://fspy.io/"; knownVulnerabilities = [ "Vendors Electron 2.0 (end-of-life)" ]; diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix index c69b7c0633f43..a7e19ed8af572 100644 --- a/pkgs/applications/misc/fusee-interfacee-tk/default.nix +++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/nh-server/fusee-interfacee-tk"; - description = "A tool to send .bin files to a Nintendo Switch in RCM mode"; + description = "Tool to send .bin files to a Nintendo Switch in RCM mode"; mainProgram = "fusee-interfacee-tk"; longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. Must be run as sudo."; diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 8aa564fc780bb..742b14a15fcfb 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINTERFACE_TYPE=${variant}" ]; meta = with lib; { - description = "A simple Gtk/Qt front-end to tesseract-ocr"; + description = "Simple Gtk/Qt front-end to tesseract-ocr"; mainProgram = "gimagereader-gtk"; homepage = "https://github.com/manisandro/gImageReader"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 9128906fe9c50..ef45224a83ce5 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk flex ]; meta = with lib; { - description = "A GTK 2/3 algebraic and RPN calculator"; + description = "GTK 2/3 algebraic and RPN calculator"; longDescription = '' galculator is a GTK 2 / GTK 3 based calculator. Its main features include: diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index f89fdbe71a043..1172571488838 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -1,32 +1,29 @@ -{ lib, buildPythonApplication, fetchPypi, fetchpatch, requests, yt-dlp, pytestCheckHook }: +{ + lib, + buildPythonApplication, + fetchPypi, + requests, + yt-dlp, + pytestCheckHook, +}: buildPythonApplication rec { pname = "gallery-dl"; - version = "1.26.9"; + version = "1.27.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-PgbfppyJCpgFupBQng8MUPihbDmit4C+xWnSzCJyu5k="; + hash = "sha256-zMimHjaXgwOSt8HbSec4o0y3e9Xf6tFFiI4KzsrP850="; }; - patches = [ - # catch general Exceptions. Remove with the next release. - (fetchpatch { - url = "https://github.com/mikf/gallery-dl/commit/5227bb6b1d62ecef5b281592b0d001e7f9c101e3.patch"; - hash = "sha256-rVsd764siP/07XBPVDnpxMm/4kLiH3fp9+NtpHHH23U="; - }) - ]; - propagatedBuildInputs = [ requests yt-dlp ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ # requires network access @@ -37,16 +34,14 @@ buildPythonApplication rec { "--ignore=test/test_ytdl.py" ]; - pythonImportsCheck = [ - "gallery_dl" - ]; + pythonImportsCheck = [ "gallery_dl" ]; - meta = with lib; { + meta = { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; mainProgram = "gallery-dl"; - maintainers = with maintainers; [ dawidsowa ]; + maintainers = with lib.maintainers; [ dawidsowa ]; }; } diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index abf63bece8073..0ea873da8477e 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "ganttproject-bin"; - version = "3.3.3300"; + version = "3.3.3309"; src = fetchzip { url = "https://dl.ganttproject.biz/ganttproject-${version}/ganttproject-${version}.zip"; stripRoot = false; - hash = "sha256-U9x64UIBuVtW44zbsdWuMRZyEJhZ8VUWbDVtapTGPMo="; + hash = "sha256-ysK+q9r8pbf9MBv7ck24joPR/ywyHnDCBHeOLfljYNw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/geek-life/default.nix b/pkgs/applications/misc/geek-life/default.nix index 0e8e3899bb2a6..4ab016067f478 100644 --- a/pkgs/applications/misc/geek-life/default.nix +++ b/pkgs/applications/misc/geek-life/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/ajaxray/geek-life"; - description = "The Todo List / Task Manager for Geeks in command line"; + description = "Todo List / Task Manager for Geeks in command line"; maintainers = with maintainers; [ noisersup ]; license = licenses.mit; mainProgram = "geek-life"; diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 43dee3baca4b2..8591b749a4068 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A nonsense activity generator"; + description = "Nonsense activity generator"; homepage = "https://github.com/svenstaro/genact"; changelog = "https://github.com/svenstaro/genact/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/applications/misc/genesys/default.nix b/pkgs/applications/misc/genesys/default.nix index b7d8c3796dda5..9624111b5707d 100644 --- a/pkgs/applications/misc/genesys/default.nix +++ b/pkgs/applications/misc/genesys/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A simple family tree generator that scales"; + description = "Simple family tree generator that scales"; homepage = "https://github.com/mrlem/genesys"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ rogarb ]; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index dd091563fde34..40e8db2a086c7 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "A collection of tools to download books from Google Books"; + description = "Collection of tools to download books from Google Books"; homepage = "https://njw.me.uk/getxbook/"; license = licenses.isc; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/applications/misc/gitit/default.nix b/pkgs/applications/misc/gitit/default.nix index 365b3f6acd977..6958e1e6c59c2 100644 --- a/pkgs/applications/misc/gitit/default.nix +++ b/pkgs/applications/misc/gitit/default.nix @@ -1,4 +1,4 @@ -{ lib, haskellPackages, haskell, removeReferencesTo +{ lib, stdenv, haskellPackages, haskell # “Plugins” are a fancy way of saying gitit will invoke # GHC at *runtime*, which in turn makes it pull GHC # into its runtime closure. Only enable if you really need @@ -7,55 +7,36 @@ , pluginSupport ? false }: -# this is similar to what we do with the pandoc executable - let - plain = haskellPackages.gitit; - plugins = - if pluginSupport - then plain - else haskell.lib.compose.disableCabalFlag "plugins" plain; - static = haskell.lib.compose.justStaticExecutables plugins; + inherit (haskell.lib.compose) + enableCabalFlag + disableCabalFlag + justStaticExecutables + overrideCabal + ; -in - (haskell.lib.compose.overrideCabal (drv: { - buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; - }) static).overrideAttrs (drv: { + base = (if pluginSupport then enableCabalFlag else disableCabalFlag) + "plugins" + haskellPackages.gitit; - # These libraries are still referenced, because they generate - # a `Paths_*` module for figuring out their version. - # The `Paths_*` module is generated by Cabal, and contains the - # version, but also paths to e.g. the data directories, which - # lead to a transitive runtime dependency on the whole GHC distribution. - # This should ideally be fixed in haskellPackages (or even Cabal), - # but a minimal gitit is important enough to patch it manually. - disallowedReferences = [ - haskellPackages.pandoc-types - haskellPackages.HTTP - haskellPackages.pandoc - haskellPackages.happstack-server - haskellPackages.filestore - ]; - postInstall = '' - remove-references-to \ - -t ${haskellPackages.pandoc-types} \ - $out/bin/gitit - remove-references-to \ - -t ${haskellPackages.HTTP} \ - $out/bin/gitit - remove-references-to \ - -t ${haskellPackages.pandoc} \ - $out/bin/gitit - remove-references-to \ - -t ${haskellPackages.happstack-server} \ - $out/bin/gitit - remove-references-to \ - -t ${haskellPackages.filestore} \ - $out/bin/gitit - ''; + # Removes erroneous references from dead code that GHC can't eliminate + aarch64DarwinFix = overrideCabal (drv: + lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { + postInstall = '' + ${drv.postInstall or ""} + remove-references-to -t ${haskellPackages.HTTP} "$out/bin/gitit" + remove-references-to -t ${haskellPackages.HTTP} "$out/bin/expireGititCache" + remove-references-to -t ${haskellPackages.happstack-server} "$out/bin/gitit" + remove-references-to -t ${haskellPackages.hoauth2} "$out/bin/gitit" + remove-references-to -t ${haskellPackages.pandoc} "$out/bin/gitit" + remove-references-to -t ${haskellPackages.pandoc-types} "$out/bin/gitit" + ''; + }); +in - meta = drv.meta // { - maintainers = drv.meta.maintainers or [] - ++ [ lib.maintainers.Profpatsch ]; - }; - }) +if pluginSupport +then base +else lib.pipe (base.override { ghc-paths = null; }) [ + justStaticExecutables + aarch64DarwinFix +] diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 67618ed083f56..9d6c9f09dc965 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -123,7 +123,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An easy-to-use database designer and user interface"; + description = "Easy-to-use database designer and user interface"; homepage = "http://www.glom.org/"; license = [ licenses.lgpl2 licenses.gpl2 ]; maintainers = teams.gnome.members; diff --git a/pkgs/applications/misc/gmnitohtml/default.nix b/pkgs/applications/misc/gmnitohtml/default.nix index 837379890b4cb..a1a080ac029ec 100644 --- a/pkgs/applications/misc/gmnitohtml/default.nix +++ b/pkgs/applications/misc/gmnitohtml/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gmnitohtml"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromSourcehut { owner = "~adnano"; repo = pname; rev = version; - hash = "sha256-nKNSLVBBdZI5mkbEUkMv0CIOQIyH3OX+SEFf5O47DFY="; + hash = "sha256-9lsZgh/OyxAu1rsixD6XUgQzR1xDGOxGt0sR12zrs2M="; }; - vendorHash = "sha256-Cx8x8AISRVTA4Ufd73vOVky97LX23NkizHDingr/zVk="; + vendorHash = "sha256-ppplXXqb2DM/AU+B+LefndrBiiTgCRNw6hEupfeWr+o="; ldflags = [ "-s" "-w" ]; @@ -18,11 +18,11 @@ buildGoModule rec { nativeBuildInputs = [ scdoc installShellFiles ]; postBuild = '' - make gmnitohtml.1 + make docs ''; postInstall = '' - installManPage gmnitohtml.1 + installManPage docs/gmnitohtml.1 ''; doInstallCheck = true; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index dc5111c2a7222..e3a33cace9cb0 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A simple MP3 and Media player client for UNIX and UNIX like systems"; + description = "Simple MP3 and Media player client for UNIX and UNIX like systems"; mainProgram = "gmtp"; homepage = "https://gmtp.sourceforge.io"; platforms = lib.platforms.linux; diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix index 4f94a5bc7f6b9..16749bc2292d2 100644 --- a/pkgs/applications/misc/gnome-firmware/default.nix +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gnome-firmware"; - version = "45.0"; + version = "46.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gnome-firmware"; rev = version; - sha256 = "sha256-KVyxOl7RdL80ZiEyiT+XGa/6Ss2g+5y+LIrR9TSRE+I="; + sha256 = "sha256-tEMSlKsqqPMZA0Gr89+u3dmAmZ7ffQm/2i1AB93y05E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/applications/misc/gnome-solanum/default.nix index b58d5e67d6084..07dd24a616950 100644 --- a/pkgs/applications/misc/gnome-solanum/default.nix +++ b/pkgs/applications/misc/gnome-solanum/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/World/Solanum"; - description = "A pomodoro timer for the GNOME desktop"; + description = "Pomodoro timer for the GNOME desktop"; maintainers = with maintainers; [ linsui ]; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index 85d7f36d2014c..d53871476bd18 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A nice way to view information about use of system resources, like memory and disk space"; + description = "Nice way to view information about use of system resources, like memory and disk space"; mainProgram = "gnome-usage"; homepage = "https://gitlab.gnome.org/GNOME/gnome-usage"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index 9f8de3ad6e160..356059d1d9bde 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://xiaoyifang.github.io/goldendict-ng/"; - description = "An advanced multi-dictionary lookup program"; + description = "Advanced multi-dictionary lookup program"; platforms = platforms.linux; mainProgram = "goldendict"; maintainers = with maintainers; [ slbtty michojel ]; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 4f5df502fdfcd..328f1f7343208 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://goldendict.org/"; - description = "A feature-rich dictionary lookup program"; + description = "Feature-rich dictionary lookup program"; platforms = with platforms; linux ++ darwin; mainProgram = "goldendict"; maintainers = with maintainers; [ gebner astsmtl sikmir ]; diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index a345896ca8d96..cb39fbd3964ea 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -13,7 +13,7 @@ bundlerApp rec { passthru.tests.gollum = nixosTests.gollum; meta = with lib; { - description = "A simple, Git-powered wiki with a sweet API and local frontend"; + description = "Simple, Git-powered wiki with a sweet API and local frontend"; homepage = "https://github.com/gollum/gollum"; changelog = "https://github.com/gollum/gollum/blob/HEAD/HISTORY.md"; license = licenses.mit; diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 2e139b0d71cad..4da7bd97ec2f4 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -114,11 +114,11 @@ mkDerivation rec { ''; meta = with lib; { - description = "A world sphere viewer"; + description = "World sphere viewer"; homepage = "https://www.google.com/earth/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ friedelino shamilton ]; + maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; knownVulnerabilities = [ "Includes vulnerable versions of bundled libraries: openssl, ffmpeg, gdal, and proj." ]; }; diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix index aef599323b81d..6b0eaeff65f5e 100644 --- a/pkgs/applications/misc/gopacked/default.nix +++ b/pkgs/applications/misc/gopacked/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "A simple text-based Minecraft modpack manager"; + description = "Simple text-based Minecraft modpack manager"; license = licenses.agpl3Plus; homepage = src.meta.homepage; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 96eca30a4f491..cf2d0c633c371 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A ready to use set of digital camera software applications"; + description = "Ready to use set of digital camera software applications"; longDescription = '' A set of command line utilities for manipulating over 1400 different diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix deleted file mode 100644 index 44e96cb9085a9..0000000000000 --- a/pkgs/applications/misc/gpsprune/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ fetchurl, lib, stdenv, makeDesktopItem, makeWrapper, unzip, jre, copyDesktopItems }: - -stdenv.mkDerivation rec { - pname = "gpsprune"; - version = "24"; - - src = fetchurl { - url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-gMwTdwYjYJt1j5MpHw6UD1wqmF7q3ikzjVSOGakIP30="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper copyDesktopItems ]; - buildInputs = [ jre ]; - - desktopItems = [ - (makeDesktopItem { - name = "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" - ]; - }) - ]; - - installPhase = '' - runHook preInstall - - install -Dm644 ${src} $out/share/java/gpsprune.jar - makeWrapper ${jre}/bin/java $out/bin/gpsprune \ - --add-flags "-jar $out/share/java/gpsprune.jar" - mkdir -p $out/share/pixmaps - ${unzip}/bin/unzip -p $src tim/prune/gui/images/window_icon_64.png > $out/share/pixmaps/gpsprune.png - - runHook postInstall - ''; - - meta = with lib; { - description = "Application for viewing, editing and converting GPS coordinate data"; - homepage = "https://activityworkshop.net/software/gpsprune/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ rycee ]; - platforms = platforms.all; - mainProgram = "gpsprune"; - }; -} diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix index fe7bcf3dcb71a..eaf0fc44d29dd 100644 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ b/pkgs/applications/misc/gpu-burn/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation { homepage = "http://wili.cc/blog/gpu-burn.html"; description = "Multi-GPU CUDA stress test"; platforms = platforms.linux; - maintainers = with maintainers; [ elohmeier ]; license = licenses.bsd2; mainProgram = "gpu_burn"; }; diff --git a/pkgs/applications/misc/gpu-viewer/default.nix b/pkgs/applications/misc/gpu-viewer/default.nix index 329babc36c686..71dd7a091e603 100644 --- a/pkgs/applications/misc/gpu-viewer/default.nix +++ b/pkgs/applications/misc/gpu-viewer/default.nix @@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/arunsivaramanneo/GPU-Viewer"; - description = "A front-end to glxinfo, vulkaninfo, clinfo and es2_info"; + description = "Front-end to glxinfo, vulkaninfo, clinfo and es2_info"; changelog = "https://github.com/arunsivaramanneo/GPU-Viewer/releases/tag/v${version}"; maintainers = with maintainers; [ GaetanLepage ]; license = licenses.gpl3; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 947c18050ea76..0501d9f707e69 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.19"; + version = "13.22"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-Q/Na+uc6a+OSLvJK75MEIxgdJhg/At830SBrix38Qj8="; + hash = "sha256-5YoFO1NHduV8qKZ8GPaFnKfRQRlhlG5swZo74SfOpZY="; }; buildInputs = [ diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 7feab95b003a1..5ecab79226c8c 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -69,7 +69,7 @@ buildPythonApplication rec { ; propagatedBuildInputs = with pythonPackages; [ - bsddb3 + berkeleydb pyicu pygobject3 pycairo diff --git a/pkgs/applications/misc/grb/default.nix b/pkgs/applications/misc/grb/default.nix index 9d4774b42a2cf..48caa482bb753 100644 --- a/pkgs/applications/misc/grb/default.nix +++ b/pkgs/applications/misc/grb/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A cli-accessible Greek Bible with the Septuagint, SBL and Apocrypha"; + description = "Cli-accessible Greek Bible with the Septuagint, SBL and Apocrypha"; homepage = "https://github.com/LukeSmithxyz/grb"; license = licenses.publicDomain; maintainers = [ maintainers.cafkafk ]; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index 1e88b837f4a8d..b2b9c7b67b06c 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { doCheck = !stdenv.isDarwin; meta = with lib; { - description = "The Giant Swarm command line interface"; + description = "Giant Swarm command line interface"; homepage = "https://github.com/giantswarm/gsctl"; license = licenses.asl20; maintainers = with maintainers; [ joesalisbury ]; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 83be4fe82393d..f55e32baebf83 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; meta = with lib; { - description = "A font selection program for X11 using the GTK 2 toolkit"; + description = "Font selection program for X11 using the GTK 2 toolkit"; longDescription = '' Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index 258079f61c93d..d4a67e5f8a87d 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-TpLaZ/935S57K60NdgJXVY+YQEedralZMoQHWRgkH+A="; + hash = "sha256-rQSSbDHMSWJDSxn/SNNMaOrdZJUhQPnZutmpY9828t0="; }; - vendorHash = "sha256-UgpOHZ/CEnGsmUTyNrhh+qDmKEplr18b/OrO2qcIhF4="; + vendorHash = "sha256-pkQ8UvWLIWH8gXux/dd0HLdiz7RDrmFJ8SX63Q+nNyw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index ae5c7d1d07a4a..642cc57eb8098 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 texinfo ]; meta = { - description = "A GTK enabled dropin replacement for xmessage"; + description = "GTK enabled dropin replacement for xmessage"; homepage = "https://trmusson.dreamhosters.com/programs.html#gxmessage"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [jfb]; diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/applications/misc/harsh/default.nix index fe6ec4f677aa8..dc1021c6d8484 100644 --- a/pkgs/applications/misc/harsh/default.nix +++ b/pkgs/applications/misc/harsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "harsh"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "wakatara"; repo = pname; rev = "v${version}"; - hash = "sha256-NgYmzRoJCoFpfo4NXnQKCp/gvN9g076Y9Pq8CnMrC/s="; + hash = "sha256-SF5SvVllAXaALSasVt+wqiywYltAuzaPoc9IohwYmss="; }; - vendorHash = "sha256-Xzyu6jy4sbZPZv0EIksA2snlsivc0jp02QoOYpmFtQw="; + vendorHash = "sha256-4Sa8/mVD7t4uR8Wq4n+fvot7LZfraphFobrG6rteQeI="; meta = with lib; { description = "CLI habit tracking for geeks"; diff --git a/pkgs/applications/misc/health/default.nix b/pkgs/applications/misc/health/default.nix index 776f2cf20e2ac..8a2972e99a3a5 100644 --- a/pkgs/applications/misc/health/default.nix +++ b/pkgs/applications/misc/health/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]); meta = with lib; { - description = "A health tracking app for the GNOME desktop"; + description = "Health tracking app for the GNOME desktop"; homepage = "https://apps.gnome.org/app/dev.Cogitri.Health"; license = licenses.gpl3Plus; mainProgram = "dev.Cogitri.Health"; diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index 6fae0eca13997..7ff71814fb5eb 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - description = "An example package with unfree license (for testing)"; + description = "Example package with unfree license (for testing)"; license = lib.licenses.unfree; maintainers = [ lib.maintainers.oxij ]; mainProgram = "hello-unfree"; diff --git a/pkgs/applications/misc/hmm/default.nix b/pkgs/applications/misc/hmm/default.nix index 4f45c09ef63b1..c20f3a9626f51 100644 --- a/pkgs/applications/misc/hmm/default.nix +++ b/pkgs/applications/misc/hmm/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A small command-line note-taking app"; + description = "Small command-line note-taking app"; homepage = "https://github.com/samwho/hmm"; changelog = "https://github.com/samwho/hmm/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 3d7c6b6c205be..23b12f032bd9f 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "holochain-launcher"; + pname = "holochain-launcher"; version = "0.11.5"; prerelease = "beta-2"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A cross-platform executable that launches a local Holochain conductor, and installs and opens apps"; + description = "Cross-platform executable that launches a local Holochain conductor, and installs and opens apps"; homepage = "https://github.com/holochain/launcher"; maintainers = [ maintainers.steveej ]; license = licenses.cal10; diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 3810136cbf5f2..64536177aaff5 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScript, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }: +{ lib, stdenv, writeScript, ncurses5, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }: buildFHSEnv rec { name = "houdini-${unwrapped.version}"; @@ -30,7 +30,6 @@ buildFHSEnv rec { bintools # needed for ld and other tools, so ctypes can find/load sos from python ocl-icd # needed for opencl numactl # needed by hfs ocl backend - ncurses5 # needed by hfs ocl backend zstd # needed from 20.0 ] ++ (with xorg; [ libICE @@ -83,7 +82,7 @@ buildFHSEnv rec { mkdir -p $out/$(dirname $executable) echo "#!${stdenv.shell}" >> $out/$executable - echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable + echo "exec $WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable done cd $out @@ -96,6 +95,9 @@ buildFHSEnv rec { ]; runScript = writeScript "${name}-wrapper" '' + # ncurses5 is needed by hfs ocl backend + # workaround for this issue: https://github.com/NixOS/nixpkgs/issues/89769 + export LD_LIBRARY_PATH=${lib.makeLibraryPath [ncurses5]}:$LD_LIBRARY_PATH exec "$@" ''; } diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index d0d03d9787174..ef96a689b291a 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ { lib, stdenv, requireFile, callPackage}: callPackage ./runtime-build.nix rec { - version = "20.0.506"; + version = "20.0.688"; eulaDate = "2021-10-13"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; - sha256 = "10dcb695bf9bb6407ccfd91c67858d69864208ee97e1e9afe216abf99db549f5"; + sha256 = "99f9088824c328de9d351f037f26ff1cba960fbd9b4e2ed1d52601680d3512a6"; url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; } diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index f0a43de700fc3..51a2a14be9cc1 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/LuRsT/hr"; - description = "A horizontal bar for your terminal"; + description = "Horizontal bar for your terminal"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/hue-plus/default.nix b/pkgs/applications/misc/hue-plus/default.nix index 4cb4adcafd68b..47c5d6b4193f5 100644 --- a/pkgs/applications/misc/hue-plus/default.nix +++ b/pkgs/applications/misc/hue-plus/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/kusti8/hue-plus"; - description = "A Windows and Linux driver in Python for the NZXT Hue+"; + description = "Windows and Linux driver in Python for the NZXT Hue+"; longDescription = '' A cross-platform driver in Python for the NZXT Hue+. Supports all functionality except FPS, CPU, and GPU lighting. ''; diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index 68ca556aac63e..df47036b2d009 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "A knowledge management meta-framework for geeks"; + description = "Knowledge management meta-framework for geeks"; homepage = "https://github.com/phodal/quake"; license = licenses.mit; maintainers = [ maintainers.elliot ]; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index bd765c864d220..a37f965dd5306 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A GPU powered browserless markdown viewer"; + description = "GPU powered browserless markdown viewer"; homepage = "https://github.com/trimental/inlyne"; changelog = "https://github.com/trimental/inlyne/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/pkgs/applications/misc/inochi2d/creator-dub-lock.json b/pkgs/applications/misc/inochi2d/creator-dub-lock.json index 97570d2d6678b..e0d3b23ad0c22 100644 --- a/pkgs/applications/misc/inochi2d/creator-dub-lock.json +++ b/pkgs/applications/misc/inochi2d/creator-dub-lock.json @@ -37,8 +37,8 @@ "sha256": "0p5vmkw29ksh5wdxz1ijms1wblq288pv15vnbl93z7q2vgnq995w" }, "eventcore": { - "version": "0.9.29", - "sha256": "1993mibxqb4v7lbsq3kbfwxfpi0d1gzzmzvx6y01907aqz933isa" + "version": "0.9.30", + "sha256": "1n8wdcjhas0y99pf9fvwwsydkmy9g7gvfjhlwpjh158c7pfjwlaq" }, "facetrack-d": { "version": "0.7.8", @@ -69,8 +69,8 @@ "sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4" }, "inochi2d": { - "version": "0.8.3", - "sha256": "1m9dalm6sb518yi9mbphq1fdax90fc5rmskah19l7slnplbhli4l" + "version": "0.8.4", + "sha256": "1bj0c6i9kcw1vfm6lf8lyxpf1lhhslg3f182jycdmzms15i3jb3y" }, "kra-d": { "version": "0.5.5", @@ -85,12 +85,12 @@ "sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c" }, "mir-algorithm": { - "version": "3.22.0", - "sha256": "0pl1vwyyhr2hrxlj060khzhg33dkgyrzi3f5qqxz6xj3hcp7axxq" + "version": "3.22.1", + "sha256": "1bvvf3dm26x1h10pg1s4kyhxiyrmd96kk2lmchyady39crpjj5cf" }, "mir-core": { - "version": "1.7.0", - "sha256": "14k7y2r06pwzf29shymyjrk7l582bh181rc07bnwgjn3f84ayn62" + "version": "1.7.1", + "sha256": "15m1n48fcmh5pw3w4ww5qfzwkdglflpzc3xmxmrlvd30swyyr85j" }, "mir-linux-kernel": { "version": "1.0.1", @@ -105,8 +105,8 @@ "sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf" }, "openssl-static": { - "version": "1.0.3+3.0.8", - "sha256": "1z977ghlnczxky2q2gislfi68jnbp2zf4pifv8rzrcs0nx3va2jr" + "version": "1.0.5+3.0.8", + "sha256": "0wpqz29yrbbh39g3cwlgd6h6hh1msws7w5baw1kywdkgj761gx2k" }, "psd-d": { "version": "0.6.3", @@ -121,20 +121,20 @@ "sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj" }, "taggedalgebraic": { - "version": "0.11.22", - "sha256": "1kc39sdnk2ybhrwxiwyw1mqcw0qzjr0vr54yvyp3gkkaad373k4r" + "version": "0.11.23", + "sha256": "1bialmbdwjpqhgs95inkwzin7xbhx7sngjf7viq90vzma497l59k" }, "tinyfiledialogs": { "version": "0.10.1", "sha256": "1k3gq9y7912x5b30h60nvlfdr61as1f187b8rsilkxliizcmbhfi" }, "vibe-container": { - "version": "1.3.0", - "sha256": "02gdw7ma93fdvgx3fngmfjd074jh2rzm9qsxakr3zn81p6qnzair" + "version": "1.3.1", + "sha256": "12mfm49bjnh2pvm51dzna625kzgwznm9kcv6qhazc4il9j0224wd" }, "vibe-core": { - "version": "2.8.2", - "sha256": "1g9l8hmjx4dzzwh7pqasc9s16zzbdfvciswbv0gnrvmjsb0pi9xr" + "version": "2.8.4", + "sha256": "1pik6vympgwxpyxb75g1f8409cd6hw952gbflqvwaj18shz6dwjm" }, "vibe-d": { "version": "0.9.8", diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix index 9b1c4f67fc7f9..44a98ee40339b 100644 --- a/pkgs/applications/misc/inochi2d/default.nix +++ b/pkgs/applications/misc/inochi2d/default.nix @@ -22,13 +22,13 @@ in inochi-creator = mkGeneric rec { pname = "inochi-creator"; appname = "Inochi Creator"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "Inochi2D"; repo = "inochi-creator"; rev = "v${version}"; - hash = "sha256-wsB9KIZyot2Y+6QpQlIXRzv3cPCdwp2Q/ZfDizAKJc4="; + hash = "sha256-qrSHyvFE55xRbcA79lngOHJOdv54rNlUTHlxT9jjPEY="; }; dubLock = ./creator-dub-lock.json; @@ -54,13 +54,13 @@ in inochi-session = mkGeneric rec { pname = "inochi-session"; appname = "Inochi Session"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "Inochi2D"; repo = "inochi-session"; rev = "v${version}"; - hash = "sha256-yq/uMWEeydZun07/7hgUaAw3IruRqrDuGgbe5NzNYxw="; + hash = "sha256-BRA5qODHhyHBeZYT5MQwcFmr/zVokfO5SrbcbQa6w7w="; }; dubLock = ./session-dub-lock.json; diff --git a/pkgs/applications/misc/inochi2d/session-dub-lock.json b/pkgs/applications/misc/inochi2d/session-dub-lock.json index 30a486e549c5c..e66d7cebe7e91 100644 --- a/pkgs/applications/misc/inochi2d/session-dub-lock.json +++ b/pkgs/applications/misc/inochi2d/session-dub-lock.json @@ -33,8 +33,8 @@ "sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb" }, "eventcore": { - "version": "0.9.29", - "sha256": "1993mibxqb4v7lbsq3kbfwxfpi0d1gzzmzvx6y01907aqz933isa" + "version": "0.9.30", + "sha256": "1n8wdcjhas0y99pf9fvwwsydkmy9g7gvfjhlwpjh158c7pfjwlaq" }, "facetrack-d": { "version": "0.7.8", @@ -65,8 +65,8 @@ "sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4" }, "inochi2d": { - "version": "0.8.3", - "sha256": "1m9dalm6sb518yi9mbphq1fdax90fc5rmskah19l7slnplbhli4l" + "version": "0.8.4", + "sha256": "1bj0c6i9kcw1vfm6lf8lyxpf1lhhslg3f182jycdmzms15i3jb3y" }, "inui": { "version": "1.2.1", @@ -85,12 +85,12 @@ "sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c" }, "mir-algorithm": { - "version": "3.22.0", - "sha256": "0pl1vwyyhr2hrxlj060khzhg33dkgyrzi3f5qqxz6xj3hcp7axxq" + "version": "3.22.1", + "sha256": "1bvvf3dm26x1h10pg1s4kyhxiyrmd96kk2lmchyady39crpjj5cf" }, "mir-core": { - "version": "1.7.0", - "sha256": "14k7y2r06pwzf29shymyjrk7l582bh181rc07bnwgjn3f84ayn62" + "version": "1.7.1", + "sha256": "15m1n48fcmh5pw3w4ww5qfzwkdglflpzc3xmxmrlvd30swyyr85j" }, "mir-linux-kernel": { "version": "1.0.1", @@ -101,8 +101,8 @@ "sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf" }, "openssl-static": { - "version": "1.0.3+3.0.8", - "sha256": "1z977ghlnczxky2q2gislfi68jnbp2zf4pifv8rzrcs0nx3va2jr" + "version": "1.0.5+3.0.8", + "sha256": "0wpqz29yrbbh39g3cwlgd6h6hh1msws7w5baw1kywdkgj761gx2k" }, "silly": { "version": "1.1.1", @@ -113,20 +113,20 @@ "sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj" }, "taggedalgebraic": { - "version": "0.11.22", - "sha256": "1kc39sdnk2ybhrwxiwyw1mqcw0qzjr0vr54yvyp3gkkaad373k4r" + "version": "0.11.23", + "sha256": "1bialmbdwjpqhgs95inkwzin7xbhx7sngjf7viq90vzma497l59k" }, "tinyfiledialogs": { "version": "0.10.1", "sha256": "1k3gq9y7912x5b30h60nvlfdr61as1f187b8rsilkxliizcmbhfi" }, "vibe-container": { - "version": "1.3.0", - "sha256": "02gdw7ma93fdvgx3fngmfjd074jh2rzm9qsxakr3zn81p6qnzair" + "version": "1.3.1", + "sha256": "12mfm49bjnh2pvm51dzna625kzgwznm9kcv6qhazc4il9j0224wd" }, "vibe-core": { - "version": "2.8.2", - "sha256": "1g9l8hmjx4dzzwh7pqasc9s16zzbdfvciswbv0gnrvmjsb0pi9xr" + "version": "2.8.4", + "sha256": "1pik6vympgwxpyxb75g1f8409cd6hw952gbflqvwaj18shz6dwjm" }, "vibe-d": { "version": "0.9.8", diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/applications/misc/insulator2/default.nix index 65b8cb505f722..b69a3c7fe88df 100644 --- a/pkgs/applications/misc/insulator2/default.nix +++ b/pkgs/applications/misc/insulator2/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A client UI to inspect Kafka topics, consume, produce and much more"; + description = "Client UI to inspect Kafka topics, consume, produce and much more"; homepage = "https://github.com/andrewinci/insulator2"; license = licenses.gpl3Only; maintainers = with maintainers; [ tc-kaluza ]; diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index 6ad3bda778340..b4ea7d829a3ec 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { changelog = "https://github.com/enkore/j4-dmenu-desktop/blob/${finalAttrs.src.rev}/CHANGELOG"; - description = "A wrapper for dmenu that recognizes .desktop files"; + description = "Wrapper for dmenu that recognizes .desktop files"; homepage = "https://github.com/enkore/j4-dmenu-desktop"; license = licenses.gpl3Only; mainProgram = "j4-dmenu-desktop"; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 2b9f1497b765d..8eaf05298e892 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -39,7 +39,7 @@ in bundlerApp { passthru.updateScript = ./update.sh; meta = with lib; { - description = "A blog-aware, static site generator, written in Ruby"; + description = "Blog-aware, static site generator, written in Ruby"; longDescription = '' Jekyll is a simple, blog-aware, static site generator, written in Ruby. Think of it like a file-based CMS, without all the complexity. Jekyll diff --git a/pkgs/applications/misc/johnny-reborn/default.nix b/pkgs/applications/misc/johnny-reborn/default.nix index db8eec95f2b1d..4ad2328feda85 100644 --- a/pkgs/applications/misc/johnny-reborn/default.nix +++ b/pkgs/applications/misc/johnny-reborn/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (engine only)"; + description = "Open-source engine for the classic \"Johnny Castaway\" screensaver (engine only)"; homepage = "https://github.com/xesf/jc_reborn"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ pedrohlc ]; diff --git a/pkgs/applications/misc/johnny-reborn/with-data.nix b/pkgs/applications/misc/johnny-reborn/with-data.nix index b9432c543feee..1e669658186f1 100644 --- a/pkgs/applications/misc/johnny-reborn/with-data.nix +++ b/pkgs/applications/misc/johnny-reborn/with-data.nix @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation { ''; meta = { - description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (ready to use, with resources)"; + description = "Open-source engine for the classic \"Johnny Castaway\" screensaver (ready to use, with resources)"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ pedrohlc ]; inherit (johnny-reborn-engine.meta) homepage platforms mainProgram; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 7127d83c65843..219f15936fb9b 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -27,7 +27,7 @@ let }; meta = with lib; { - description = "An open source note taking and to-do application with synchronisation capabilities"; + description = "Open source note taking and to-do application with synchronisation capabilities"; mainProgram = "joplin-desktop"; longDescription = '' Joplin is a free, open source note taking and to-do application, which can diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix deleted file mode 100644 index 92fe2ea2ac3c9..0000000000000 --- a/pkgs/applications/misc/josm/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm -, extraJavaOpts ? "-Djosm.restart=true -Djava.net.useSystemProxies=true" -}: -let - pname = "josm"; - version = "19067"; - srcs = { - jar = fetchurl { - url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-+mHX80ltIFkVWIeex519b84BYzhp+h459/C2wlDR7jQ="; - }; - macosx = fetchurl { - url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-lMESSSXl6hBC2MpLYnYOThy463ft2bONNppBv3OEvAQ="; - }; - pkg = fetchsvn { - url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; - rev = version; - sha256 = "sha256-L7P6FtqKLB4e+ezPzXePM33qj5esNoRlTFXi0/GhdsA="; - }; - }; - - # Needed as of version 19017. - baseJavaOpts = toString [ - "--add-exports=java.base/sun.security.action=ALL-UNNAMED" - "--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" - "--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" - ]; -in -stdenv.mkDerivation rec { - inherit pname version; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ jre ]; - - installPhase = - if stdenv.isDarwin then '' - mkdir -p $out/Applications - ${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications - '' else '' - install -Dm644 ${srcs.jar} $out/share/josm/josm.jar - cp -R ${srcs.pkg}/usr/share $out - - # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin - makeWrapper ${jre}/bin/java $out/bin/josm \ - --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \ - --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' - ''; - - meta = with lib; { - description = "An extensible editor for OpenStreetMap"; - homepage = "https://josm.openstreetmap.de/"; - changelog = "https://josm.openstreetmap.de/wiki/Changelog"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ rycee sikmir ]; - platforms = platforms.all; - mainProgram = "josm"; - }; -} diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 5ae33e8264f9d..7702468768167 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; homepage = "https://csl.name/jp2a/"; - description = "A small utility that converts JPG images to ASCII"; + description = "Small utility that converts JPG images to ASCII"; license = licenses.gpl2Only; maintainers = [ maintainers.FlorianFranzen ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch b/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch index 8f9271ac996b2..e1ccea1458a37 100644 --- a/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch +++ b/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch @@ -1,14 +1,5 @@ -From 2629af4ed00d7ca65359178203d80fb146901cdb Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer <danielrf12@gmail.com> -Date: Fri, 3 Jul 2020 21:00:45 -0700 -Subject: [PATCH 1/2] Fix CMakeLists - ---- - CMakeLists.txt | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index e218279..4341de9 100644 +index 365b835..4341de9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,7 @@ endif(JPEG_FOUND) @@ -39,11 +30,8 @@ index e218279..4341de9 100644 include_directories(SYSTEM ${MUPDF_INCLUDEDIR}) message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} -- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype +- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype -llcms -lgumbo + ) endif(MUPDF_FOUND) --- -2.27.0 - diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 0bb01c38712f4..32a0e31a315b2 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,11 +1,22 @@ -{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchFromGitHub -, cmake, pkg-config, zlib, libpng, makeWrapper +{ lib +, stdenv +, runCommand +, fetchzip +, fetchurl +, fetchFromGitHub +, cmake +, jbig2dec +, libjpeg_turbo +, libpng +, makeWrapper +, pkg-config +, zlib , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript -, enableMuPDF ? true, mupdf_1_17 +, enableMuPDF ? true, mupdf , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes -, enableTesseract ? true, leptonica, tesseract4 +, enableTesseract ? true, leptonica, tesseract }: # k2pdfopt is a pain to package. It requires modified versions of mupdf, @@ -50,10 +61,10 @@ let ''; pname = "k2pdfopt"; - version = "2.53"; + version = "2.55"; k2pdfopt_src = fetchzip { url = "http://www.willus.com/${pname}/src/${pname}_v${version}_src.zip"; - sha256 = "1fna8bg3pascjfc3hmc6xn0xi2yh7f1qp0d344mw9hqanbnykyy8"; + hash = "sha256-orQNDXQkkcCtlA8wndss6SiJk4+ImiFCG8XRLEg963k="; }; in stdenv.mkDerivation rec { inherit pname version; @@ -79,15 +90,15 @@ in stdenv.mkDerivation rec { mupdf_patch = mkPatch { name = "mupdf"; src = fetchurl { - url = "https://mupdf.com/downloads/archive/mupdf-1.17.0-source.tar.gz"; - sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; + url = "https://mupdf.com/downloads/archive/mupdf-1.23.7-source.tar.gz"; + hash = "sha256-NaVJM/QA6JZnoImkJfHGXNadRiOU/tnAZ558Uu+6pWg="; }; patchCommands = '' cp ${k2pdfopt_src}/mupdf_mod/{filter-basic,font,stext-device,string}.c ./source/fitz/ cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/ ''; }; - mupdf_modded = mupdf_1_17.overrideAttrs ({ patches ? [], ... }: { + mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: { patches = patches ++ [ mupdf_patch ]; # This function is missing in font.c, see font-win32.c postPatch = '' @@ -98,8 +109,8 @@ in stdenv.mkDerivation rec { leptonica_patch = mkPatch { name = "leptonica"; src = fetchurl { - url = "http://www.leptonica.org/source/leptonica-1.79.0.tar.gz"; - sha256 = "1n004gv1dj3pq1fcnfdclvvx5nang80336aa67nvs3nnqp4ncn84"; + url = "http://www.leptonica.org/source/leptonica-1.83.0.tar.gz"; + hash = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4="; }; patchCommands = "cp -r ${k2pdfopt_src}/leptonica_mod/. ./src/"; }; @@ -112,12 +123,16 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; - rev = "4.1.1"; - sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn"; + rev = "5.3.3"; + hash = "sha256-/aGzwm2+0y8fheOnRi/OJXZy3o0xjY1cCq+B3GTzfos="; }; patchCommands = '' - cp ${k2pdfopt_src}/tesseract_mod/{baseapi,tesscapi,tesseract}.* src/api/ + cp ${k2pdfopt_src}/tesseract_mod/tesseract.* include/tesseract/ + cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h include/tesseract/ + cp ${k2pdfopt_src}/tesseract_mod/{baseapi,config_auto,tesscapi,tesseract}.* src/api/ + cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/api/ cp ${k2pdfopt_src}/tesseract_mod/{tesscapi,tessedit,tesseract}.* src/ccmain/ + cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/ccmain/ cp ${k2pdfopt_src}/tesseract_mod/dotproduct{avx,fma,sse}.* src/arch/ cp ${k2pdfopt_src}/tesseract_mod/{intsimdmatrixsse,simddetect}.* src/arch/ cp ${k2pdfopt_src}/tesseract_mod/{errcode,genericvector,mainblk,params,serialis,tessdatamanager,tess_version,tprintf,unicharset}.* src/ccutil/ @@ -125,19 +140,21 @@ in stdenv.mkDerivation rec { cp ${k2pdfopt_src}/tesseract_mod/openclwrapper.* src/opencl/ ''; }; - tesseract_modded = tesseract4.override { - tesseractBase = tesseract4.tesseractBase.overrideAttrs ({ patches ? [], ... }: { + tesseract_modded = tesseract.override { + tesseractBase = tesseract.tesseractBase.overrideAttrs ({ patches ? [], ... }: { patches = patches ++ [ tesseract_patch ]; # Additional compilation fixes postPatch = '' - echo libtesseract_api_la_SOURCES += tesscapi.cpp >> src/api/Makefile.am + echo libtesseract_la_SOURCES += src/api/tesscapi.cpp >> Makefile.am substituteInPlace src/api/tesseract.h \ --replace "#include <leptonica.h>" "//#include <leptonica.h>" + substituteInPlace include/tesseract/tesseract.h \ + --replace "#include <leptonica.h>" "//#include <leptonica.h>" ''; }); }; in - [ zlib libpng ] ++ + [ jbig2dec libjpeg_turbo libpng zlib ] ++ lib.optional enableGSL gsl ++ lib.optional enableGhostScript ghostscript ++ lib.optional enableMuPDF mupdf_modded ++ @@ -156,12 +173,13 @@ in stdenv.mkDerivation rec { ''; preFixup = lib.optionalString enableTesseract '' - wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract4}/share/tessdata + wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract}/share/tessdata ''; meta = with lib; { description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones"; homepage = "http://www.willus.com/k2pdfopt"; + changelog = "https://www.willus.com/k2pdfopt/k2pdfopt_version.txt"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ bosu danielfullmer ]; diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index e1636e30267b5..55e0de4d55246 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/jeromerobert/k4dirstat"; - description = "A small utility program that sums up disk usage for directory trees"; + description = "Small utility program that sums up disk usage for directory trees"; mainProgram = "k4dirstat"; license = licenses.gpl2; maintainers = [ maintainers.raboof ]; diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/applications/misc/kaufkauflist/default.nix index fee38a8a9483e..895567ba659b3 100644 --- a/pkgs/applications/misc/kaufkauflist/default.nix +++ b/pkgs/applications/misc/kaufkauflist/default.nix @@ -45,7 +45,7 @@ in buildNpmPackage rec { meta = with lib; { homepage = "https://codeberg.org/annaaurora/kaufkauflist"; - description = "A to-do list for shopping or other use cases"; + description = "To-do list for shopping or other use cases"; license = licenses.mit; maintainers = with maintainers; [ annaaurora ]; mainProgram = "kaufdbclean"; diff --git a/pkgs/applications/misc/keepass-diff/default.nix b/pkgs/applications/misc/keepass-diff/default.nix index 5cee712ae0c61..c7546cb004558 100644 --- a/pkgs/applications/misc/keepass-diff/default.nix +++ b/pkgs/applications/misc/keepass-diff/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+kgb9hbCH4Nt80nobTeDrC+LVp1r6EbzUs+t6zlIhtU="; meta = with lib; { - description = "A CLI-tool to diff Keepass (.kdbx) files"; + description = "CLI-tool to diff Keepass (.kdbx) files"; homepage = "https://keepass-diff.narigo.dev/"; license = licenses.mit; maintainers = with maintainers; [ wamserma ]; diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index 09331665a7f82..0cd8d6b7ed80f 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -11,7 +11,7 @@ let }; meta = with lib; { - description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords"; + description = "KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords"; homepage = "https://github.com/kee-org/keepassrpc"; platforms = [ "x86_64-linux" ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index e8804f6009464..ec633ac7514b9 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.7.7"; + version = "2.7.9"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - hash = "sha256-HjDzb1H3eMSraKbfHgg9S+w4TXNt40lQkDz+EChb5Ks="; + hash = "sha256-rnietdc8eDNTag0GaZ8VJb28JsKKD/qrQ0Gg6FMWpr0="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.keepassxc; meta = with lib; { - description = "Offline password manager with many features."; + description = "Offline password manager with many features"; longDescription = '' A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes, diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix index 5a9afb42dd15a..0ae96fcf6115d 100644 --- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { ]); meta = with lib; { - description = "A desktop application to control Elgato Keylights"; + description = "Desktop application to control Elgato Keylights"; longDescription = '' Requires having: * Elgato's Keylight paired to local wifi network. diff --git a/pkgs/applications/misc/kickoff/default.nix b/pkgs/applications/misc/kickoff/default.nix index cd1a57a09f35a..497d64a17aa42 100644 --- a/pkgs/applications/misc/kickoff/default.nix +++ b/pkgs/applications/misc/kickoff/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "kickoff"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "j0ru"; repo = pname; rev = "v${version}"; - hash = "sha256-WUDbb/GLABhqE93O6bm19Y+r0kSMEJrvduw68Igub44="; + hash = "sha256-ha1pRViiOH0U0djUq1x8TIpVoUMn8l+2pA//YP70jdk="; }; - cargoHash = "sha256-nhUC9PSKAbNEK5e4WRx3dgYI0rJP5XSWcW6M5E0Ihv4="; + cargoHash = "sha256-pdncUUGSfsn35VpwuNWZ/0DAIImBLAm0LyPbqQ06Xho="; libPath = lib.makeLibraryPath [ wayland diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index c33ca9bd2a68e..582509db4184b 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A tiling layout generator for river"; + description = "Tiling layout generator for river"; homepage = "https://gitlab.com/snakedye/kile"; license = licenses.mit; platforms = platforms.linux; # It's meant for river, a wayland compositor diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix index cafa43fa4f8cf..a3dacf6e82e8f 100644 --- a/pkgs/applications/misc/kiln/default.nix +++ b/pkgs/applications/misc/kiln/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kiln"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromSourcehut { owner = "~adnano"; repo = "kiln"; rev = version; - hash = "sha256-BMYySYbV4Exl0gCUt+95FnOoIhKM1UO4cw8gCw3Zf9M="; + hash = "sha256-BbKd+0Dmo6RaoS0N7rQmSGJasuJb6dl43GZ7LdMBy/o="; }; nativeBuildInputs = [ scdoc installShellFiles ]; - vendorHash = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE="; + vendorHash = "sha256-3s1+/RxOTNVFX9FnS94jLVGSr5IjZC/XucmnkxHhk5Q="; postInstall = '' scdoc < docs/kiln.1.scd > docs/kiln.1 @@ -21,7 +21,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A simple static site generator for Gemini"; + description = "Simple static site generator for Gemini"; homepage = "https://kiln.adnano.co/"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index e804f890b832f..1c338a7f58a61 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -38,7 +38,7 @@ mkDerivation { ]; meta = with lib; { - description = "An offline reader for Web content"; + description = "Offline reader for Web content"; mainProgram = "kiwix-desktop"; homepage = "https://kiwix.org"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/applications/misc/kiwix/tools.nix index b5e123b412644..bc2ea83d1480e 100644 --- a/pkgs/applications/misc/kiwix/tools.nix +++ b/pkgs/applications/misc/kiwix/tools.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; meta = with lib; { - description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ..."; + description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, .."; homepage = "https://kiwix.org"; changelog = "https://github.com/kiwix/kiwix-tools/releases/tag/${finalAttrs.version}"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index dca694bf29792..6408168d67838 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { - description = "The Bible, King James Version"; + description = "Bible, King James Version"; homepage = "https://github.com/bontibon/kjv"; license = licenses.unlicense; maintainers = with maintainers; [ jtobin cafkafk ]; diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix index 43be74e134418..65337780469a6 100644 --- a/pkgs/applications/misc/kord/default.nix +++ b/pkgs/applications/misc/kord/default.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; meta = with lib; { - description = "A music theory binary and library for Rust"; + description = "Music theory binary and library for Rust"; homepage = "https://github.com/twitchax/kord"; maintainers = with maintainers; [ kidsan ]; license = with licenses; [ mit ]; diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index 6bf06be9be7e8..5f38d116d82e0 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -6,7 +6,7 @@ }: let pname = "kratos"; - version = "1.1.0"; + version = "1.2.0"; in buildGoModule { inherit pname version; @@ -15,10 +15,10 @@ buildGoModule { owner = "ory"; repo = "kratos"; rev = "v${version}"; - hash = "sha256-zrII2lpffZkwFauPAilh1QaqRKvpj1mlHZA7in1ljYg="; + hash = "sha256-KqF6DYrEsmPj2PtI2+5ztE0m9uBO1gpNlvdo+Aw6REA="; }; - vendorHash = "sha256-TSB7jCPOVwub+ZQaaUSmsz/R4HAfmnWb0wTf2w4aeuk="; + vendorHash = "sha256-6gJf+8AKjV83MTF0rC8OxDwkwGx4CJg7SdfNgcja8QY="; subPackages = [ "." ]; @@ -47,7 +47,7 @@ buildGoModule { meta = { mainProgram = "kratos"; - description = "An API-first Identity and User Management system that is built according to cloud architecture best practices"; + description = "API-first Identity and User Management system that is built according to cloud architecture best practices"; homepage = "https://www.ory.sh/kratos/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mrmebelman ]; diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 6cc5df92ae727..a5f09789fc404 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -34,7 +34,7 @@ in mkDerivation rec { NIX_LDFLAGS = "-ltag"; meta = with lib; { - description = "A powerful batch renamer for KDE"; + description = "Powerful batch renamer for KDE"; mainProgram = "krename"; homepage = "https://kde.org/applications/utilities/krename/"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix index c592d944c6322..41a7c43875019 100644 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ b/pkgs/applications/misc/ksmoothdock/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { cmakeDir = "../src"; meta = with lib; { - description = "A cool desktop panel for KDE Plasma 5"; + description = "Cool desktop panel for KDE Plasma 5"; mainProgram = "ksmoothdock"; license = licenses.mit; homepage = "https://dangvd.github.io/ksmoothdock/"; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 8c22612ad452c..c184a78deaf46 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -51,7 +51,7 @@ buildPythonApplication rec { doCheck = false; # no tests meta = with lib; { - description = "A smart, quick launcher"; + description = "Smart, quick launcher"; homepage = "https://kupferlauncher.github.io/"; license = licenses.gpl3; maintainers = with maintainers; [ cobbal ]; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index ae1b13cc870a2..0d17b129ac7a4 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -4,14 +4,14 @@ mkDerivation rec { pname = "latte-dock"; - version = "unstable-2023-03-31"; + version = "unstable-2024-01-31"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "plasma"; repo = "latte-dock"; - rev = "4f93251d8c635c6150483ecb321eb276f34d4280"; - sha256 = "sha256-oEfKfsVIAmYgQ7+WyBEQfVpI4IndWhYXWBsJE8bNNyI="; + rev = "131ee4d39ce8913b2de8f9a673903225345c7a38"; + sha256 = "sha256-C1FvgkdxCzny+F6igS2YjsHOpkK34wl6je2tHlGQwU0="; }; buildInputs = [ plasma-framework plasma-wayland-protocols qtwayland xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland plasma-workspace plasma-desktop ]; diff --git a/pkgs/applications/misc/lavalauncher/default.nix b/pkgs/applications/misc/lavalauncher/default.nix index d4556402e21bb..77ad5e5901a94 100644 --- a/pkgs/applications/misc/lavalauncher/default.nix +++ b/pkgs/applications/misc/lavalauncher/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://git.sr.ht/~leon_plickat/lavalauncher"; - description = "A simple launcher panel for Wayland desktops"; + description = "Simple launcher panel for Wayland desktops"; longDescription = '' LavaLauncher is a simple launcher panel for Wayland desktops. diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index eb2e3c136cf4c..3ce387c410d9f 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -72,7 +72,7 @@ mkDerivation rec { description = "2D CAD package based on Qt"; homepage = "https://librecad.org"; license = licenses.gpl2Only; - maintainers = with maintainers; [ kiwi viric ]; + maintainers = with maintainers; [ viric ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 95c98d9665a62..db089796222cb 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/criticic/llpp"; - description = "A MuPDF based PDF pager written in OCaml"; + description = "MuPDF based PDF pager written in OCaml"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; license = [ licenses.publicDomain licenses.bsd3 ]; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix deleted file mode 100644 index 5fe74bbe204a7..0000000000000 --- a/pkgs/applications/misc/logseq/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, fetchurl -, appimageTools -, makeWrapper -# graphs will not sync without matching upstream's major electron version -, electron_27 -, autoPatchelfHook -, git -, nix-update-script -}: - -stdenv.mkDerivation (finalAttrs: let - inherit (finalAttrs) pname version src appimageContents; - -in { - pname = "logseq"; - version = "0.10.9"; - - src = fetchurl { - url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-XROuY2RlKnGvK1VNvzauHuLJiveXVKrIYPppoz8fCmc="; - name = "${pname}-${version}.AppImage"; - }; - - appimageContents = appimageTools.extract { - inherit pname src version; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop - - # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git - chmod +w $out/share/${pname}/resources/app/node_modules/dugite - rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git - chmod -w $out/share/${pname}/resources/app/node_modules/dugite - - mkdir -p $out/share/pixmaps - ln -s $out/share/${pname}/resources/app/icons/logseq.png $out/share/pixmaps/${pname}.png - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace Exec=Logseq Exec=${pname} \ - --replace Icon=Logseq Icon=${pname} - - runHook postInstall - ''; - - postFixup = '' - # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron_27}/bin/electron $out/bin/${pname} \ - --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/${pname}/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "A local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base"; - homepage = "https://github.com/logseq/logseq"; - changelog = "https://github.com/logseq/logseq/releases/tag/${version}"; - license = lib.licenses.agpl3Plus; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "logseq"; - }; -}) diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index a5b729c3cf3bf..2623b9f027ccc 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication { doCheck = false; # Tests are interactive. meta = with lib; { - description = "A Password Safe V3 compatible password vault"; + description = "Password Safe V3 compatible password vault"; mainProgram = "loxodo"; homepage = "https://www.christoph-sommer.de/loxodo/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 104f1baa037d8..2778db3ca8b25 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.17.0"; + version = "0.18.0"; src = fetchCrate { inherit version pname; - hash = "sha256-efkSiwxL7sZIwFXJZunddAb4lTOfhj8oOEOUW3kyRXI="; + hash = "sha256-m9S8fG0c+67/msdWaN8noazEdsdLk1aswUJ+8hkjhxo="; }; - cargoHash = "sha256-1Cyg4WT4xYqc3s5AOXR9GfcS3qKOgscYujGXR9fzuCA="; + cargoHash = "sha256-6d/v89Yqn9FioWQTb5513kPbO9lnzBxaubfcdCzwUP4="; buildFeatures = [ "nu-ansi-term" ]; diff --git a/pkgs/applications/misc/lswt/default.nix b/pkgs/applications/misc/lswt/default.nix index 0845a5a1cb5e6..15e2f6e955ebd 100644 --- a/pkgs/applications/misc/lswt/default.nix +++ b/pkgs/applications/misc/lswt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A command that lists Wayland toplevels"; + description = "Command that lists Wayland toplevels"; homepage = "https://sr.ht/~leon_plickat/lswt"; license = licenses.gpl3Only; maintainers = with maintainers; [ edrex ]; diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 84ad583c63b5d..573d0311887a6 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -25,7 +25,7 @@ appimageTools.wrapType2 rec { ''; meta = with lib; { - description = "An all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app"; + description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app"; longDescription = '' Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health. ''; diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index 1f85cd9e72312..9ffdc79f04cb8 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -1,26 +1,34 @@ { lib -, stdenvNoCC -, fetchzip +, buildNpmPackage +, fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { + buildNpmPackage rec { pname = "mainsail"; version = "2.11.2"; - src = fetchzip { - url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-RdBgGE/EUzb1/6PjQ34UjXjxt686s9May7npFtRocXE="; - stripRoot = false; + src = fetchFromGitHub { + owner = "mainsail-crew"; + repo = "mainsail"; + rev = "v${version}"; + hash = "sha256-N0tm36YMRRrkyuIwzcYbDo1DHesAnJ2s2g0KCms3h5I="; }; - dontConfigure = true; - dontBuild = true; + npmDepsHash = "sha256-z6Fo0XAds/F0Ig+nUE3O16gmH0EVcpML3K8cdKhkJzg="; + + # Prevent Cypress binary download. + CYPRESS_INSTALL_BINARY = 0; + + preConfigure = '' + # Make the build.zip target do nothing, since we will just copy these files later. + sed -e 's/"build.zip":.*,$/"build.zip": "",/g' -i package.json + ''; installPhase = '' runHook preInstall - mkdir -p $out/share/mainsail - cp -r ./* $out/share/mainsail + mkdir -p $out/share + cp -r ./dist $out/share/mainsail runHook postInstall ''; @@ -31,6 +39,6 @@ stdenvNoCC.mkDerivation rec { changelog = "https://github.com/mainsail-crew/mainsail/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ shhht lovesegfault ]; + maintainers = with maintainers; [ shhht lovesegfault wulfsta ]; }; } diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 2f30e805c5848..f730e9265d257 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -73,6 +73,6 @@ mkDerivation rec { mainProgram = "maliit-server"; homepage = "http://maliit.github.io/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ samueldr ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index 9613639b0f174..c315b5251cea0 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -69,6 +69,6 @@ mkDerivation rec { mainProgram = "maliit-keyboard"; homepage = "http://maliit.github.io/"; license = with licenses; [ lgpl3Only bsd3 cc-by-30 ]; - maintainers = with maintainers; [ samueldr ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index 573d4a9d5a734..1cea36541120c 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -31,7 +31,7 @@ appimageTools.wrapType2 rec { ''; meta = with lib; { - description = "A simple and elegant markdown editor, available for Linux, macOS and Windows"; + description = "Simple and elegant markdown editor, available for Linux, macOS and Windows"; homepage = "https://www.marktext.cc"; license = licenses.mit; maintainers = with maintainers; [ nh2 eduarrrd ]; diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix index 13809abe3929c..a33fe7d07cffa 100644 --- a/pkgs/applications/misc/mbutil/default.nix +++ b/pkgs/applications/misc/mbutil/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { checkPhase = "nosetests"; meta = with lib; { - description = "An importer and exporter for MBTiles"; + description = "Importer and exporter for MBTiles"; mainProgram = "mb-util"; homepage = "https://github.com/mapbox/mbutil"; license = licenses.bsd3; diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index fd3ab88ff4c82..13d34b66801fc 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/visit1985/mdp"; - description = "A command-line based markdown presentation tool"; + description = "Command-line based markdown presentation tool"; maintainers = with maintainers; [ matthiasbeyer vrthra ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 4a4d9a70fdabd..07cc3eb0df1af 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -9,6 +9,7 @@ # to be re-enabled when patch available # , ffmpeg , gcc-unwrapped +, icu , libmediainfo , libraw , libsodium @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-JnxfFbM+NyeUrEMok62zlsQIxjrUvLLg4tUTiKPDZFc="; + sha256 = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; fetchSubmodules = true; }; @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { cryptopp curl # ffmpeg + icu gcc-unwrapped libmediainfo libraw @@ -59,6 +61,7 @@ stdenv.mkDerivation rec { "--with-curl" # "--with-ffmpeg" "--without-freeimage" # disabled as freeimage is insecure + "--with-icu" "--with-libmediainfo" "--with-libuv" "--with-libzen" diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 93ef8192f54b4..c6d9c58b0ad62 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A simple tool written in bash to memorize stuff"; + description = "Simple tool written in bash to memorize stuff"; longDescription = '' A simple tool written in bash to memorize stuff. Memo organizes is structured through topics which are folders in ~/memo. diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/applications/misc/mepo/default.nix index 23a57c343b4f5..afa5ffe3d7971 100644 --- a/pkgs/applications/misc/mepo/default.nix +++ b/pkgs/applications/misc/mepo/default.nix @@ -17,23 +17,23 @@ , util-linux , xwininfo , zenity -, zig_0_11 +, zig_0_12 }: stdenv.mkDerivation (finalAttrs: { pname = "mepo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromSourcehut { owner = "~mil"; repo = "mepo"; rev = finalAttrs.version; - hash = "sha256-sxN7yTnk3KDAkP/d3miKa2bEgB3AUaf9/M9ajJyRt3g="; + hash = "sha256-Ii5E9TgUxzlVIdkKS/6RtasOETeclMm1yoU86gs4hB8="; }; nativeBuildInputs = [ pkg-config - zig_0_11.hook + zig_0_12.hook makeWrapper ]; @@ -56,10 +56,10 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' substituteInPlace $out/bin/mepo_ui_menu_user_pin_updater.sh \ - --replace /usr/libexec/geoclue-2.0 ${geoclue2-with-demo-agent}/libexec/geoclue-2.0 + --replace-fail /usr/libexec/geoclue-2.0 ${geoclue2-with-demo-agent}/libexec/geoclue-2.0 substituteInPlace $out/bin/mepo_ui_central_menu.sh \ - --replace "grep mepo_" "grep '^\.mepo_\|^mepo_'" \ - --replace " ls " " ls -a " #circumvent wrapping for script detection + --replace-fail "grep mepo_" "grep '^\.mepo_\|^mepo_'" \ + --replace-fail " ls " " ls -a " #circumvent wrapping for script detection for program in $out/bin/* ; do wrapProgram $program \ --suffix PATH : $out/bin:${lib.makeBinPath ([ diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index c5950e2e9df0a..344376b985a6c 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "a graphical mass renaming program for files and folders"; + description = "Graphical mass renaming program for files and folders"; homepage = "https://github.com/timinaust/metamorphose2"; license = with licenses; gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; diff --git a/pkgs/applications/misc/michabo/default.nix b/pkgs/applications/misc/michabo/default.nix index 6329bd9d2495b..7f077d20fc85c 100644 --- a/pkgs/applications/misc/michabo/default.nix +++ b/pkgs/applications/misc/michabo/default.nix @@ -42,7 +42,7 @@ in mkDerivation rec { ''; meta = with lib; { - description = "A native desktop app for Pleroma and Mastodon servers"; + description = "Native desktop app for Pleroma and Mastodon servers"; mainProgram = "Michabo"; homepage = "https://git.pleroma.social/kaniini/michabo"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index aa31ffa5cc2b0..b8cdab22e8247 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://sharkwouter.github.io/minigalaxy/"; changelog = "https://github.com/sharkwouter/minigalaxy/blob/${version}/CHANGELOG.md"; downloadPage = "https://github.com/sharkwouter/minigalaxy/releases"; - description = "A simple GOG client for Linux"; + description = "Simple GOG client for Linux"; license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock index 922916ab1307a..554a818901516 100644 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ b/pkgs/applications/misc/mission-center/Cargo.lock @@ -16,36 +16,30 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "anyhow" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block" @@ -55,9 +49,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "cairo-rs" -version = "0.19.2" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ "bitflags", "cairo-sys-rs", @@ -79,15 +73,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -223,7 +217,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -260,9 +254,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" +checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" dependencies = [ "gio-sys", "glib-sys", @@ -273,9 +267,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" +checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -288,9 +282,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" +checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -305,9 +299,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -336,9 +330,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.19.2" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" +checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" dependencies = [ "futures-channel", "futures-core", @@ -354,9 +348,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" dependencies = [ "glib-sys", "gobject-sys", @@ -367,9 +361,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.2" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" +checksum = "be682de2914107f591efdbe2debf05d9ad70726310ee2b6a3802a697649fcc55" dependencies = [ "bitflags", "futures-channel", @@ -389,22 +383,22 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.2" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" +checksum = "6ed782fa3e949c31146671da6e7a227a5e7d354660df1db6d0aac4974dc82a3c" dependencies = [ "heck", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "glib-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" dependencies = [ "libc", "system-deps", @@ -412,9 +406,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" dependencies = [ "glib-sys", "libc", @@ -434,9 +428,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" dependencies = [ "glib-sys", "libc", @@ -446,9 +440,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" +checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" dependencies = [ "cairo-rs", "gdk4", @@ -461,9 +455,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" +checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -477,9 +471,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" +checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" dependencies = [ "cairo-rs", "field-offset", @@ -498,23 +492,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" +checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" dependencies = [ - "anyhow", "proc-macro-crate", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "gtk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" +checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -531,9 +523,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -550,15 +542,15 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -566,9 +558,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "lazy_static" @@ -610,9 +602,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libdbus-sys" @@ -668,22 +660,22 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "missioncenter" -version = "0.4.5" +version = "0.5.2" dependencies = [ "dbus", "errno-sys", @@ -698,6 +690,7 @@ dependencies = [ "rust-ini", "serde", "serde_json", + "static_assertions", "textdistance", ] @@ -738,9 +731,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-multimap" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", "hashbrown", @@ -748,9 +741,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.2" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" +checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" dependencies = [ "gio", "glib", @@ -760,9 +753,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" +checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" dependencies = [ "glib-sys", "gobject-sys", @@ -772,9 +765,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -798,52 +791,28 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -864,9 +833,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rusqlite" @@ -916,29 +885,29 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -965,26 +934,21 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] -name = "syn" -version = "1.0.109" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.52" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -993,9 +957,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", "heck", @@ -1012,9 +976,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "textdistance" @@ -1024,22 +988,22 @@ checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -1053,14 +1017,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.12", ] [[package]] @@ -1085,15 +1049,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.7", ] [[package]] @@ -1116,9 +1080,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -1165,13 +1129,14 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -1180,45 +1145,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -1231,9 +1202,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] @@ -1255,5 +1226,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index 6f8fb90bc26bf..9188df9e5b3b4 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -1,38 +1,39 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchFromGitHub -, cargo -, libxml2 -, meson -, ninja -, pkg-config -, python311 -, rustPlatform -, symlinkJoin -, rustc -, wrapGAppsHook4 -, appstream-glib -, blueprint-compiler -, cairo -, cmake -, dbus -, desktop-file-utils -, gdk-pixbuf -, gettext -, glib -, graphene -, gtk4 -, libGL -, libadwaita -, libdrm -, mesa -, pango -, sqlite -, udev -, wayland -, dmidecode -, vulkan-loader +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + cargo, + libxml2, + meson, + ninja, + pkg-config, + python311, + rustPlatform, + symlinkJoin, + rustc, + wrapGAppsHook4, + appstream-glib, + blueprint-compiler, + cairo, + cmake, + dbus, + desktop-file-utils, + gdk-pixbuf, + gettext, + glib, + graphene, + gtk4, + libGL, + libadwaita, + libdrm, + mesa, + pango, + sqlite, + udev, + wayland, + dmidecode, + vulkan-loader, }: let @@ -45,28 +46,23 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.4.5"; + version = "0.5.2"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-e5+uB2vzwRqjUiR+gxpSARHPqG+1iX3yifsfwv5LnZI="; + hash = "sha256-84D+CttolY5hleCJbDiN3mlk0+nlwwJUJhGoKGVT/lw="; }; cargoDeps = symlinkJoin { name = "cargo-vendor-dir"; paths = [ - (rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }) - (rustPlatform.importCargoLock { - lockFile = ./gatherer-Cargo.lock; - }) + (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }) + (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; }) ]; }; - nativeBuildInputs = [ blueprint-compiler cargo @@ -136,12 +132,13 @@ stdenv.mkDerivation rec { patchShebangs data/hwdb/generate_hwdb.py ''; - meta = with lib; { + meta = { description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; homepage = "https://gitlab.com/mission-center-devs/mission-center"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ GaetanLepage ]; - platforms = platforms.linux; + changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.linux; mainProgram = "missioncenter"; }; } diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index 792a68f66f979..d6ad543585a4f 100644 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -10,18 +10,18 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arrayvec" @@ -31,18 +31,18 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ "libloading", ] [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -61,9 +61,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block-buffer" @@ -86,18 +86,18 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "369cfaf2a5bed5d8f8202073b2e093c9f508251de1551a0deb4253e4c7d80909" dependencies = [ "proc-macro2", "quote", @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74862c3c6e53a1c1f8f0178f9d38ab41e49746cd3a7cafc239b3d0248fd4e342" +checksum = "f6e977de2867ec90a1654882ff95ca5849a526e893bab588f84664cfcdb11c0a" dependencies = [ "anyhow", "core-foundation", @@ -116,7 +116,7 @@ dependencies = [ "hex", "ignore", "jobserver", - "libc 0.2.153", + "libc 0.2.155", "miow", "same-file", "sha2", @@ -129,9 +129,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -141,9 +141,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "const-random" @@ -172,7 +172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", - "libc 0.2.153", + "libc 0.2.155", ] [[package]] @@ -187,14 +187,14 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ - "libc 0.2.153", + "libc 0.2.155", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -246,7 +246,7 @@ version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" dependencies = [ - "libc 0.2.153", + "libc 0.2.155", "libdbus-sys", "winapi", ] @@ -281,11 +281,11 @@ dependencies = [ [[package]] name = "drm" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bytemuck", "drm-ffi", "drm-fourcc", @@ -294,9 +294,9 @@ dependencies = [ [[package]] name = "drm-ffi" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" dependencies = [ "drm-sys", "rustix", @@ -310,11 +310,11 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] name = "drm-sys" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" dependencies = [ - "libc 0.2.153", + "libc 0.2.155", "linux-raw-sys 0.6.4", ] @@ -325,24 +325,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d" dependencies = [ "khronos", - "libc 0.2.153", + "libc 0.2.155", ] [[package]] +name = "either" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" + +[[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "libc 0.2.153", + "libc 0.2.155", "windows-sys 0.52.0", ] [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "filetime" @@ -351,16 +357,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", - "libc 0.2.153", + "libc 0.2.155", "redox_syscall", "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -377,7 +383,7 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.4.5" +version = "0.5.2" dependencies = [ "anyhow", "arrayvec", @@ -392,28 +398,33 @@ dependencies = [ "flate2", "gbm", "lazy_static", - "libc 0.2.153", + "libc 0.2.155", + "libloading", + "log", "nix", "pkg-config", + "rayon", "rust-ini", "serde", "serde_json", "sha2", + "static_assertions", "tar", + "thiserror", "ureq", ] [[package]] name = "gbm" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313702b30cdeb83ddc72bc14dcee67803cd0ae2d12282ea06e368c25a900c844" +checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "drm", "drm-fourcc", "gbm-sys", - "libc 0.2.153", + "libc 0.2.155", ] [[package]] @@ -422,7 +433,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" dependencies = [ - "libc 0.2.153", + "libc 0.2.155", ] [[package]] @@ -437,12 +448,12 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "libc 0.2.153", + "libc 0.2.155", "wasi", ] @@ -461,9 +472,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hex" @@ -499,17 +510,17 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ - "libc 0.2.153", + "libc 0.2.155", ] [[package]] @@ -535,9 +546,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -545,24 +556,25 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ + "cc", "pkg-config", ] [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.5", ] [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" @@ -578,15 +590,15 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -602,14 +614,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "cfg_aliases", - "libc 0.2.153", + "libc 0.2.155", ] [[package]] @@ -620,9 +632,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-multimap" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", "hashbrown", @@ -636,9 +648,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pkg-config" @@ -648,23 +660,43 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -686,9 +718,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "ring" @@ -699,7 +731,7 @@ dependencies = [ "cc", "cfg-if", "getrandom", - "libc 0.2.153", + "libc 0.2.155", "spin", "untrusted", "windows-sys 0.52.0", @@ -718,22 +750,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", - "libc 0.2.153", - "linux-raw-sys 0.4.13", + "libc 0.2.155", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", @@ -745,15 +777,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -762,9 +794,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -777,18 +809,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", @@ -797,9 +829,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -830,6 +862,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] name = "subtle" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -837,9 +875,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.52" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -853,7 +891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", - "libc 0.2.153", + "libc 0.2.155", "xattr", ] @@ -870,6 +908,26 @@ dependencies = [ ] [[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] name = "tiny-keccak" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -965,9 +1023,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.6" +version = "2.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" dependencies = [ "base64", "flate2", @@ -1040,11 +1098,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -1068,7 +1126,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -1088,17 +1146,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -1109,9 +1168,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -1121,9 +1180,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -1133,9 +1192,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -1145,9 +1210,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -1157,9 +1222,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -1169,9 +1234,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -1181,9 +1246,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "xattr" @@ -1191,8 +1256,8 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ - "libc 0.2.153", - "linux-raw-sys 0.4.13", + "libc 0.2.155", + "linux-raw-sys 0.4.14", "rustix", ] diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 40530d16391ff..a73767492f3fe 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 = "4919"; + version = "4921"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-WMFZEGTXVAaBlEKUqclmkw3pKnWSdbvulDvSi7TQn8k="; + sha256 = "sha256-s7EKHXh3UNMDzBmWUTZaLR1P21e27cWJNYRlFcpJu50="; }; patches = [ diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/applications/misc/mnamer/default.nix index fbcc9e61be45d..8477f95ab6667 100644 --- a/pkgs/applications/misc/mnamer/default.nix +++ b/pkgs/applications/misc/mnamer/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/jkwill87/mnamer"; - description = "An intelligent and highly configurable media organization utility"; + description = "Intelligent and highly configurable media organization utility"; mainProgram = "mnamer"; license = licenses.mit; maintainers = with maintainers; [ urlordjames ]; diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/applications/misc/mobilecoin-wallet/default.nix index 2b891abc64738..42bbae72af5ae 100644 --- a/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -30,10 +30,10 @@ in appimageTools.wrapType2 { ''; meta = with lib; { - description = "A user-friendly desktop wallet with support for transaction history, encrypted contact book, gift codes, and payments"; + description = "User-friendly desktop wallet with support for transaction history, encrypted contact book, gift codes, and payments"; homepage = "https://github.com/mobilecoinofficial/desktop-wallet"; license = licenses.gpl3Only; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; mainProgram = "mobilecoin-wallet"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/monitorcontrol/default.nix b/pkgs/applications/misc/monitorcontrol/default.nix index b5a6935958e23..db112415fda85 100644 --- a/pkgs/applications/misc/monitorcontrol/default.nix +++ b/pkgs/applications/misc/monitorcontrol/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A macOS system extension to control brightness and volume of external displays with native OSD"; + description = "MacOS system extension to control brightness and volume of external displays with native OSD"; longDescription = "Controls your external display brightness and volume and shows native OSD. Use menulet sliders or the keyboard, including native Apple keys!"; homepage = "https://github.com/MonitorControl/MonitorControl#readme"; license = licenses.mit; diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index 8736abb413ba5..5182b53faa9a4 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ socat ]; meta = with lib; { - description = "A mpc-like control interface for mpv"; + description = "Mpc-like control interface for mpv"; mainProgram = "mpvc"; homepage = "https://github.com/lwilletts/mpvc"; license = licenses.mit; diff --git a/pkgs/applications/misc/natural-docs/default.nix b/pkgs/applications/misc/natural-docs/default.nix index 05a752ab465d7..7b614fe359dd5 100644 --- a/pkgs/applications/misc/natural-docs/default.nix +++ b/pkgs/applications/misc/natural-docs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Documentation generator for multiple programming languages."; + description = "Documentation generator for multiple programming languages"; longDescription = '' Natural Docs is an open source documentation generator for multiple programming languages. You document your code in a natural syntax that diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 3ea19ebd0209a..23abf6a3546e3 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "An interactive cheatsheet tool for the command-line and application launchers"; + description = "Interactive cheatsheet tool for the command-line and application launchers"; homepage = "https://github.com/denisidoro/navi"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index 6c1ac1ede965d..e97acc0d25619 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -1,11 +1,11 @@ { appimageTools, lib, fetchurl }: let pname = "neo4j-desktop"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${pname}-${version}-x86_64.AppImage"; - hash = "sha256-RqzR4TuvDasbkj/wKvOOS7r46sXDxvw3B5ydFGZeHX8="; + hash = "sha256-04I1p5wtndIflHqS5qQVf3s8F9ORJ+oy4wi/5PQbnWk="; }; appimageContents = appimageTools.extract { inherit pname version src; }; @@ -22,7 +22,7 @@ in appimageTools.wrapType2 { ''; meta = with lib; { - description = "A GUI front-end for Neo4j"; + description = "GUI front-end for Neo4j"; homepage = "https://neo4j.com/"; license = licenses.unfree; maintainers = [ maintainers.bobvanderlinden ]; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index b55497a168ced..d6d0775f78d21 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -34,7 +34,7 @@ mkDerivation rec { ''; meta = with lib; { - description = "An unofficial client of Evernote"; + description = "Unofficial client of Evernote"; homepage = "http://www.nixnote.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ htr ]; diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index c8958950db9d4..0021cc7221250 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -36,7 +36,7 @@ appimageTools.wrapType2 rec { ''; meta = with lib; { - description = "The markdown-based note-taking app that doesn't suck"; + description = "Markdown-based note-taking app that doesn't suck"; homepage = "https://github.com/notable/notable"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 7742a54c6c0c5..ebac30c58a6cf 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, appimageTools, fetchurl, undmg }: +{ lib, stdenv, appimageTools, fetchurl, _7zz }: let pname = "notesnook"; - version = "2.6.1"; + version = "3.0.8"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-PLHP1Q4+xcHyr0323K4BD+oH57SspsrAcxRe/C6RFDU="; - x86_64-darwin = "sha256-gOUL3qLSM+/pr519Gc0baUtbmhA40lG6XzuCRyGILkc="; - aarch64-darwin = "sha256-d1nXdCv1mK4+4Gef1upIkHS3J2d9qzTLXbBWabsJwpw="; + x86_64-linux = "sha256-H25PGhCD5uqh2BHMMjb7GyftinBsRs2O5+9xNNV+5m4="; + x86_64-darwin = "sha256-uT4xo4LT70jq7bHmiYu4FL8Fldppc2ai8yEZzGMzM6Q="; + aarch64-darwin = "sha256-D5KIXHhzXXBOEcoOn2QKKUbVGMWhRW+L7fgxRxLpX/0="; }.${system} or throwSystem; }; @@ -27,7 +27,7 @@ let }; meta = with lib; { - description = "A fully open source & end-to-end encrypted note taking alternative to Evernote."; + description = "Fully open source & end-to-end encrypted note taking alternative to Evernote"; longDescription = '' Notesnook is a free (as in speech) & open source note taking app focused on user privacy & ease of use. To ensure zero knowledge @@ -36,7 +36,7 @@ let ''; homepage = "https://notesnook.com"; license = licenses.gpl3Only; - maintainers = with maintainers; [ j0lol ]; + maintainers = with maintainers; [ cig0 j0lol ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "notesnook"; }; @@ -59,10 +59,15 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "Notesnook.app"; + # 7zz did not unpack in setup hook for some reason, done manually here + unpackPhase = '' + 7zz x $src + ''; + installPhase = '' mkdir -p $out/Applications/Notesnook.app cp -R . $out/Applications/Notesnook.app diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/applications/misc/ns-usbloader/default.nix index 8ab52711a6cee..a97d3e6f9f88d 100644 --- a/pkgs/applications/misc/ns-usbloader/default.nix +++ b/pkgs/applications/misc/ns-usbloader/default.nix @@ -37,7 +37,6 @@ maven.buildMavenPackage rec { x86_64-linux = "sha256-vXZAlZOh9pXNF1RL78oQRal5pkXFRKDz/7SP9LibgiA="; aarch64-linux = "sha256-xC+feb41EPi30gBrVR8usanVULI2Pt0knztzNagPQiw="; }; - mvnParameters = "-DskipTests"; nativeBuildInputs = [ copyDesktopItems @@ -46,6 +45,8 @@ maven.buildMavenPackage rec { gvfs ]; + doCheck = false; + # Don't wrap binaries twice. dontWrapGApps = true; diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 99edf8183a202..9f59da0f9c12c 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.19"; + version = "0.3.20"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "refs/tags/v${version}"; - hash = "sha256-pZelKuTClRELZT80r44FxocdW+KRARD027ZV18XTTss="; + hash = "sha256-lpXcH45BFgfRjkEHqimnHonDenm5YA6oahe4sN2wpY4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix index ff0a57b07555f..a029b481eeec6 100644 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -8,28 +8,34 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "nwg-piotr"; - repo = pname; + repo = "nwg-dock-hyprland"; rev = "v${version}"; - sha256 = "sha256-cdNxaOnm98RcPG2o0GaBETpd+Zo2nlgrFv+2PiHOwUI="; + hash = "sha256-pzOdWv98tHZg6Xn58z5DlM1H0IOQ+ohfXEZRLZr8mz0="; }; - vendorHash = "sha256-JEzc950c4EGOYMLgpL8PXENkGlWSX8Z4A4jCx1B99X8="; + vendorHash = "sha256-bK3SpydIO943e7zti6yWQ+JqmdF4NkAAtelNBt4Q/+s="; ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk-layer-shell ]; - meta = with lib; { + postInstall = '' + install -d $out/share/nwg-dock-hyprland + cp -r images $out/share/nwg-dock-hyprland/images + install -Dm644 config/style.css $out/share/nwg-dock-hyprland/style.css + ''; + + meta = { description = "GTK3-based dock for Hyprland"; mainProgram = "nwg-dock-hyprland"; homepage = "https://github.com/nwg-piotr/nwg-dock-hyprland"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ aleksana ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; }; } diff --git a/pkgs/applications/misc/nwg-look/default.nix b/pkgs/applications/misc/nwg-look/default.nix index 5ce8ad87ba37d..ceaf6ce1a2959 100644 --- a/pkgs/applications/misc/nwg-look/default.nix +++ b/pkgs/applications/misc/nwg-look/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, substituteAll +, wrapGAppsHook3 , buildGoModule , go , glib @@ -15,32 +15,26 @@ buildGoModule rec { pname = "nwg-look"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-look"; rev = "v${version}"; - hash = "sha256-kOoYhJKt7/BsQ0/RuVhj0bWnX9GU8ET3MSq6NMCOw5E="; + hash = "sha256-qUNTJkNHWoJisLH0SU23UQuamEL27MMRnxw0kBxzWLk="; }; - vendorHash = "sha256-V0KXK6jxBYI+tixBLq24pJJcnu4gDF6nfyns2IBTss4="; - - # Replace /usr/ directories with the packages output location - # This means it references the correct path - patches = [ ./fix-paths.patch ]; - - postPatch = '' - substituteInPlace main.go tools.go --replace '@out@' $out - ''; + vendorHash = "sha256-qHWy9OCxENrrWk00YoRveSjqYWIy/fe4Fyc8tc4n34E="; ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ pkg-config + wrapGAppsHook3 ]; buildInputs = [ + glib cairo xcur2png libX11.dev @@ -55,15 +49,24 @@ buildGoModule rec { mkdir -p $out/share/nwg-look/langs mkdir -p $out/share/applications mkdir -p $out/share/pixmaps + mkdir -p $out/share/icons cp stuff/main.glade $out/share/nwg-look/ cp langs/* $out/share/nwg-look/langs cp stuff/nwg-look.desktop $out/share/applications cp stuff/nwg-look.svg $out/share/pixmaps ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${glib.bin}/bin" + --prefix PATH : "${xcur2png}/bin" + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" + ) + ''; + meta = with lib; { homepage = "https://github.com/nwg-piotr/nwg-look"; - description = "Nwg-look is a GTK3 settings editor, designed to work properly in wlroots-based Wayland environment."; + description = "Nwg-look is a GTK3 settings editor, designed to work properly in wlroots-based Wayland environment"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ max-amb ]; diff --git a/pkgs/applications/misc/nwg-look/fix-paths.patch b/pkgs/applications/misc/nwg-look/fix-paths.patch deleted file mode 100644 index 3b56e00522137..0000000000000 --- a/pkgs/applications/misc/nwg-look/fix-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/main.go b/main.go -index 23c4756..c52e9c3 100644 ---- a/main.go -+++ b/main.go -@@ -335,7 +335,7 @@ func main() { - - gtkSettings, _ = gtk.SettingsGetDefault() - -- builder, _ := gtk.BuilderNewFromFile("/usr/share/nwg-look/main.glade") -+ builder, _ := gtk.BuilderNewFromFile("@out@/share/nwg-look/main.glade") - win, _ := getWindow(builder, "window") - - win.Connect("destroy", func() { -diff --git a/tools.go b/tools.go -index e6e7665..59d6f35 100644 ---- a/tools.go -+++ b/tools.go -@@ -1034,7 +1034,7 @@ func getDataDirs() []string { - if os.Getenv("XDG_DATA_DIRS") != "" { - xdgDataDirs = os.Getenv("XDG_DATA_DIRS") - } else { -- xdgDataDirs = "/usr/local/share/:/usr/share/" -+ xdgDataDirs = "@out@/local/share/:@out@/share/" - } - - for _, d := range strings.Split(xdgDataDirs, ":") { -@@ -1280,7 +1280,7 @@ func detectLang() string { - } - - func loadVocabulary(lang string) map[string]string { -- langsDir := "/usr/share/nwg-look/langs/" -+ langsDir := "@out@/share/nwg-look/langs/" - enUSFile := filepath.Join(langsDir, "en_US.json") - if pathExists(enUSFile) { - log.Infof(">>> Loading basic lang from '%s'", enUSFile) diff --git a/pkgs/applications/misc/nwg-look/go.mod b/pkgs/applications/misc/nwg-look/go.mod index 0446058e56c22..1f40d0a94fbd0 100644 --- a/pkgs/applications/misc/nwg-look/go.mod +++ b/pkgs/applications/misc/nwg-look/go.mod @@ -1,10 +1,10 @@ module github.com/nwg-piotr/nwg-look -go 1.20 +go 1.22 require ( - github.com/gotk3/gotk3 v0.6.2 + github.com/gotk3/gotk3 v0.6.3 github.com/sirupsen/logrus v1.9.3 ) -require golang.org/x/sys v0.6.0 // indirect +require golang.org/x/sys v0.17.0 // indirect diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix deleted file mode 100644 index c7091b00c7dc5..0000000000000 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, fetchFromGitHub -, python3Packages, wrapGAppsHook3, gobject-introspection -, gtk-layer-shell, pango, gdk-pixbuf, atk -# Extra packages called by various internal nwg-panel modules -, hyprland # hyprctl -, sway # swaylock, swaymsg -, systemd # systemctl -, wlr-randr # wlr-randr -, nwg-menu # nwg-menu -, brightnessctl # brightnessctl -, pamixer # pamixer -, pulseaudio # pactl -, libdbusmenu-gtk3 # tray -, playerctl -}: - -python3Packages.buildPythonApplication rec { - pname = "nwg-panel"; - version = "0.9.32"; - - src = fetchFromGitHub { - owner = "nwg-piotr"; - repo = "nwg-panel"; - rev = "refs/tags/v${version}"; - hash = "sha256-7UROYXmDDWW/NFmKy3h1PfkQGB74DogcgTQXGXojY4U="; - }; - - # No tests - doCheck = false; - - # Because of wrapGAppsHook3 - strictDeps = false; - dontWrapGApps = true; - - buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ]; - nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; - propagatedBuildInputs = (with python3Packages; - [ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ]) - # Run-time GTK dependency required by the Tray module - ++ [ libdbusmenu-gtk3 ]; - - postInstall = '' - mkdir -p $out/share/{applications,pixmaps} - cp $src/nwg-panel-config.desktop nwg-processes.desktop $out/share/applications/ - cp $src/nwg-shell.svg $src/nwg-panel.svg nwg-processes.svg $out/share/pixmaps/ - ''; - - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - --prefix XDG_DATA_DIRS : "$out/share" - --prefix PATH : "${lib.makeBinPath [ brightnessctl hyprland nwg-menu pamixer pulseaudio sway systemd wlr-randr ]}" - ) - ''; - - meta = with lib; { - homepage = "https://github.com/nwg-piotr/nwg-panel"; - description = "GTK3-based panel for Sway window manager"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ ludovicopiero ]; - mainProgram = "nwg-panel"; - }; -} diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 1090941f8e39e..000d94bbeec39 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -8,14 +8,15 @@ , writeScript , undmg , unzip +, commandLineArgs ? "" }: let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.5.12"; + version = "1.6.3"; appname = "Obsidian"; meta = with lib; { - description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; + description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; @@ -25,7 +26,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}"; - hash = if stdenv.isDarwin then "sha256-MSJmF5WddxbC/S7w2nWjlDxt5HPUDCoRFwJ2MZMH9Ks=" else "sha256-UQLljP7eZELTuHwX+OylXY+Wy2YK1ZEJX1IQfIvBLe8="; + hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-ho8E2Iq+s/w8NjmxzZo/y5aj3MNgbyvIGjk3nSKPLDw="; }; icon = fetchurl { @@ -52,7 +53,8 @@ let mkdir -p $out/bin makeWrapper ${electron}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} install -m 444 -D resources/app.asar $out/share/obsidian/app.asar install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar install -m 444 -D "${desktopItem}/share/applications/"* \ diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 98f210dbe5d3a..9857865478a0e 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -256,7 +256,7 @@ let meta = with lib; { homepage = "https://octoprint.org/"; - description = "The snappy web interface for your 3D printer"; + description = "Snappy web interface for your 3D printer"; mainProgram = "octoprint"; license = licenses.agpl3Only; maintainers = with maintainers; [ abbradar gebner WhittlesJr gador ]; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ff920edbc272e..090c4e0e852d9 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -89,7 +89,7 @@ in }; meta = with lib; { - description = "Plugin to display the estimated print cost for the loaded model."; + description = "Plugin to display the estimated print cost for the loaded model"; homepage = "https://github.com/OllisGit/OctoPrint-CostEstimation"; license = licenses.agpl3Only; maintainers = with maintainers; [ stunkymonkey ]; @@ -301,7 +301,7 @@ in }; meta = with lib; { - description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; + description = "Simple plugin that add an emergency stop buton on NavBar of OctoPrint"; homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; @@ -320,7 +320,7 @@ in }; meta = with lib; { - description = "A simple stl viewer tab for OctoPrint"; + description = "Simple stl viewer tab for OctoPrint"; homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; license = licenses.agpl3Only; maintainers = with maintainers; [ abbradar ]; @@ -341,7 +341,7 @@ in propagatedBuildInputs = with super; [ pillow ]; meta = with lib; { - description = "Plugin to send status messages and receive commands via Telegram messenger."; + description = "Plugin to send status messages and receive commands via Telegram messenger"; homepage = "https://github.com/fabianonline/OctoPrint-Telegram"; license = licenses.agpl3Only; maintainers = with maintainers; [ stunkymonkey ]; @@ -417,7 +417,7 @@ in }; meta = with lib; { - description = "A plugin for a better integration of Klipper into OctoPrint"; + description = "Plugin for a better integration of Klipper into OctoPrint"; homepage = "https://github.com/AliceGrey/OctoprintKlipperPlugin"; license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; @@ -471,7 +471,7 @@ in }; meta = with lib; { - description = "A dashboard for Octoprint"; + description = "Dashboard for Octoprint"; homepage = "https://github.com/StefanCohen/OctoPrint-Dashboard"; license = licenses.agpl3Plus; maintainers = with maintainers; [ j0hax ]; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 5de5c157d3709..2d28d8138c289 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; - description = "A framework for controlling entertainment lighting equipment"; + description = "Framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; maintainers = with maintainers; [ ]; license = with licenses; [ lgpl21 gpl2Plus ]; diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 5349add035ae6..48756794b94f8 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "The free computer aided translation (CAT) tool for professionals"; + description = "Free computer aided translation (CAT) tool for professionals"; mainProgram = "omegat"; longDescription = '' OmegaT is a free and open source multiplatform Computer Assisted Translation diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index 108bb1aeff0dc..da1f2dc629d2c 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = { isIbusEngine = withIbusSupport; - description = "An OpenSource, Unicode compliant Bengali Input Method"; + description = "OpenSource, Unicode compliant Bengali Input Method"; mainProgram = "openbangla-gui"; homepage = "https://openbangla.github.io/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 03b3cde0c835f..d2419ae25b9ec 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -49,7 +49,7 @@ mkDerivation { dontPatchELF = true; meta = with lib; { - description = "A tool to edit resource files (BRF)"; + description = "Tool to edit resource files (BRF)"; mainProgram = "openBrf"; homepage = "https://github.com/cfcohen/openbrf"; maintainers = with lib.maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 52cf30b1ffba2..84aff125aac2b 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; meta = with lib; { - description = "A concise ChartPlotter/Navigator"; + description = "Concise ChartPlotter/Navigator"; maintainers = with maintainers; [ kragniz lovesegfault ]; platforms = platforms.unix; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/applications/misc/openrgb-plugins/effects/default.nix index f84aa13b72199..9cdda76f8a138 100644 --- a/pkgs/applications/misc/openrgb-plugins/effects/default.nix +++ b/pkgs/applications/misc/openrgb-plugins/effects/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"; - description = "An effects plugin for OpenRGB"; + description = "Effects plugin for OpenRGB"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/openring/default.nix b/pkgs/applications/misc/openring/default.nix index 2f72b8b41cc01..0c1424e5ac479 100644 --- a/pkgs/applications/misc/openring/default.nix +++ b/pkgs/applications/misc/openring/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "A webring for static site generators"; + description = "Webring for static site generators"; homepage = "https://sr.ht/~sircmpwn/openring"; license = licenses.gpl3Only; maintainers = with maintainers; [ sumnerevans ]; diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index f369508edd7ef..5388b7b7485eb 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -29,13 +29,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2024.03.31-8"; + version = "2024.06.19-3"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-U8tKrL5tnhT/RMvxROk8Q4lO22ylqiMM1QonZ1Rn+CY="; + hash = "sha256-LB3yLBoO6nXRvfuWWB2JofeAgQQFtEgqNo2QFQ3k/vc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index fc33b9e1cbd91..b817c253830b6 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec { meta = { inherit (src.meta) homepage; - description = "A Curses-based RPN calculator"; + description = "Curses-based RPN calculator"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ obadz ]; }; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 9e7c983d48018..bfa2278e8b866 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.6.3"; + version = "0.6.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-L03r4PHCu+jsUC5vVSG77SR2ak/AsuVAhTd7P1WibAk="; + sha256 = "sha256-dBehxqr/UCXIQDMrGFN6ID+v0NYi50JTHuML3su2O0A="; }; - cargoHash = "sha256-5UxbZZdVioy1OZCbE6qESGKVnVT6TS4VHzsKlQ8XP2c="; + cargoHash = "sha256-wI7yqRvaszBP4OtlWbWIZ9RLf5y7dx2KufYLaK+PWps="; meta = with lib; { - description = "A simple tui to view & control docker containers"; + description = "Simple tui to view & control docker containers"; homepage = "https://github.com/mrjackwills/oxker"; changelog = "https://github.com/mrjackwills/oxker/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index d1ae9f68270ec..aa0fb08984edc 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -8,6 +8,7 @@ , gzip , nodejs , rustc +, stdenv , wasm-bindgen-cli , wasm-pack }: @@ -96,7 +97,6 @@ rustPlatform.buildRustPackage rec { echo entering pagefind_web... ( cd pagefind_web - export RUSTFLAGS="-C linker=lld" bash ./local_build.sh ) @@ -121,6 +121,9 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ pbsds ]; platforms = platforms.unix; + # See comment about wasm32-unknown-unknown in rustc.nix. + broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || + !stdenv.hostPlatform.gcc.thumb or true; mainProgram = "pagefind"; }; } diff --git a/pkgs/applications/misc/passky-desktop/default.nix b/pkgs/applications/misc/passky-desktop/default.nix index 26f5debecacdf..b668ba94bfafc 100644 --- a/pkgs/applications/misc/passky-desktop/default.nix +++ b/pkgs/applications/misc/passky-desktop/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A simple, modern, lightweight, open source and secure password manager"; + description = "Simple, modern, lightweight, open source and secure password manager"; homepage = "https://passky.org"; downloadPage = "https://github.com/Rabbit-Company/Passky-Desktop/releases"; changelog = "https://github.com/Rabbit-Company/Passky-Desktop/releases/tag/v${version}"; diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index ba59bc5db42cb..69e6a53758a4f 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { - description = "A command-line tool to generate, analyze, convert and manipulate colors"; + description = "Command-line tool to generate, analyze, convert and manipulate colors"; homepage = "https://github.com/sharkdp/pastel"; changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix index 344540e848635..b5f48c51de803 100644 --- a/pkgs/applications/misc/pattypan/default.nix +++ b/pkgs/applications/misc/pattypan/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "An uploader for Wikimedia Commons"; + description = "Uploader for Wikimedia Commons"; homepage = "https://commons.wikimedia.org/wiki/Commons:Pattypan"; license = licenses.mit; mainProgram = "pattypan"; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index bfb240e2b9d21..6159bfc7c810f 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication { meta = with lib; { homepage = "https://github.com/linuxerwang/pdf-quench"; - description = "A visual tool for cropping pdf files"; + description = "Visual tool for cropping pdf files"; mainProgram = "pdf-quench"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 5b77a264ed2bf..2b6e7a0ed88cb 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional stdenv.isDarwin (lib.cmakeBool "MOVIES" false); meta = with lib; { - description = "A presenter console with multi-monitor support for PDF files"; + description = "Presenter console with multi-monitor support for PDF files"; mainProgram = "pdfpc"; homepage = "https://pdfpc.github.io/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/pdfslicer/default.nix b/pkgs/applications/misc/pdfslicer/default.nix index d856dfaca8cb3..9d91a89df147e 100644 --- a/pkgs/applications/misc/pdfslicer/default.nix +++ b/pkgs/applications/misc/pdfslicer/default.nix @@ -45,8 +45,12 @@ stdenv.mkDerivation rec { qpdf ]; + CXXFLAGS = + # Pending upstream compatibility with GCC 13 + lib.optional (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "13") "-Wno-changes-meaning"; + meta = with lib; { - description = "A simple application to extract, merge, rotate and reorder pages of PDF documents"; + description = "Simple application to extract, merge, rotate and reorder pages of PDF documents"; homepage = "https://junrrein.github.io/pdfslicer/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix index e7d0611230395..1fc5ffaf2e669 100644 --- a/pkgs/applications/misc/pdfstudio/common.nix +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -70,7 +70,7 @@ let in # Package with cups in FHS sandbox, because JAVA bin expects "/usr/bin/lpr" for printing. buildFHSEnv { - name = pname; + inherit pname version; targetPkgs = pkgs: [ cups thisPackage @@ -88,7 +88,7 @@ buildFHSEnv { meta = with lib; { inherit broken; homepage = "https://www.qoppa.com/${pname}/"; - description = "An easy to use, full-featured PDF editing software"; + description = "Easy to use, full-featured PDF editing software"; longDescription = longDescription; sourceProvenance = with sourceTypes; [ binaryBytecode diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 21874519a7c7b..d326169e560dd 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -75,6 +75,9 @@ in url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg="; }; + extraBuildInputs = [ + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 + ]; jdk = jdk17; }; }.${pname} diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix index 866d6660910f6..57f1a17685d8f 100644 --- a/pkgs/applications/misc/peaclock/default.nix +++ b/pkgs/applications/misc/peaclock/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpthreadstubs icu ]; meta = with lib; { - description = "A clock, timer, and stopwatch for the terminal"; + description = "Clock, timer, and stopwatch for the terminal"; homepage = "https://octobanana.com/software/peaclock"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index 1a11a793f5638..55b5dd3d37108 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ebzzry/pell"; - description = "A simple host availability monitor"; + description = "Simple host availability monitor"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 11bee79962e39..d77b99b6c6553 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -52,7 +52,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; + description = "Way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = "https://perkeep.org"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index e3860ee625840..0c435dc04fa41 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { passthru.tests.sign-in = nixosTests.pgmanage; meta = with lib; { - description = "A fast replacement for PGAdmin"; + description = "Fast replacement for PGAdmin"; longDescription = '' At the heart of pgManage is a modern, fast, event-based C-binary, built in the style of NGINX and Node.js. This heart makes pgManage as fast as any diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 9293a732323ce..c3b5491387cd4 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = stdenv.isDarwin; meta = with lib; { - description = "A database modeling tool for PostgreSQL"; + description = "Database modeling tool for PostgreSQL"; homepage = "https://pgmodeler.io/"; license = licenses.gpl3; maintainers = [ maintainers.esclear ]; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 534556e231dec..9d76649687570 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -13,6 +13,7 @@ , gnome-desktop , glib , gtk3 +, json-glib , wayland , libdrm , libxkbcommon @@ -51,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop # For keybindings settings schemas gnome.mutter + json-glib wayland finalAttrs.wlroots xorg.xcbutilwm @@ -85,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "phoc"; homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ masipcat tomfitzhenry zhaofengli ]; + maintainers = with maintainers; [ masipcat zhaofengli ]; platforms = platforms.linux; }; }) diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 92d892fc9c974..5ec9e939ce556 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A viewer for info files"; + description = "Viewer for info files"; homepage = "https://github.com/baszoetekouw/pinfo"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix index f447ffcaeef6b..f7aeb09b1f9be 100644 --- a/pkgs/applications/misc/pipr/default.nix +++ b/pkgs/applications/misc/pipr/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A commandline-tool to interactively write shell pipelines"; + description = "Commandline-tool to interactively write shell pipelines"; mainProgram = "pipr"; homepage = "https://github.com/ElKowar/pipr"; license = licenses.mit; diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index e8bc572e284f2..124b43f1bfae5 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)"; + description = "Fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)"; homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix index f2af3f6e43ab3..ecdece47c0b2e 100644 --- a/pkgs/applications/misc/plasma-theme-switcher/default.nix +++ b/pkgs/applications/misc/plasma-theme-switcher/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/maldoinc/plasma-theme-switcher/"; - description = "A KDE Plasma theme switcher"; + description = "KDE Plasma theme switcher"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ kevink ]; mainProgram = "plasma-theme"; diff --git a/pkgs/applications/misc/please-cli/default.nix b/pkgs/applications/misc/please-cli/default.nix index f21ef4203831d..35d877d6eebe6 100644 --- a/pkgs/applications/misc/please-cli/default.nix +++ b/pkgs/applications/misc/please-cli/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "An AI helper script to create CLI commands based on GPT prompts"; + description = "AI helper script to create CLI commands based on GPT prompts"; homepage = "https://github.com/TNG/please-cli"; license = licenses.asl20; maintainers = with maintainers; [ _8-bit-fox ]; diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 9ed291c79c7eb..24ff669e4f22a 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -1,73 +1,77 @@ -{ lib -, fetchFromGitHub -, bash -, glib -, gdk-pixbuf -, gettext -, imagemagick -, ninja -, meson -, sassc -, python3Packages -, gobject-introspection -, wrapGAppsHook3 -, libappindicator-gtk3 -, libxcb -, qt5 -, ibus -, usbutils +{ + lib, + fetchFromGitHub, + gettext, + ninja, + meson, + sassc, + python3Packages, + gobject-introspection, + wrapGAppsHook3, + libayatana-appindicator, + libxcb, + qt6, + ibus, + usbutils, + psmisc, }: python3Packages.buildPythonApplication rec { - name = "polychromatic"; - version = "0.8.0"; + pname = "polychromatic"; + version = "0.9.1"; format = "other"; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; rev = "v${version}"; - sha256 = "sha256-ym2pcGUWM5zCUx/lYs+WECj+wbyBtWnx04W/NRXNKlw="; + hash = "sha256-3Pt1Z8G0xDWlFD7LxJILPUifMBTN4OvPNHZv80umO1s="; }; postPatch = '' patchShebangs scripts substituteInPlace scripts/build-styles.sh \ - --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ - --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' + --replace-fail '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ + --replace-fail '$(which sass 2>/dev/null)' '${sassc}/bin/sass' substituteInPlace polychromatic/paths.py \ - --replace "/usr/share/polychromatic" "$out/share/polychromatic" + --replace-fail "/usr/share/polychromatic" "$out/share/polychromatic" ''; preConfigure = '' scripts/build-styles.sh ''; - nativeBuildInputs = with python3Packages; [ + + nativeBuildInputs = [ gettext gobject-introspection meson ninja sassc wrapGAppsHook3 - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook + qt6.qtbase ]; + buildInputs = [ qt6.qtwayland ]; + propagatedBuildInputs = with python3Packages; [ colorama colour openrazer - pyqt5 - pyqtwebengine + pyqt6 + pyqt6-webengine requests setproctitle libxcb openrazer-daemon - libappindicator-gtk3 ibus usbutils + ] ++ [ + libayatana-appindicator + psmisc ]; - dontWrapGapps = true; + dontWrapGApps = true; dontWrapQtApps = true; makeWrapperArgs = [ @@ -77,7 +81,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://polychromatic.app/"; - description = "Graphical front-end and tray applet for configuring Razer peripherals on GNU/Linux."; + description = "Graphical front-end and tray applet for configuring Razer peripherals on GNU/Linux"; longDescription = '' Polychromatic is a frontend for OpenRazer that enables Razer devices to control lighting effects and more on GNU/Linux. @@ -85,5 +89,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ evanjs ]; + mainProgram = "polychromatic-controller"; }; } diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index fe09f5328ee81..35244bf041a77 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; meta = with lib; { - description = "A simple CLI pomodoro timer using desktop notifications written in Rust"; + description = "Simple CLI pomodoro timer using desktop notifications written in Rust"; homepage = "https://github.com/SanderJSA/Pomodoro"; license = licenses.mit; maintainers = with maintainers; [ annaaurora ]; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 884ce49dd8347..c4c5355823ace 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "printrun"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "kliment"; repo = "Printrun"; rev = "refs/tags/printrun-${version}"; - hash = "sha256-GmTA/C45MuptN/Y0KjpFjaLV3sWoM4rHz8AMfV9sf4U="; + hash = "sha256-MANgxE3z8xq8ScxdxhwfEVsLMF9lgcdSjJZ0qu5p3ps="; }; postPatch = '' diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 9cda45b04c320..dad288ef47595 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -57,7 +57,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A simple and flexible scheduler and orchestrator to manage non-containerized applications"; + description = "Simple and flexible scheduler and orchestrator to manage non-containerized applications"; homepage = "https://github.com/F1bonacc1/process-compose"; changelog = "https://github.com/F1bonacc1/process-compose/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index f453009e0c811..94327ef3e4db9 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A process viewer GUI in rust"; + description = "Process viewer GUI in rust"; homepage = "https://github.com/guillaumegomez/process-viewer"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index 8823744bf3a1f..c6c2df56f2283 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -24,7 +24,7 @@ appimageTools.wrapType2 { meta = with lib; { homepage = "https://davidotek.github.io/protonup-qt/"; - description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface."; + description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface"; license = licenses.gpl3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "protonup-qt"; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 6a9c6e0e5febe..173323f589751 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-kKu/+F+zK0UyRHGkrZdD8alvsQTZFHhTqYK2phxo/ZA="; + hash = "sha256-b4kZ//+rO70uZh1fvI4A2dbCZ7ymci9g/u5keMBWYf8="; }; - cargoHash = "sha256-KwIGJiCGcFEKuloVtJr0GQxoFQVt/OHyJ/YCp4bCSGc="; + cargoHash = "sha256-sTpxcJs5I7LzVw56ka5PlFixJSiJeCae9serS0FhmuA="; nativeBuildInputs = [ installShellFiles @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/Nukesor/pueue"; - description = "A daemon for managing long running shell commands"; + description = "Daemon for managing long running shell commands"; longDescription = '' Pueue is a command-line task management tool for sequential and parallel execution of long-running tasks. diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix index c4afc80830dba..0242164be79c1 100644 --- a/pkgs/applications/misc/pw-viz/default.nix +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; meta = with lib; { - description = "A simple and elegant pipewire graph editor "; + description = "Simple and elegant pipewire graph editor "; homepage = "https://github.com/ax9d/pw-viz"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index d9ae209dda21f..4dd5a5e2d280b 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A password database utility"; + description = "Password database utility"; longDescription = '' Password Safe is a password database utility. Like many other such products, commercial and otherwise, it stores your diff --git a/pkgs/applications/misc/pysentation/default.nix b/pkgs/applications/misc/pysentation/default.nix index 1a84c06c94ff4..ad2d9c02e683a 100644 --- a/pkgs/applications/misc/pysentation/default.nix +++ b/pkgs/applications/misc/pysentation/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "pysentation" ]; meta = with lib; { - description = "A CLI for displaying Python presentations"; + description = "CLI for displaying Python presentations"; homepage = "https://github.com/mimseyedi/pysentation"; changelog = "https://github.com/mimseyedi/pysentation/releases/tag/${src.rev}"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 49be94cc2baba..57d5ae394381f 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,6 +1,5 @@ { lib , python310 -, fetchPypi , fetchFromGitHub , gdk-pixbuf , gnome diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix index cb4014684fd2a..f56e4455becda 100644 --- a/pkgs/applications/misc/q4wine/default.nix +++ b/pkgs/applications/misc/q4wine/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://q4wine.brezblock.org.ua/"; - description = "A Qt GUI for Wine to manage prefixes and applications"; + description = "Qt GUI for Wine to manage prefixes and applications"; license = licenses.gpl3; maintainers = with maintainers; [ rkitover ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 5882057988a4e..14b2f19ccd4bb 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.6.5"; + version = "3.30.0.0"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-2x3np1cmjJ/IN/vSqKX6mTQbtFROxPzhXPjeJ6mxe9k="; + hash = "sha256-KpY/GjagRx0XkH18dDJcf6JfkT/0V8ZHJ5DHtAEUaF4="; }; patches = [ diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 806ed8380f51c..806a2fed8943a 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qlcplus"; - version = "4.13.0"; + version = "4.13.1"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "11av9hg6l0pb1lmlw35v1v2q9mmqz65yfaq01454y5qlmsbxpgkp"; + sha256 = "sha256-AKmPxHOlMtea3q0NDULp3XfJ0JnYeF/iFUJw0dDOiio="; }; nativeBuildInputs = [ qmake pkg-config ]; @@ -40,7 +40,7 @@ mkDerivation rec { ''; meta = with lib; { - description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc"; + description = "Free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc"; maintainers = [ ]; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index bfe1d61818f5c..2fa22cf732211 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -55,7 +55,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/sieren/QSyncthingTray/"; - description = "A Traybar Application for Syncthing written in C++"; + description = "Traybar Application for Syncthing written in C++"; longDescription = '' A cross-platform status bar for Syncthing. Currently supports macOS, Windows and Linux. diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index d401a57dda78a..e37056e86a56a 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A multi-platform GUI for pass, the standard unix password manager"; + description = "Multi-platform GUI for pass, the standard unix password manager"; mainProgram = "qtpass"; homepage = "https://qtpass.org"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 455b6df4d0546..925bc9bdcb3f7 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { maintainers = with maintainers; [ winpat ]; - description = "A run-or-raise-application-launcher for i3 window manager"; + description = "Run-or-raise-application-launcher for i3 window manager"; mainProgram = "raiseorlaunch"; homepage = "https://github.com/open-dynaMIX/raiseorlaunch"; license = licenses.mit; diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/applications/misc/ratt/default.nix index fd882b3b572c6..788dde7c5c9ca 100644 --- a/pkgs/applications/misc/ratt/default.nix +++ b/pkgs/applications/misc/ratt/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "A tool for converting websites to rss/atom feeds"; + description = "Tool for converting websites to rss/atom feeds"; homepage = "https://git.sr.ht/~ghost08/ratt"; license = licenses.mit; maintainers = with maintainers; [ kmein ]; diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 902ae57492011..8508f65727e05 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A desktop application to test regular expressions interactively"; + description = "Desktop application to test regular expressions interactively"; mainProgram = "com.github.artemanufrij.regextester"; homepage = "https://github.com/artemanufrij/regextester"; maintainers = with maintainers; [ samdroid-apps ]; diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 64baaf5d1b088..c953d5e6299a1 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "remarkable_mouse" ]; meta = with lib; { - description = "A program to use a reMarkable as a graphics tablet"; + description = "Program to use a reMarkable as a graphics tablet"; homepage = "https://github.com/evidlo/remarkable_mouse"; license = licenses.gpl3; maintainers = [ maintainers.nickhu ]; diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 585a18bb34329..c995fdcad389d 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "A Go app that allows access to the ReMarkable Cloud API programmatically"; + description = "Go app that allows access to the ReMarkable Cloud API programmatically"; homepage = "https://github.com/juruen/rmapi"; changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Only; diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 198922f1876c8..0f6be51187fa1 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -1,58 +1,33 @@ -{ lib, stdenv, fetchurl, appimageTools, makeDesktopItem }: - -stdenv.mkDerivation (finalAttrs: let - inherit (finalAttrs) pname version src appexec icon desktopItem; - -in { + lib, + fetchurl, + appimageTools, +}: +let pname = "remnote"; - version = "1.16.4"; - + version = "1.16.18"; src = fetchurl { - url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-dgbQ0cbPq7BSQ9VwwH6+GoAxb85HDxRixfjeDJBtOrg="; - }; - - appexec = appimageTools.wrapType2 { - inherit pname version src; - }; - - icon = fetchurl { - url = "https://www.remnote.io/icon.png"; - hash = "sha256-r5D7fNefKPdjtmV7f/88Gn3tqeEG8LGuD4nHI/sCk94="; + url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; + hash = "sha256-ps7Rl1oA2QOPvO2XeCY8DrWtCV9WPlX9jbhypz2ZARA="; }; - - desktopItem = makeDesktopItem { - type = "Application"; - name = "remnote"; - desktopName = "RemNote"; - comment = "Spaced Repetition"; - icon = "remnote"; - exec = "remnote %u"; - categories = [ "Office" ]; - mimeTypes = [ "x-scheme-handler/remnote" "x-scheme-handler/rn" ]; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - install -Dm755 ${appexec}/bin/remnote $out/bin/remnote - install -Dm444 "${desktopItem}/share/applications/"* -t $out/share/applications/ - install -Dm444 ${icon} $out/share/pixmaps/remnote.png - - runHook postInstall + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + install -Dm444 ${appimageContents}/remnote.desktop -t $out/share/applications + substituteInPlace $out/share/applications/remnote.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=remnote %u' + install -Dm444 ${appimageContents}/remnote.png -t $out/share/pixmaps ''; meta = with lib; { - description = "A note-taking application focused on learning and productivity"; + description = "Note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; - maintainers = with maintainers; [ max-niederman chewblacka ]; + maintainers = with maintainers; [ chewblacka ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; mainProgram = "remnote"; }; -}) +} diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/applications/misc/remontoire/default.nix index 754d32617e789..05eb16abaf21b 100644 --- a/pkgs/applications/misc/remontoire/default.nix +++ b/pkgs/applications/misc/remontoire/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A small GTK app for presenting keybinding hints"; + description = "Small GTK app for presenting keybinding hints"; mainProgram = "remontoire"; homepage = "https://github.com/regolith-linux/remontoire"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 22a1964e466df..615fa2c10faeb 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -42,10 +42,7 @@ in mkDerivation rec { latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')" for platform in ${lib.concatStringsSep " " meta.platforms}; do - # The script will not perform an update when the version attribute is up to date from previous platform run - # We need to clear it before each run - update-source-version ${pname} 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform - update-source-version ${pname} "$latestVersion" --system=$platform + update-source-version ${pname} "$latestVersion" --system=$platform --ignore-same-version done ''; diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/applications/misc/river-tag-overlay/default.nix index e1652cf70da71..63092e3586f90 100644 --- a/pkgs/applications/misc/river-tag-overlay/default.nix +++ b/pkgs/applications/misc/river-tag-overlay/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A pop-up showing tag status"; + description = "Pop-up showing tag status"; homepage = "https://sr.ht/~leon_plickat/river-tag-overlay"; license = licenses.gpl3Only; maintainers = with maintainers; [ edrex ]; diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index 93b476973f55f..fa99e88f87a67 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://git.sr.ht/~novakane/rivercarro"; - description = "A layout generator for river Wayland compositor, fork of rivertile"; + description = "Layout generator for river Wayland compositor, fork of rivertile"; longDescription = '' A slightly modified version of rivertile layout generator for river. diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/applications/misc/rlaunch/default.nix index fe8d499d00a80..52499df258e06 100644 --- a/pkgs/applications/misc/rlaunch/default.nix +++ b/pkgs/applications/misc/rlaunch/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A lightweight application launcher for X11"; + description = "Lightweight application launcher for X11"; homepage = "https://github.com/PonasKovas/rlaunch"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index ac8518e6a2d4f..3b0aaefc83c28 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An emoji selector plugin for Rofi"; + description = "Emoji selector plugin for Rofi"; homepage = "https://github.com/Mange/rofi-emoji"; license = licenses.mit; maintainers = with maintainers; [ cole-h ]; diff --git a/pkgs/applications/misc/rofi-top/default.nix b/pkgs/applications/misc/rofi-top/default.nix index 877cbd6a284ef..e7ca95c81e393 100644 --- a/pkgs/applications/misc/rofi-top/default.nix +++ b/pkgs/applications/misc/rofi-top/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A plugin for rofi that emulates top behaviour"; + description = "Plugin for rofi that emulates top behaviour"; homepage = "https://github.com/davatorium/rofi-top"; license = licenses.mit; maintainers = with maintainers; [ aacebedo ]; diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/applications/misc/rootbar/default.nix index 2ef92f1c9aa21..a528cd4a94ade 100644 --- a/pkgs/applications/misc/rootbar/default.nix +++ b/pkgs/applications/misc/rootbar/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://hg.sr.ht/~scoopta/rootbar"; - description = "A bar for Wayland WMs"; + description = "Bar for Wayland WMs"; mainProgram = "rootbar"; longDescription = '' Root Bar is a bar for wlroots based wayland compositors such as sway and diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index 1830a60087269..a8d0a89d4800f 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-/uAxIV7eroJNGsLl4T/6RskoTIWKu5Cgmv48eMkDZQw="; meta = with lib; { - description = "A simple terminal clock written in Rust"; + description = "Simple terminal clock written in Rust"; homepage = "https://github.com/valebes/rsClock"; license = licenses.mit; maintainers = with maintainers; [valebes]; diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix index c9968f7257f80..058e4a9c028a9 100644 --- a/pkgs/applications/misc/rusty-psn/default.nix +++ b/pkgs/applications/misc/rusty-psn/default.nix @@ -18,16 +18,21 @@ rustPlatform.buildRustPackage rec { pname = "rusty-psn"; - version = "0.3.0"; + version = "0.3.7"; src = fetchFromGitHub { owner = "RainbowCookie32"; repo = "rusty-psn"; rev = "v${version}"; - sha256 = "sha256-BsbuEsW6cQbWg8BLtEBnjoCfcUCy1xWz9u0wBa8BKtA="; + sha256 = "sha256-EGj9VVY+Zbmth7H1oTgq38KNLT/aWoTPn8k4sVkScgg="; }; - cargoSha256 = "sha256-TD5du7I6Hw1PC8s9NI19jYCXlaZMnsdVj/a0q+M8Raw="; + cargoPatches = [ ./fix-cargo-lock.patch ]; + + cargoSha256 = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU="; + + # Tests require network access + doCheck = false; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/rusty-psn/fix-cargo-lock.patch b/pkgs/applications/misc/rusty-psn/fix-cargo-lock.patch new file mode 100644 index 0000000000000..8e9275366cede --- /dev/null +++ b/pkgs/applications/misc/rusty-psn/fix-cargo-lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 3b63c3d..38a0fc0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3141,7 +3141,7 @@ dependencies = [ + + [[package]] + name = "rusty-psn" +-version = "0.3.3" ++version = "0.3.7" + dependencies = [ + "bytesize", + "clap", diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 87925d732e89a..19ba418521766 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -18,11 +18,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.6"; + version = "2.1.9"; src = fetchPypi { inherit pname version; - hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM="; + hash = "sha256-Z1c1DVwCwPiOPvCYNsoXJBMfVzIQA+/6wStV8BShahc="; }; postPatch = '' diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 506ff5f10c8af..2ec7f35a219b4 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { changelog = "https://github.com/andmarti1424/sc-im/blob/${src.rev}/CHANGES"; homepage = "https://github.com/andmarti1424/sc-im"; - description = "An ncurses spreadsheet program for terminal"; + description = "Ncurses spreadsheet program for terminal"; license = licenses.bsdOriginal; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index da3dda9fc8d71..c10d5085dfc85 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.basic = nixosTests.seatd; meta = { - description = "A minimal seat management daemon, and a universal seat management library"; + description = "Minimal seat management daemon, and a universal seat management library"; changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${finalAttrs.version}"; homepage = "https://sr.ht/~kennylevinsen/seatd/"; license = lib.licenses.mit; diff --git a/pkgs/applications/misc/selectdefaultapplication/default.nix b/pkgs/applications/misc/selectdefaultapplication/default.nix index 700ac3e75884e..cfc142cb96e8d 100644 --- a/pkgs/applications/misc/selectdefaultapplication/default.nix +++ b/pkgs/applications/misc/selectdefaultapplication/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A very simple application that lets you define default applications on Linux in a sane way"; + description = "Very simple application that lets you define default applications on Linux in a sane way"; mainProgram = "selectdefaultapplication"; homepage = "https://github.com/sandsmark/selectdefaultapplication"; maintainers = with maintainers; [ nsnelson ]; diff --git a/pkgs/applications/misc/semver/default.nix b/pkgs/applications/misc/semver/default.nix index 53e06a4c406ec..750d86eea1139 100644 --- a/pkgs/applications/misc/semver/default.nix +++ b/pkgs/applications/misc/semver/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/catouc/semver-go"; - description = "A small CLI to fish out the current or next semver version from a git repository"; + description = "Small CLI to fish out the current or next semver version from a git repository"; maintainers = with maintainers; [ catouc ]; license = licenses.mit; mainProgram = "semver"; diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index dc681b7385dc6..9f11cfa53bb20 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A simple plaintext presentation tool"; + description = "Simple plaintext presentation tool"; mainProgram = "sent"; homepage = "https://tools.suckless.org/sent/"; license = licenses.isc; diff --git a/pkgs/applications/misc/sfwbar/default.nix b/pkgs/applications/misc/sfwbar/default.nix deleted file mode 100644 index 9f467fdf6a2d3..0000000000000 --- a/pkgs/applications/misc/sfwbar/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gtk3 -, meson -, ninja -, json_c -, pkg-config -, gtk-layer-shell -, libpulseaudio -, libmpdclient -, libxkbcommon -, alsa-lib -, makeWrapper -, -}: -stdenv.mkDerivation rec { - pname = "sfwbar"; - version = "1.0_beta13"; - - src = fetchFromGitHub { - owner = "LBCrion"; - repo = pname; - rev = "v${version}"; - hash = "sha256-7oiuTEqdXDReKdakJX6+HRaSi1XovM+MkHFkaFZtq64="; - }; - - buildInputs = [ - gtk3 - json_c - gtk-layer-shell - libpulseaudio - libmpdclient - libxkbcommon - alsa-lib - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - makeWrapper - ]; - - postFixup = '' - wrapProgram $out/bin/sfwbar \ - --suffix XDG_DATA_DIRS : $out/share - ''; - - meta = with lib; { - homepage = "https://github.com/LBCrion/sfwbar"; - description = "A flexible taskbar application for wayland compositors, designed with a stacking layout in mind"; - mainProgram = "sfwbar"; - platforms = platforms.linux; - maintainers = with maintainers; [ NotAShelf ]; - license = licenses.gpl3Only; - }; -} diff --git a/pkgs/applications/misc/shavee/default.nix b/pkgs/applications/misc/shavee/default.nix index 7854cfbd17f4d..1e4dadcf786b3 100644 --- a/pkgs/applications/misc/shavee/default.nix +++ b/pkgs/applications/misc/shavee/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/ashuio/shavee"; - description = "A program to automatically decrypt and mount ZFS datasets using Yubikey HMAC as 2FA or any File on USB/SFTP/HTTPS"; + description = "Program to automatically decrypt and mount ZFS datasets using Yubikey HMAC as 2FA or any File on USB/SFTP/HTTPS"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jasonodoom ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index c472fdb65ec97..c90a7116b6df2 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -99,7 +99,7 @@ inherit pname version; meta = with lib; { - description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; + description = "Open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; homepage = "https://github.com/SideQuestVR/SideQuest"; downloadPage = "https://github.com/SideQuestVR/SideQuest/releases"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 3cdec7ec291f7..ab853d4dc1f4d 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://sioyek.info/"; - description = "A PDF viewer designed for research papers and technical books"; + description = "PDF viewer designed for research papers and technical books"; mainProgram = "sioyek"; changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index b344a0e0639e2..6ea198adc0332 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { - description = "A personal multi-machine syncable key value store"; + description = "Personal multi-machine syncable key value store"; homepage = "https://github.com/charmbracelet/skate"; changelog = "https://github.com/charmbracelet/skate/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/pkgs/applications/misc/slippy/default.nix b/pkgs/applications/misc/slippy/default.nix index 40de95838ad5b..cf5cd1ff0b3db 100644 --- a/pkgs/applications/misc/slippy/default.nix +++ b/pkgs/applications/misc/slippy/default.nix @@ -53,11 +53,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "Markdown slideshows in Rust"; homepage = "https://github.com/axodotdev/slippy"; diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix index b1e92cb9a39ce..f71a0d61c2a56 100644 --- a/pkgs/applications/misc/slweb/default.nix +++ b/pkgs/applications/misc/slweb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A static website generator which aims at being simplistic"; + description = "Static website generator which aims at being simplistic"; homepage = "https://strahinja.srht.site/slweb/"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index c4af36299895a..677f33d267b74 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "snowsql"; - version = "1.2.26"; + version = "1.3.0"; src = fetchurl { url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${lib.versions.majorMinor version}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm"; - sha256 = "sha256-V0TZebmhc463DczQuTDy0nZQX+io61z/m32/n/EKFJY="; + sha256 = "sha256-KKCCj+pIwWhuzOuxljQ8Y11mAwD/GONspbXuPAMBdhE="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/applications/misc/spacenav-cube-example/default.nix index 66c16e458b8f6..c34828627b4e3 100644 --- a/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://spacenav.sourceforge.net/"; - description = "An example application to test the spacenavd driver"; + description = "Example application to test the spacenavd driver"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ sohalt ]; diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/applications/misc/speedread/default.nix index 234e6b136feb2..e62edf48cbadc 100644 --- a/pkgs/applications/misc/speedread/default.nix +++ b/pkgs/applications/misc/speedread/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A simple terminal-based open source Spritz-alike"; + description = "Simple terminal-based open source Spritz-alike"; longDescription = '' Speedread is a command line filter that shows input text as a per-word rapid serial visual presentation aligned on optimal diff --git a/pkgs/applications/misc/spotify-tray/default.nix b/pkgs/applications/misc/spotify-tray/default.nix index 372e468487fd6..107424e4e836d 100644 --- a/pkgs/applications/misc/spotify-tray/default.nix +++ b/pkgs/applications/misc/spotify-tray/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/tsmetana/spotify-tray"; - description = "Adds a tray icon to the Spotify Linux client application."; + description = "Adds a tray icon to the Spotify Linux client application"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ Enzime ]; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 423944cafb1fa..5d9cf35957829 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -15,17 +15,16 @@ stdenv.mkDerivation rec { pname = "sticky"; - version = "1.19"; + version = "1.21"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-nvnft62vZ9ivijYnQGULW7ff2aAVJiIx9xq09My2NxE="; + hash = "sha256-EH5EyvI3iAZr+aSV3DKM9RLkPmUcwKKXlOXSU0ECsPI="; }; postPatch = '' - sed -i -e "s|/usr/bin|$out/bin|" data/org.x.sticky.service sed -i -e "s|/usr/lib|$out/lib|" usr/bin/sticky sed -i -e "s|/usr/share|$out/share|" usr/lib/sticky/*.py ''; @@ -51,20 +50,11 @@ stdenv.mkDerivation rec { xapp ]; - postInstall = '' - # https://github.com/linuxmint/sticky/pull/118 - cp -r ../etc $out - cp -r ../usr/* $out - - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - dontWrapGApps = true; preFixup = '' buildPythonPath "$out $pythonPath" - chmod +x $out/bin/sticky wrapProgram $out/bin/sticky \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ ''${gappsWrapperArgs[@]} @@ -77,7 +67,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A sticky notes app for the linux desktop"; + description = "Sticky notes app for the linux desktop"; mainProgram = "sticky"; homepage = "https://github.com/linuxmint/sticky"; license = licenses.gpl2Only; diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix deleted file mode 100644 index f8ecf3694e511..0000000000000 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, python3Packages -, fetchFromGitHub -, copyDesktopItems -, writeText -, makeDesktopItem -, wrapGAppsHook3 -, xvfb-run -, qt6 -}: - -python3Packages.buildPythonApplication rec { - pname = "streamdeck-ui"; - version = "3.1.0"; - - src = fetchFromGitHub { - repo = "streamdeck-linux-gui"; - owner = "streamdeck-linux-gui"; - rev = "v${version}"; - sha256 = "sha256-AIE9j022L4WSlHBAu3TT5uE4Ilgk/jYSmU03K8Hs8xY="; - }; - - patches = [ - # nixpkgs has a newer pillow version - ./update-pillow.patch - ]; - - desktopItems = let - common = { - name = "streamdeck-ui"; - desktopName = "Stream Deck UI"; - icon = "streamdeck-ui"; - exec = "streamdeck"; - comment = "UI for the Elgato Stream Deck"; - categories = [ "Utility" ]; - }; - in builtins.map makeDesktopItem [ - common - (common // { - name = "${common.name}-noui"; - exec = "${common.exec} --no-ui"; - noDisplay = true; - }) - ]; - - postInstall = - let - udevRules = '' - SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", TAG+="uaccess" - ''; - in - '' - mkdir -p $out/lib/systemd/user - substitute scripts/streamdeck.service $out/lib/systemd/user/streamdeck.service \ - --replace '<path to streamdeck>' $out/bin/streamdeck - - mkdir -p "$out/etc/udev/rules.d" - cp ${writeText "70-streamdeck.rules" udevRules} $out/etc/udev/rules.d/70-streamdeck.rules - - mkdir -p "$out/share/pixmaps" - cp streamdeck_ui/logo.png $out/share/pixmaps/streamdeck-ui.png - ''; - - dontWrapQtApps = true; - dontWrapGApps = true; - makeWrapperArgs = [ "\${qtWrapperArgs[@]}" "\${gappsWrapperArgs[@]}"]; - - format = "pyproject"; - - nativeBuildInputs = [ - python3Packages.poetry-core - copyDesktopItems - qt6.wrapQtAppsHook - wrapGAppsHook3 - ]; - - propagatedBuildInputs = with python3Packages; [ - setuptools - filetype - cairosvg - pillow - pynput - pyside6 - streamdeck - xlib - ] ++ lib.optionals stdenv.isLinux [ - qt6.qtwayland - ]; - - nativeCheckInputs = [ - xvfb-run - python3Packages.pytest - ]; - - checkPhase = '' - xvfb-run pytest tests - ''; - - meta = with lib; { - 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/pkgs/applications/misc/streamdeck-ui/update-pillow.patch b/pkgs/applications/misc/streamdeck-ui/update-pillow.patch deleted file mode 100644 index 88945586628f1..0000000000000 --- a/pkgs/applications/misc/streamdeck-ui/update-pillow.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 0aff29e..4371616 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -14,7 +14,7 @@ packages = [ - [tool.poetry.dependencies] - python = ">=3.8,<3.12" - streamdeck = "^0.9.3" --pillow = "^9.4.0" -+pillow = "^10.0.0" - pynput = "^1.7.6" - pyside6 = "^6.4.2" - CairoSVG = "^2.5.2" diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 71288ca07c9dd..ab7ae6fff5997 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A break time reminder app"; + description = "Break time reminder app"; longDescription = '' stretchly is a cross-platform electron app that reminds you to take breaks when working on your computer. By default, it runs in your tray diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/applications/misc/stw/default.nix index ca46c163128af..689fc9e81ce7f 100644 --- a/pkgs/applications/misc/stw/default.nix +++ b/pkgs/applications/misc/stw/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ]; meta = with lib; { - description = "A simple text widget for X resembling the watch(1) command"; + description = "Simple text widget for X resembling the watch(1) command"; license = licenses.mit; maintainers = with maintainers; [ somasis ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/stylish/default.nix b/pkgs/applications/misc/stylish/default.nix index 8dce6409bb7c4..77b3d480ac1d4 100644 --- a/pkgs/applications/misc/stylish/default.nix +++ b/pkgs/applications/misc/stylish/default.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/thevinter/styli.sh"; - description = "A shell script to manage wallpapers"; + description = "Shell script to manage wallpapers"; mainProgram = "styli.sh"; longDescription = '' Styli.sh is a Bash script that aims to automate the tedious process diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index fb028c7447511..e8cc4baf27575 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -54,7 +54,7 @@ let meta = with lib; { homepage = "https://www.libdivecomputer.org"; - description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; + description = "Cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = with maintainers; [ mguentner ]; license = licenses.lgpl21; platforms = platforms.all; @@ -139,7 +139,7 @@ stdenv.mkDerivation { passthru = { inherit version libdc googlemaps; }; meta = with lib; { - description = "A divelog program"; + description = "Divelog program"; mainProgram = "subsurface"; longDescription = '' Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix. diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index cb56e4281da06..d13578b3c82ae 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS"; + description = "Wayland native snapshot editing tool, inspired by Snappy on macOS"; homepage = "https://github.com/jtheoof/swappy"; license = licenses.mit; mainProgram = "swappy"; diff --git a/pkgs/applications/misc/sway-contrib/default.nix b/pkgs/applications/misc/sway-contrib/default.nix index 4ddca21774e01..b0c8154f2c513 100644 --- a/pkgs/applications/misc/sway-contrib/default.nix +++ b/pkgs/applications/misc/sway-contrib/default.nix @@ -9,18 +9,19 @@ , slurp , grim , jq +, gnugrep , bash , python3Packages }: let - version = "0-unstable-2024-01-20"; + version = "0-unstable-2024-03-19"; src = fetchFromGitHub { owner = "OctopusET"; repo = "sway-contrib"; - rev = "b7825b218e677c65f6849be061b93bd5654991bf"; - hash = "sha256-ZTfItJ77mrNSzXFVcj7OV/6zYBElBj+1LcLLHxBFypk="; + rev = "5d33a290e3cac3f0fed38ff950939da28e3ebfd7"; + hash = "sha256-2qYxkXowSSzVcpsPO4JoUqaH/VUkOOWu1RKFXp1CXGs="; }; meta = with lib; { @@ -46,6 +47,7 @@ grimshot = stdenvNoCC.mkDerivation { buildInputs = [ bash ]; installPhase = '' installManPage grimshot.1 + installShellCompletion --cmd grimshot grimshot-completion.bash install -Dm 0755 grimshot $out/bin/grimshot wrapProgram $out/bin/grimshot --set PATH \ @@ -57,6 +59,7 @@ grimshot = stdenvNoCC.mkDerivation { slurp grim jq + gnugrep ] }" ''; @@ -71,7 +74,7 @@ grimshot = stdenvNoCC.mkDerivation { ''; meta = with lib; meta // { - description = "A helper for screenshots within sway"; + description = "Helper for screenshots within sway"; maintainers = with maintainers; [ evils ]; mainProgram = "grimshot"; }; diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index cd81fee9f1ec0..09dafdbac154c 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "TUI Application launcher with Desktop Entry support."; + description = "TUI Application launcher with Desktop Entry support"; mainProgram = "sway-launcher-desktop"; longDescription = '' This is a TUI-based launcher menu made with bash and the amazing fzf. diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/applications/misc/swaysettings/default.nix index 490f0048081e5..5b13954c63f34 100644 --- a/pkgs/applications/misc/swaysettings/default.nix +++ b/pkgs/applications/misc/swaysettings/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A GUI for configuring your sway desktop"; + description = "GUI for configuring your sway desktop"; longDescription = '' Sway settings enables easy configuration of a sway desktop environment such as selection of application or icon themes. diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix deleted file mode 100644 index e9db92df121c4..0000000000000 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }: - -buildGoPackage rec { - pname = "syncthing-tray"; - version = "0.7"; - - goPackagePath = "github.com/alex2108/syncthing-tray"; - - src = fetchFromGitHub { - owner = "alex2108"; - repo = "syncthing-tray"; - rev = "v${version}"; - sha256 = "0869kinnsfzb8ydd0sv9fgqsi1sy5rhqg4whfdnrv82xjc71xyw3"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libappindicator-gtk3 ]; - - meta = with lib; { - description = "Simple application tray for syncthing"; - homepage = "https://github.com/alex2108/syncthing-tray"; - license = licenses.mit; - maintainers = with maintainers; [ nickhu ]; - mainProgram = "syncthing-tray"; - }; -} diff --git a/pkgs/applications/misc/syncthing-tray/deps.nix b/pkgs/applications/misc/syncthing-tray/deps.nix deleted file mode 100644 index 1103146ed1b7e..0000000000000 --- a/pkgs/applications/misc/syncthing-tray/deps.nix +++ /dev/null @@ -1,93 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/alex2108/systray"; - fetch = { - type = "git"; - url = "https://github.com/alex2108/systray"; - rev = "40e874866be2dc2c57ab031bcbde27a76b90721a"; - sha256 = "1bxnb6skb9ss0lwlwswql07ardkhm28nxglvlsxkdlmzv1dcwy1q"; - }; - } - { - goPackagePath = "github.com/getlantern/context"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/context"; - rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775"; - sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b"; - }; - } - { - goPackagePath = "github.com/getlantern/errors"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/errors"; - rev = "99fa440517e8f3d1e4cd8d6dbed6b41f4c1ed3d6"; - sha256 = "08rl32l5ks67hcgjxik62nd5g558mv4101kmz1ak7d3vfgg3m6i3"; - }; - } - { - goPackagePath = "github.com/getlantern/golog"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/golog"; - rev = "cca714f7feb5df8e455f409b549d384441ac4578"; - sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q"; - }; - } - { - goPackagePath = "github.com/getlantern/hex"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/hex"; - rev = "083fba3033ad473db3dd31c9bb368473d37581a7"; - sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77"; - }; - } - { - goPackagePath = "github.com/getlantern/hidden"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/hidden"; - rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7"; - sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi"; - }; - } - { - goPackagePath = "github.com/getlantern/ops"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/ops"; - rev = "b70875f5d689a9438bca72aefd7142a2af889b18"; - sha256 = "0cfa2bbkykbzbskmgd2an34him72z6f3y88ag1v5ffpb0d6bnar7"; - }; - } - { - goPackagePath = "github.com/getlantern/stack"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/stack"; - rev = "02f928aad224fbccd50d66edd776fc9d1e9f2f2b"; - sha256 = "0ddl5r4iw3c7p4drh4d8phl7d0ssdddsnd3xjm1lzgxylqq6r568"; - }; - } - { - goPackagePath = "github.com/oxtoacart/bpool"; - fetch = { - type = "git"; - url = "https://github.com/oxtoacart/bpool"; - rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6"; - sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95"; - }; - } - { - goPackagePath = "github.com/toqueteos/webbrowser"; - fetch = { - type = "git"; - url = "https://github.com/toqueteos/webbrowser"; - rev = "e2ebfdc6cb1a3fdc4fc4dbd20a0cae0c2e406792"; - sha256 = "0sgjnxrq0jgipkij8b6xiy4am9bv9zziqxxdhw15rdjc5piyk3a2"; - }; - } -] diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index e16625b02e173..b5bf0696f7645 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -34,14 +34,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.3"; + version = "1.5.4"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-wE6N0GSdcLDQOO+M3Ahlv3Z2S+PqdvZAnueCKB9+R08="; + hash = "sha256-3Z9heiQiuYzWtReKs/XeA+ENRKgxHR74ANzrDcdyjh4="; }; buildInputs = [ diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index ce402396c97da..4c437ea6df5de 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -35,7 +35,7 @@ maven.buildMavenPackage rec { ''; meta = with lib; { - description = "A library for extracting tables from PDF files."; + description = "Library for extracting tables from PDF files"; longDescription = '' tabula-java is the table extraction engine that powers Tabula. You can use tabula-java as a command-line tool to diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index ec2ded975fed3..c4b7749b5304c 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { - description = "A tool for liberating data tables locked inside PDF files"; + description = "Tool for liberating data tables locked inside PDF files"; longDescription = '' If you’ve ever tried to do anything with data provided to you in PDFs, you know how painful it is — there's no easy way to copy-and-paste rows of data diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index e4c7c51112a51..b2bda05d54964 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -16,6 +16,18 @@ let }; propagatedBuildInputs = [ super.decorator super.six ]; }); + + djangorestframework = super.djangorestframework.overridePythonAttrs (oldAttrs: rec { + version = "3.14.0"; + src = oldAttrs.src.override { + rev = version; + hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; + }; + nativeCheckInputs = with super; [ + pytest7CheckHook + pytest-django + ]; + }); }; }; @@ -153,7 +165,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec { updateScript = ./update.sh; tests = { - inherit (nixosTests) tandoor-recipes; + inherit (nixosTests) tandoor-recipes tandoor-recipes-script-name; }; }; diff --git a/pkgs/applications/misc/tango/default.nix b/pkgs/applications/misc/tango/default.nix index bd2dca9d790b4..11b7275d1e94c 100644 --- a/pkgs/applications/misc/tango/default.nix +++ b/pkgs/applications/misc/tango/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-83nKtiEy1na1HgAQcbTEfl+0vGg6BkCLBK1REN9fP+k="; meta = with lib; { - description = "A local command-line Japanese dictionary tool using yomichan's dictionary files"; + description = "Local command-line Japanese dictionary tool using yomichan's dictionary files"; homepage = "https://github.com/masakichi/tango"; license = licenses.mit; maintainers = with maintainers; [ donovanglover ]; diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 5c15748f2b8ec..cc2d7218bd4cc 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -12,7 +12,7 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "taskjuggler"; meta = with lib; { - description = "A modern and powerful project management tool"; + description = "Modern and powerful project management tool"; homepage = "https://taskjuggler.org/"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 5d8b453b0f4ea..2b3decab36b58 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/lharding/tasknc"; - description = "A ncurses wrapper around taskwarrior"; + description = "Ncurses wrapper around taskwarrior"; mainProgram = "tasknc"; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; # Cannot test others diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index e96478d96c68f..88a8e99f26a02 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A terminal user interface for taskwarrior "; + description = "Terminal user interface for taskwarrior "; homepage = "https://github.com/kdheepak/taskwarrior-tui"; license = with licenses; [ mit ]; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index e39dd24623216..5f43956d8ae6b 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; meta = with lib; { - description = "A Glorified WM-Independent Dropdown Creator"; + description = "Glorified WM-Independent Dropdown Creator"; mainProgram = "tdrop"; homepage = "https://github.com/noctuid/tdrop"; license = licenses.bsd2; diff --git a/pkgs/applications/misc/terminal-stocks/default.nix b/pkgs/applications/misc/terminal-stocks/default.nix index 1b389c2164abd..381bed4033153 100644 --- a/pkgs/applications/misc/terminal-stocks/default.nix +++ b/pkgs/applications/misc/terminal-stocks/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terminal-stocks"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "shweshi"; repo = pname; rev = "v${version}"; - hash = "sha256-f/ccGh31qT+euuGA3RRyiUYl+wpxazZHs5R8xehX3Zk="; + hash = "sha256-6eDBcQfo6M+Z31ILLM4BbiOxoTD6t4LQJxawoJFEzhg="; }; - npmDepsHash = "sha256-t71SfoPYVFLWcrjv2ErWazDeaVTO4W46g4lFler86Sc="; + npmDepsHash = "sha256-0k2+vdfOUF0zV6Tl7VGXS2dNLnCHgSdI12LqvGkbv+k="; dontNpmBuild = true; passthru.updateScript = nix-update-script {}; diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index 4aee5fccfbd10..80ece5bded7a5 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { LIBGIT2_NO_VENDOR = 1; meta = with lib; { - description = "An open source terminal based version of Typeracer written in rust"; + description = "Open source terminal based version of Typeracer written in rust"; homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; license = licenses.gpl3Plus; maintainers = with maintainers; [ yoctocell ]; diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 3fb11f883a2a6..b3292b8ebb5d0 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://thedesk.top"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "thedesk"; }; diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix index e1c26828c97ee..98f6b6183a339 100644 --- a/pkgs/applications/misc/themechanger/default.nix +++ b/pkgs/applications/misc/themechanger/default.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/ALEX11BR/ThemeChanger"; - description = "A theme changing utility for Linux"; + description = "Theme changing utility for Linux"; mainProgram = "themechanger"; longDescription = '' This app is a theme changing utility for Linux, BSDs, and whatnots. diff --git a/pkgs/applications/misc/thokr/default.nix b/pkgs/applications/misc/thokr/default.nix index cf82a8d6aeb81..94363083ab9e4 100644 --- a/pkgs/applications/misc/thokr/default.nix +++ b/pkgs/applications/misc/thokr/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw="; meta = with lib; { - description = "A typing tui with visualized results and historical logging"; + description = "Typing tui with visualized results and historical logging"; homepage = "https://github.com/thatvegandev/thokr"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index a717135f48b4c..da8624a06baab 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bNqwQwYuaWThpVVlZji0uiNKf8Ynxs00bAD+iSnbtm8="; + hash = "sha256-EjQLJG1/AEnOKGcGh2C1HdRAVUnZLhehxTtpWlvD+jw="; }; - vendorHash = "sha256-cTJa170oFFPRQSg3njZk26XvzsRRdJqcsFokKUWJr6Q="; + vendorHash = "sha256-bWdyypcIagbKTMnhT0X4UmoPVjyTasCSud6pX1L3oIc="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index a22f9da07359e..29587be9bcde2 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.14.9"; + version = "0.14.10"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cN5GtU3bmsdJvfjVdWvWAshiU3Ged7L9pc8wid8GQwA="; + hash = "sha256-6iMThVLIkFoNa7Z0MuyhUNGCwFtCfmG7jHvDfrEZE2I="; }; - cargoHash = "sha256-ngDA085V3+2oBH13Fs+pJez2W2/i1pEKoWdqJ4/3Q0I="; + cargoHash = "sha256-gfBmoN91xUcjBafxBoLP41Fl8FuH2taAu3P6sgJPNWI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 02445a655b462..beaf36465efeb 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A command-line time tracker"; + description = "Command-line time tracker"; homepage = "https://timewarrior.net"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 18aa389ac1e7c..46c89527c4f0b 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,7 +6,6 @@ , gettext , cairo , pango -, pcre , glib , imlib2 , gtk3 @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { buildInputs = [ cairo pango - pcre glib imlib2 gtk3 @@ -78,7 +76,7 @@ stdenv.mkDerivation rec { for f in ./src/launcher/apps-common.c \ ./src/launcher/icon-theme-common.c do - substituteInPlace $f --replace /usr/share/ /run/current-system/sw/share/ + substituteInPlace $f --replace-fail /usr/share/ /run/current-system/sw/share/ done ''; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index 16e266619ff44..2e74f2fe3e0bd 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -34,7 +34,7 @@ in appimageTools.wrapAppImage { meta = with lib; { homepage = "https://todoist.com"; - description = "The official Todoist electron app"; + description = "Official Todoist electron app"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; maintainers = with maintainers; [ kylesferrazza pokon548 ]; diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 59e93dcb5dea8..39a3c7013b0a1 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; meta = with lib; { - description = "A cli todo application compatible with the todo.txt format"; + description = "Cli todo application compatible with the todo.txt format"; mainProgram = "topydo"; homepage = "https://github.com/topydo/topydo"; changelog = "https://github.com/topydo/topydo/blob/${src.rev}/CHANGES.md"; diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/applications/misc/transifex-cli/default.nix index 295e32addf40d..1be49361f5b5d 100644 --- a/pkgs/applications/misc/transifex-cli/default.nix +++ b/pkgs/applications/misc/transifex-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.13"; + version = "1.6.14"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-SVXrrpkz2veA1L5p88iGQxHAUtySiYge0ffY2HyVCr0="; + sha256 = "sha256-yKkRoeq0hPYMjZcoL9h3l8FimnCjjVSlk9whliEnkzE="; }; vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; @@ -28,7 +28,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "The Transifex command-line client"; + description = "Transifex command-line client"; homepage = "https://github.com/transifex/transifex-cli"; license = licenses.asl20; maintainers = with maintainers; [ thornycrackers ]; diff --git a/pkgs/applications/misc/translatelocally/default.nix b/pkgs/applications/misc/translatelocally/default.nix index 1ce54adedc84c..c4fd6378ccefe 100644 --- a/pkgs/applications/misc/translatelocally/default.nix +++ b/pkgs/applications/misc/translatelocally/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { mainProgram = "translateLocally"; homepage = "https://translatelocally.com/"; - description = "Fast and secure translation on your local machine, powered by marian and Bergamot."; + description = "Fast and secure translation on your local machine, powered by marian and Bergamot"; license = licenses.mit; maintainers = with maintainers; [ pacien ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tsukae/default.nix b/pkgs/applications/misc/tsukae/default.nix index fcd211769677c..bf1b213155132 100644 --- a/pkgs/applications/misc/tsukae/default.nix +++ b/pkgs/applications/misc/tsukae/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-Q0WOzyJGnTXTmj7ZPKyVSnWuWb4bbDjDpgftQ1Opf/I="; meta = with lib; { - description = "Show off your most used shell commands."; + description = "Show off your most used shell commands"; homepage = "https://github.com/irevenko/tsukae"; license = licenses.mit; mainProgram = "tsukae"; diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix index a67742aa63308..e1e1ccd1cd59a 100644 --- a/pkgs/applications/misc/ttdl/default.nix +++ b/pkgs/applications/misc/ttdl/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+jYl/oUeJaABgDX/OBTyeo/B7RYc2MUTreU1ySLG0XQ="; meta = with lib; { - description = "A CLI tool to manage todo lists in todo.txt format"; + description = "CLI tool to manage todo lists in todo.txt format"; homepage = "https://github.com/VladimirMarkelov/ttdl"; changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${version}/changelog"; license = with licenses; [ mit ]; diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix index 2c41c1c300f7f..603ddeca4fd7a 100644 --- a/pkgs/applications/misc/tthsum/default.nix +++ b/pkgs/applications/misc/tthsum/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; - description = "An md5sum-alike program that works with Tiger/THEX hashes"; + description = "Md5sum-alike program that works with Tiger/THEX hashes"; longDescription = '' tthsum generates or checks TTH checksums (root of the THEX hash tree). The Merkle Hash Tree, invented by Ralph Merkle, is a hash diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index b99b76511be47..a3033bcd07dbb 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -23,17 +23,22 @@ , libspelling , icu , gst_all_1 +, clapper +# clapper support is still experimental and has bugs. +# See https://github.com/GeopJr/Tuba/pull/931 +, clapperSupport? false , nix-update-script }: stdenv.mkDerivation rec { pname = "tuba"; - version = "0.7.2"; + version = "0.8.1"; + src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-PRbepitFSvdw/7y5VlnSdsQwnlTQg4ktM4t1/x6SmAY="; + hash = "sha256-dN915sPBttnrcOuhUJjEtdojOQi9VRLmc+t1RvWmx64="; }; nativeBuildInputs = [ @@ -67,7 +72,13 @@ stdenv.mkDerivation rec { gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad - ]); + ]) ++ lib.optionals clapperSupport [ + clapper + ]; + + mesonFlags = [ + (lib.mesonBool "clapper" clapperSupport) + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion"; @@ -75,12 +86,12 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Browse the Fediverse"; homepage = "https://tuba.geopjr.dev/"; mainProgram = "dev.geopjr.Tuba"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; changelog = "https://github.com/GeopJr/Tuba/releases/tag/v${version}"; - maintainers = with maintainers; [ chuangzhu aleksana ]; + maintainers = with lib.maintainers; [ chuangzhu aleksana ]; }; } diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix index f61f7bea912d6..d660248deef88 100644 --- a/pkgs/applications/misc/tuckr/default.nix +++ b/pkgs/applications/misc/tuckr/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "tuckr"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = version; - hash = "sha256-S4mHNCyK7WGYRBckxQkwA3+eu7QhUyKkOZ/KqhMJf+s="; + hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA="; }; - cargoHash = "sha256-aUhiMJUKV+Da3WLUY9Jr3oDB8yqcUm0pP05yKaITjM0="; + cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; meta = with lib; { - description = "A super powered replacement for GNU Stow"; + description = "Super powered replacement for GNU Stow"; homepage = "https://github.com/RaphGL/Tuckr"; changelog = "https://github.com/RaphGL/Tuckr/releases/tag/${version}"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 102b9ad354df5..4af9f8e2559a2 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-SgpIR7gLfmX6mCtuqRonqzX07Eblp9Mq80y71b05FZY="; + hash = "sha256-FAN0F54cCEfqoSr1La+X+et5MGTzB2Wb466Xr8eyeiI="; }; - cargoHash = "sha256-SetNhIengAiLRMHoYBRxHR1LgzYywRC7L6hmRF9COik="; + cargoHash = "sha256-y6gAv4Xf0yxpbOAdYhp3nDBH8skiyAI10+Ylz/uxf7w="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 85f2768cc715f..f6094f516694c 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-gPF4XrUqDDJCCY1zrUr3AXDG0uoADR8LBxRP4yolcug="; meta = with lib; { - description = "A TUI for Mastodon with vim inspired keys"; + description = "TUI for Mastodon with vim inspired keys"; homepage = "https://github.com/RasmusLindroth/tut"; license = licenses.mit; maintainers = with maintainers; [ equirosa ]; diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index 459a47bfcab09..922c925cbb0c3 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonApplication -, fetchPypi +, fetchFromGitHub , iso8601 , progressbar2 , requests @@ -8,15 +8,16 @@ buildPythonApplication rec { pname = "twitch-chat-downloader"; - version = "2.5.3"; + version = "2.5.4"; # NOTE: Using maintained fork because upstream has stopped working, and it has # not been updated in a while. # https://github.com/PetterKraabol/Twitch-Chat-Downloader/issues/142 - src = fetchPypi { - inherit version; - pname = "tdh-tcd"; - sha256 = "sha256-dvj0HoF/2n5aQGMOD8UYY4EZegQwThPy1XJFvXyRT4Q="; + src = fetchFromGitHub { + owner = "TheDrHax"; + repo = "twitch-chat-downloader"; + rev = version; + hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M="; }; propagatedBuildInputs = [ @@ -34,6 +35,6 @@ buildPythonApplication rec { mainProgram = "tcd"; homepage = "https://github.com/TheDrHax/Twitch-Chat-Downloader"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ assistant ]; }; } diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index d4b4d1d9d8035..7700c62a50642 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -28,7 +28,7 @@ mkDerivation { ''; meta = { - description = "A notification system for tiling window managers"; + description = "Notification system for tiling window managers"; homepage = "https://github.com/sboli/twmn"; platforms = with lib.platforms; linux; maintainers = [ lib.maintainers.matejc ]; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 1bd2eece184cc..c991a71e9c0ae 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -1,24 +1,28 @@ -{ lib, python3, fetchPypi }: +{ + lib, + rustPlatform, + fetchFromGitHub, +}: -let - inherit (python3.pkgs) buildPythonApplication requests; -in -buildPythonApplication rec { +rustPlatform.buildRustPackage rec { pname = "tzupdate"; - version = "2.1.0"; + version = "3.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "5b55795c390e4ccc90e649c8cc387447daaf30a21d68f7196b49824cbcba8adc"; + src = fetchFromGitHub { + owner = "cdown"; + repo = "tzupdate"; + rev = version; + hash = "sha256-eod4yFzX7pATNQmG7jU+r9mnC9nprJ55ufMXpKjw/YI="; }; - propagatedBuildInputs = [ requests ]; + cargoHash = "sha256-5+lp5xlwJxFDqzVxptJPX7z0iLoMkgdwHxvRVIXHF7Y="; meta = with lib; { - description = "Update timezone information based on geoip"; - mainProgram = "tzupdate"; + description = "Set the system timezone based on IP geolocation"; homepage = "https://github.com/cdown/tzupdate"; - maintainers = [ ]; - license = licenses.unlicense; + license = licenses.mit; + maintainers = with maintainers; [ camillemndn ]; + platforms = platforms.linux; + mainProgram = "tzupdate"; }; } diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 9c455fa6ba729..92d93b5095d13 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788="; + hash = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788="; }; nativeBuildInputs = with python3Packages; [ @@ -57,6 +57,7 @@ python3Packages.buildPythonApplication rec { pyxdg pycairo requests + semver websocket-client ]; @@ -76,7 +77,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace setup.py --subst-var out patchShebangs bin/ulauncher-toggle substituteInPlace bin/ulauncher-toggle \ - --replace wmctrl ${wmctrl}/bin/wmctrl + --replace-fail wmctrl ${wmctrl}/bin/wmctrl ''; # https://github.com/Ulauncher/Ulauncher/issues/390 @@ -116,7 +117,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { - description = "A fast application launcher for Linux, written in Python, using GTK"; + description = "Fast application launcher for Linux, written in Python, using GTK"; homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/applications/misc/uni/default.nix index 57f88ab6eafef..5773c13ae68e8 100644 --- a/pkgs/applications/misc/uni/default.nix +++ b/pkgs/applications/misc/uni/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uni"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "arp242"; repo = "uni"; rev = "refs/tags/v${version}"; - hash = "sha256-Ij/jUbXl3GkeNZmGJ82i++6VkOW46YFI9m83otY6M7Q="; + hash = "sha256-ociPkuRtpBS+x1zSVNYk8oqAsJZGv31/TUUUlBOYhJA="; }; - vendorHash = "sha256-88SSrGvZSs6Opi3IKSNNqptuOWMmtTQ4ZDR7ViuGugk="; + vendorHash = "sha256-/PvBn2RRYuVpjnrIL1xAcVqAKZuIV2KTSyVtBW1kqj4="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 6375b2537258d..b5b15b48d7f88 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zakkor wolfangaukang ]; + maintainers = with maintainers; [ zakkor ]; }; } diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix index 1034b3844b130..7a5abda593029 100644 --- a/pkgs/applications/misc/usync/default.nix +++ b/pkgs/applications/misc/usync/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ebzzry/usync"; - description = "A simple site-to-site synchronization tool"; + description = "Simple site-to-site synchronization tool"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index b65d2b36e31f9..1071f39d43d20 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "An implementation of the KDE Connect protocol, built on GNOME platform libraries"; + description = "Implementation of the KDE Connect protocol, built on GNOME platform libraries"; mainProgram = "valent"; longDescription = '' Note that you have to open firewall ports for other devices diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index e0ca06af8aa3e..525a3a5399df1 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An open source sewing pattern drafting software"; + description = "Open source sewing pattern drafting software"; homepage = "https://smart-pattern.com.ua/"; changelog = "https://gitlab.com/smart-pattern/valentina/-/blob/v${version}/ChangeLog.txt"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index e90a8e9a1e01c..3a4d6ac760856 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/varietywalls/variety"; - description = "A wallpaper manager for Linux systems"; + description = "Wallpaper manager for Linux systems"; mainProgram = "variety"; longDescription = '' Variety is a wallpaper manager for Linux systems. It supports numerous diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index 5d9f87b2316ac..82633111c33c2 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A tool for generating terminal GIFs with code"; + description = "Tool for generating terminal GIFs with code"; mainProgram = "vhs"; homepage = "https://github.com/charmbracelet/vhs"; changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}"; diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix deleted file mode 100644 index 07dbfef2f5f56..0000000000000 --- a/pkgs/applications/misc/vp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }: - -stdenv.mkDerivation rec { - pname = "vp"; - version = "1.8"; - - src = fetchFromGitHub { - owner = "erikg"; - repo = "vp"; - rev = "v${version}"; - sha256 = "08q6xrxsyj6vj0sz59nix9isqz84gw3x9hym63lz6v8fpacvykdq"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ SDL SDL_image ]; - - env.NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; - - meta = with lib; { - homepage = "https://brlcad.org/~erik/"; - description = "SDL based picture viewer/slideshow"; - platforms = platforms.unix; - license = licenses.gpl3; - maintainers = [ maintainers.vrthra ]; - mainProgram = "vp"; - }; -} diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index e58b98c4e0700..8a550ac4a79f7 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.insilmaril.de/vym/"; - description = "A mind-mapping software"; + description = "Mind-mapping software"; mainProgram = "vym"; longDescription = '' VYM (View Your Mind) is a tool to generate and manipulate maps which show diff --git a/pkgs/applications/misc/wallust/default.nix b/pkgs/applications/misc/wallust/default.nix index 3e2fb300dd1e9..e92d5517026f5 100644 --- a/pkgs/applications/misc/wallust/default.nix +++ b/pkgs/applications/misc/wallust/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage { passthru.updateScript = nix-update-script { }; meta = { - description = "A better pywal"; + description = "Better pywal"; homepage = "https://codeberg.org/explosion-mental/wallust"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onemoresuza iynaix ]; diff --git a/pkgs/applications/misc/warpd/default.nix b/pkgs/applications/misc/warpd/default.nix index 7fa28d41e37bf..a2957a4edb6ee 100644 --- a/pkgs/applications/misc/warpd/default.nix +++ b/pkgs/applications/misc/warpd/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A modal keyboard driven interface for mouse manipulation."; + description = "Modal keyboard driven interface for mouse manipulation"; homepage = "https://github.com/rvaiya/warpd"; changelog = "https://github.com/rvaiya/warpd/blob/${src.rev}/CHANGELOG.md"; maintainers = with maintainers; [ hhydraa ]; diff --git a/pkgs/applications/misc/watershot/default.nix b/pkgs/applications/misc/watershot/default.nix index 6d29fab825277..3935b3ef211c3 100644 --- a/pkgs/applications/misc/watershot/default.nix +++ b/pkgs/applications/misc/watershot/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { platforms = with platforms; linux; - description = "A simple wayland native screenshot tool"; + description = "Simple wayland native screenshot tool"; mainProgram = "watershot"; homepage = "https://github.com/Kirottu/watershot"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix deleted file mode 100644 index 9ed2cc12131e9..0000000000000 --- a/pkgs/applications/misc/waylock/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, libxkbcommon -, pam -, pkg-config -, scdoc -, wayland -, wayland-protocols -, zig_0_11 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "waylock"; - version = "1.0.0"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "ifreund"; - repo = "waylock"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-Z5YNaR+jocJ4hS7NT8oAlrMnqNfD8KRzOyyqdVGDSl0="; - }; - - nativeBuildInputs = [ - pkg-config - scdoc - wayland - zig_0_11.hook - ]; - - buildInputs = [ - wayland-protocols - libxkbcommon - pam - ]; - - zigBuildFlags = [ "-Dman-pages" ]; - - passthru.updateScript = ./update.nu; - - meta = { - homepage = "https://codeberg.org/ifreund/waylock"; - changelog = "https://codeberg.org/ifreund/waylock/releases/tag/v${finalAttrs.version}"; - description = "A small screenlocker for Wayland compositors"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ adamcstephens jordanisaacs ]; - mainProgram = "waylock"; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/waylock/update.nu b/pkgs/applications/misc/waylock/update.nu deleted file mode 100755 index 514a755db1a32..0000000000000 --- a/pkgs/applications/misc/waylock/update.nu +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i nu -p nushell common-updater-scripts - -let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last -update-source-version waylock $latest_tag diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix index 62ab0aaa05a50..92d53989ded8e 100644 --- a/pkgs/applications/misc/wcalc/default.nix +++ b/pkgs/applications/misc/wcalc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ mpfr readline ]; meta = with lib; { - description = "A command line calculator"; + description = "Command line calculator"; homepage = "https://w-calc.sourceforge.net"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 97883864ad75f..15bd937506ee0 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { homepage = "https://whalebird.social"; changelog = "https://github.com/h3poteto/whalebird-desktop/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ wolfangaukang colinsane weathercold ]; + maintainers = with maintainers; [ weathercold ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index 5f20f314d3f4c..d339e8646e75f 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = { - description = "A simple curses interface for MediaWiki sites such as Wikipedia"; + description = "Simple curses interface for MediaWiki sites such as Wikipedia"; mainProgram = "wikicurses"; homepage = "https://github.com/ids1024/wikicurses/"; license = lib.licenses.mit; diff --git a/pkgs/applications/misc/wlclock/default.nix b/pkgs/applications/misc/wlclock/default.nix index ad14b24abd29a..d79a81788c7ac 100644 --- a/pkgs/applications/misc/wlclock/default.nix +++ b/pkgs/applications/misc/wlclock/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A digital analog clock for Wayland desktops"; + description = "Digital analog clock for Wayland desktops"; homepage = "https://git.sr.ht/~leon_plickat/wlclock"; license = licenses.gpl3; maintainers = with maintainers; [ nomisiv ]; diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index df568c045ac2a..c443791848621 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ]; meta = with lib; { - description = "An efficient dynamic menu for Sway and wlroots based Wayland compositors"; + description = "Efficient dynamic menu for Sway and wlroots based Wayland compositors"; homepage = "https://git.sr.ht/~adnano/wmenu"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index fc124c56eb569..c6ad0199e51fb 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A launcher/menu program for wlroots based wayland compositors such as sway"; + description = "Launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; license = licenses.gpl3Only; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index ebe09f8b861c2..1235b22b8aba1 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); - description = "A program to help prevent Repetitive Strain Injury"; + description = "Program to help prevent Repetitive Strain Injury"; mainProgram = "workrave"; longDescription = '' Workrave is a program that assists in the recovery and prevention of diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index a32527de7dabb..5c130bb069821 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "The personal information dashboard for your terminal"; + description = "Personal information dashboard for your terminal"; homepage = "https://wtfutil.com/"; changelog = "https://github.com/wtfutil/wtf/raw/v${version}/CHANGELOG.md"; license = licenses.mpl20; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 19b5a8e3ec2d3..fb0bf3063bbcf 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = with lib; { - description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; + description = "X509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; mainProgram = "xca"; homepage = "https://hohnstaedt.de/xca/"; license = licenses.bsd3; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 8c48388594d44..33f8978820e6b 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A viewer for Microsoft HTML Help files"; + description = "Viewer for Microsoft HTML Help files"; homepage = "https://github.com/rzvncj/xCHM"; license = licenses.gpl2; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/applications/misc/xdg-launch/default.nix index bf5b0484c867c..4a61839c7d8c9 100644 --- a/pkgs/applications/misc/xdg-launch/default.nix +++ b/pkgs/applications/misc/xdg-launch/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bbidulock/xdg-launch"; - description = "A command line XDG compliant launcher and tools"; + description = "Command line XDG compliant launcher and tools"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.ck3d ]; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 83690f129bffa..d3aaa70fc9af1 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A GTK Bible study tool"; + description = "GTK Bible study tool"; longDescription = '' Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux, UNIX, and Windows using GTK, offering a rich diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index c73ff6a607833..10bd1961f09c1 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A small command-line program to get/set the current XKB keyboard layout"; + description = "Small command-line program to get/set the current XKB keyboard layout"; homepage = "https://github.com/nonpop/xkblayout-state"; license = licenses.gpl2; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix index ae08952af2e85..59058f3f53bd5 100644 --- a/pkgs/applications/misc/xmenu/default.nix +++ b/pkgs/applications/misc/xmenu/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = "sed -i \"s:/usr/local:$out:\" config.mk"; meta = with lib; { - description = "A menu utility for X"; + description = "Menu utility for X"; homepage = "https://github.com/phillbush/xmenu"; license = licenses.mit; maintainers = with maintainers; [ neonfuz ]; diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 0e4ac69cb813e..47aee945971b5 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -27,7 +27,7 @@ xmrig.overrideAttrs (oldAttrs: rec { ]; meta = with lib; { - description = "A fork of the XMRig CPU miner with support for algorithm switching"; + description = "Fork of the XMRig CPU miner with support for algorithm switching"; homepage = "https://github.com/MoneroOcean/xmrig"; license = licenses.gpl3Plus; mainProgram = "xmrig"; diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index d945ae7ff0baa..1206b39679abe 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 gtksourceview ]; meta = with lib; { - description = "A sticky note application for jotting down things to remember"; + description = "Sticky note application for jotting down things to remember"; mainProgram = "xpad"; homepage = "https://launchpad.net/xpad"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index fac2c6812bd27..0e68a1769025b 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; - description = "A slide show presentation tool"; + description = "Slide show presentation tool"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 3fd9eb8a6ecbb..022abdb5ae18e 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; meta = with lib; { - description = "A keyboard layout indicator and switcher"; + description = "Keyboard layout indicator and switcher"; homepage = "http://xxkb.sourceforge.net/"; license = licenses.artistic2; maintainers = with maintainers; [ rasendubi ]; diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index 10d519efa45c2..55acd53fd1e0f 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "A command line oriented, sqlite powered, todo-list"; + description = "Command line oriented, sqlite powered, todo-list"; homepage = "https://yokadi.github.io/index.html"; license = licenses.gpl3Plus; maintainers = [ maintainers.nkpvk ]; diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index 0611655da1bc9..da5cb37a978b0 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -1,5 +1,5 @@ { lib -, flutter +, flutter319 , python3 , fetchFromGitHub , pcre2 @@ -11,7 +11,7 @@ , removeReferencesTo }: -flutter.buildFlutterApplication rec { +flutter319.buildFlutterApplication rec { pname = "yubioath-flutter"; version = "6.4.0"; diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index ea2c74fda3701..2c4dc76abb477 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -1,5 +1,15 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core -, girara, gettext, libarchive }: +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + pkg-config, + zathura_core, + girara, + gettext, + libarchive, +}: stdenv.mkDerivation rec { pname = "zathura-cb"; @@ -7,20 +17,29 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1j5v32f9ki35v1jc7a067anhlgqplzrp4fqvznlixfhcm0bwmc49"; + hash = "sha256-ibDKF6gMuh6p/Rs7cvOnFz8KrToGqMNk2GXEmZwYu8g="; }; - nativeBuildInputs = [ meson ninja pkg-config gettext ]; - buildInputs = [ libarchive zathura_core girara ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + ]; + buildInputs = [ + libarchive + zathura_core + girara + ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { homepage = "https://pwmt.org/projects/zathura-cb/"; - description = "A zathura CB plugin"; + description = "Zathura CB plugin"; longDescription = '' The zathura-cb plugin adds comic book support to zathura. - ''; + ''; license = licenses.zlib; platforms = platforms.unix; maintainers = with maintainers; [ jlesquembre ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 8b452c7f1a40c..b7b7a517310b7 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,24 +1,48 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, wrapGAppsHook3, pkg-config, gitUpdater -, appstream-glib, json-glib, desktop-file-utils, python3 -, gtk, girara, gettext, libxml2, check -, sqlite, glib, texlive, libintl, libseccomp -, file, librsvg -, gtk-mac-integration +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + wrapGAppsHook3, + pkg-config, + gitUpdater, + appstream-glib, + json-glib, + desktop-file-utils, + python3, + gtk, + girara, + gettext, + libxml2, + check, + sqlite, + glib, + texlive, + libintl, + libseccomp, + file, + librsvg, + gtk-mac-integration, }: stdenv.mkDerivation (finalAttrs: { pname = "zathura"; - version = "0.5.5"; + version = "0.5.6"; - src = fetchFromGitLab { - domain = "git.pwmt.org"; + src = fetchFromGitHub { owner = "pwmt"; repo = "zathura"; rev = finalAttrs.version; - hash = "sha256-mHEYqgBB55p8nykFtvYtP5bWexp/IqFbeLs7gZmXCeE="; + hash = "sha256-lTEBIZ3lkzjJ+L1qecrcL8iseo8AvSIo3Wh65/ikwac="; }; - outputs = [ "bin" "man" "dev" "out" ]; + outputs = [ + "bin" + "man" + "dev" + "out" + ]; # Flag list: # https://github.com/pwmt/zathura/blob/master/meson_options.txt @@ -33,23 +57,37 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - meson ninja pkg-config desktop-file-utils python3.pythonOnBuildForHost.pkgs.sphinx - gettext wrapGAppsHook3 libxml2 appstream-glib + meson + ninja + pkg-config + desktop-file-utils + python3.pythonOnBuildForHost.pkgs.sphinx + gettext + wrapGAppsHook3 + libxml2 + appstream-glib ]; buildInputs = [ - gtk girara libintl sqlite glib file librsvg check json-glib + gtk + girara + libintl + sqlite + glib + file + librsvg + check + json-glib texlive.bin.core - ] ++ lib.optional stdenv.isLinux libseccomp - ++ lib.optional stdenv.isDarwin gtk-mac-integration; + ] ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional stdenv.isDarwin gtk-mac-integration; doCheck = !stdenv.isDarwin; passthru.updateScript = gitUpdater { }; meta = with lib; { - homepage = "https://git.pwmt.org/pwmt/zathura"; - description = "A core component for zathura PDF viewer"; + homepage = "https://pwmt.org/projects/zathura"; + description = "Core component for zathura PDF viewer"; license = licenses.zlib; platforms = platforms.unix; maintainers = with maintainers; [ globin ]; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 67fe3032d05ce..23b5ce0198e19 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,6 +1,9 @@ -{ config, pkgs -# zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980) -, useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin) }: +{ + config, + pkgs, + # zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980) + useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin), +}: let callPackage = pkgs.newScope self; @@ -29,5 +32,5 @@ let ]; }; }; - -in self +in +self diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index f0fe09486324d..c7b3c3e52c940 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gtk, zathura_core, girara, djvulibre, gettext }: +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + gtk, + zathura_core, + girara, + djvulibre, + gettext, +}: stdenv.mkDerivation rec { pname = "zathura-djvu"; @@ -6,17 +18,27 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"; + hash = "sha256-lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ djvulibre gettext zathura_core gtk girara ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + buildInputs = [ + djvulibre + gettext + zathura_core + gtk + girara + ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { homepage = "https://pwmt.org/projects/zathura-djvu/"; - description = "A zathura DJVU plugin"; + description = "Zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the djvulibre library. @@ -26,4 +48,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; }; } - diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index f6eb5cfd45e1a..b7eff35913c3b 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,29 +1,39 @@ -{ stdenv, lib, meson, ninja, fetchurl, cairo -, girara -, gtk-mac-integration -, gumbo -, jbig2dec -, libjpeg -, mupdf -, openjpeg -, pkg-config -, zathura_core -, tesseract -, leptonica -, mujs -, gitUpdater +{ + stdenv, + lib, + meson, + ninja, + fetchurl, + cairo, + girara, + gtk-mac-integration, + gumbo, + jbig2dec, + libjpeg, + mupdf, + openjpeg, + pkg-config, + zathura_core, + tesseract, + leptonica, + mujs, + gitUpdater, }: stdenv.mkDerivation rec { - version = "0.4.1"; + version = "0.4.2"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-+YKgHWUj+iVmk4EYTAamJe2/15YcvbBxHcz9ucQCrC8="; + hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; buildInputs = [ cairo @@ -39,19 +49,17 @@ stdenv.mkDerivation rec { mujs ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; - PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; postPatch = '' sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build ''; - passthru.updateScript = gitUpdater { - url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; - }; + passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; }; meta = with lib; { homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/"; - description = "A zathura PDF plugin (mupdf)"; + description = "Zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by using the mupdf rendering library. diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 5246705bbd8b1..1c4ba79ee91b7 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,4 +1,14 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core, girara, poppler }: +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + pkg-config, + zathura_core, + girara, + poppler, +}: stdenv.mkDerivation rec { pname = "zathura-pdf-poppler"; @@ -6,17 +16,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "049h8m9swxni7ar6fsbm0hb3fg4ffmjc3m6vyg78ilfi3kayxavi"; + hash = "sha256-cavu1RzR0YjO89vUwWR1jjw3FgR1aWeyOtF2rlNFMBE="; }; - nativeBuildInputs = [ meson ninja pkg-config zathura_core ]; - buildInputs = [ poppler girara ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + zathura_core + ]; + buildInputs = [ + poppler + girara + ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { homepage = "https://pwmt.org/projects/zathura-pdf-poppler/"; - description = "A zathura PDF plugin (poppler)"; + description = "Zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by using the poppler rendering library. diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 180001b52aeb4..63b9cedd7a299 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,4 +1,15 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core, girara, libspectre, gettext }: +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + pkg-config, + zathura_core, + girara, + libspectre, + gettext, +}: stdenv.mkDerivation rec { pname = "zathura-ps"; @@ -6,24 +17,32 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0ilf63wxn1yzis9m3qs8mxbk316yxdzwxrrv86wpiygm9hhgk5sq"; + hash = "sha256-WJf5IEz1+Xi5QTvnzn/r3oQxV69I41GTjt8H2/kwjkY="; }; - nativeBuildInputs = [ meson ninja pkg-config gettext ]; - buildInputs = [ libspectre zathura_core girara ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + ]; + buildInputs = [ + libspectre + zathura_core + girara + ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { homepage = "https://pwmt.org/projects/zathura-ps/"; - description = "A zathura PS plugin"; + description = "Zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the libspectre library. - ''; + ''; license = licenses.zlib; platforms = platforms.unix; maintainers = with maintainers; [ ]; }; } - diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 60ff0bd688546..5d60c48222123 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -1,29 +1,45 @@ -{ symlinkJoin, lib, makeWrapper, zathura_core, file, plugins ? [] }: +{ + symlinkJoin, + lib, + makeWrapper, + zathura_core, + file, + plugins ? [ ], +}: symlinkJoin { name = "zathura-with-plugins-${zathura_core.version}"; - paths = with zathura_core; [ man dev out ] ++ plugins; + paths = + with zathura_core; + [ + man + dev + out + ] + ++ plugins; nativeBuildInputs = [ makeWrapper ]; - postBuild = let - fishCompletion = "share/fish/vendor_completions.d/zathura.fish"; - in '' - makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ - --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ - --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura" + postBuild = + let + fishCompletion = "share/fish/vendor_completions.d/zathura.fish"; + in + '' + makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ + --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ + --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura" - # zathura fish completion references the zathura_core derivation to - # check for supported plugins which live in the wrapper derivation, - # so we need to fix the path to reference $out instead. - rm "$out/${fishCompletion}" - substitute "${zathura_core.out}/${fishCompletion}" "$out/${fishCompletion}" \ - --replace "${zathura_core.out}" "$out" - ''; + # zathura fish completion references the zathura_core derivation to + # check for supported plugins which live in the wrapper derivation, + # so we need to fix the path to reference $out instead. + rm "$out/${fishCompletion}" + substitute "${zathura_core.out}/${fishCompletion}" "$out/${fishCompletion}" \ + --replace "${zathura_core.out}" "$out" + ''; meta = with lib; { - homepage = "https://git.pwmt.org/pwmt/zathura/"; - description = "A highly customizable and functional PDF viewer"; + homepage = "https://pwmt.org/projects/zathura/"; + description = "Highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the poppler rendering library and the GTK toolkit. The idea behind zathura @@ -32,7 +48,11 @@ symlinkJoin { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ smironov globin TethysSvensson ]; + maintainers = with maintainers; [ + smironov + globin + TethysSvensson + ]; mainProgram = "zathura"; }; } diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index 847d11c4f24ce..777c74a5dffe5 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -29,7 +29,7 @@ appimageTools.wrapType2 rec { ''; meta = with lib; { - description = "A markdown editor for writing academic texts and taking notes"; + description = "Markdown editor for writing academic texts and taking notes"; homepage = "https://www.zettlr.com"; platforms = [ "x86_64-linux" ]; license = licenses.gpl3; diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index 63675fa69abdb..c7fb80e8318b1 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "A simple and opinionated tool to build your own magazine"; + description = "Simple and opinionated tool to build your own magazine"; homepage = "https://github.com/zineland/zine"; changelog = "https://github.com/zineland/zine/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix index e565e1ecda75f..b05c12227fc0c 100644 --- a/pkgs/applications/misc/zk-shell/default.nix +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "A powerful & scriptable shell for Apache ZooKeeper"; + description = "Powerful & scriptable shell for Apache ZooKeeper"; mainProgram = "zk-shell"; homepage = "https://github.com/rgs1/zk_shell"; license = licenses.asl20; diff --git a/pkgs/applications/misc/zktree/default.nix b/pkgs/applications/misc/zktree/default.nix index c9d4786f05f57..82b93763ed821 100644 --- a/pkgs/applications/misc/zktree/default.nix +++ b/pkgs/applications/misc/zktree/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "18v7agm39acnblc703278cn8py5971hm8p5kxmznpw119fjp36s5"; meta = with lib; { - description = "A small tool to display Znodes in Zookeeper in tree structure."; + description = "Small tool to display Znodes in Zookeeper in tree structure"; homepage = "https://github.com/alirezameskin/zktree"; license = licenses.unlicense; maintainers = with lib.maintainers; [ alirezameskin ]; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index ccdac791e3369..79a5c72ddc8f7 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = [ python3 ]; meta = with lib; { - description = "A text scroller for use with panels and shells"; + description = "Text scroller for use with panels and shells"; mainProgram = "zscroll"; homepage = "https://github.com/noctuid/zscroll"; license = licenses.gpl3Plus; |