diff options
Diffstat (limited to 'pkgs/applications')
5 files changed, 44 insertions, 26 deletions
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 0c2776778b5..d1447b864ef 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0dwpczbxqy3rsqprdiakmqv6s3jzcg2wqxnf1znarx2qffb4ii9x"; - x86_64-darwin = "0si76v80r0vhl76gbdwbykk6acifhifz8sb8wiyiiywkinlxs19w"; - aarch64-linux = "0nwgdvvsblh2r72ys2ng5b084wizkdjd00mm73506mgbs8pzcky4"; - aarch64-darwin = "0qivq4077g5a4gwkskvvzxaa60w1gpgl67pmdyqn81rina04rdqs"; - armv7l-linux = "0myf96s1vdpllnw0vz0rpmyv2pfirv3p8pqgxxnpw860s2c26f2f"; + x86_64-linux = "0wf8bmzag49n81kjb46kj2nkksimm8f7cf4ihpqcw8k5iwasn3j9"; + x86_64-darwin = "1s7i5087bvckg66mcb32krv12vxhaw7ii9vm3i6p72wr0sv7dddh"; + aarch64-linux = "0yzh5javinvas3zz0lliyc77vbcs1jrmxbkr7nic4snscg6wjhcd"; + aarch64-darwin = "13l6ymz7v18s7ikxbwvkwb0f5ff2j82j5pfj04yy75kq9b5gh0vx"; + armv7l-linux = "129wffj9cidk9ysjpq3p0ddn6liwkmrkxhxgz7bqzj8sdhwyq8pz"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.62.2"; + version = "1.62.3"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index f5ea3f6f1af..3fce492a993 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "461"; + version = "462"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-fVqMSzQ4VhiRh6gDFApln1jioIDs80ceyV+ClNRhjKA="; + sha256 = "sha256-eHUztpnDs1kxaBlTO7BRbO3eH+On9m7aJtbNw2b9Ado="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index d2df076dc23..63a8b485df5 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec { distutils_extra intltool wrapGAppsHook + gdk-pixbuf ]; buildInputs = [ @@ -58,6 +59,7 @@ python3Packages.buildPythonApplication rec { pyinotify python-Levenshtein pyxdg + pycairo requests websocket-client ]; @@ -105,7 +107,10 @@ python3Packages.buildPythonApplication rec { # do not double wrap dontWrapGApps = true; preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : "${lib.makeBinPath [ wmctrl ]}" + ) ''; passthru = { diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix index 4028f8622c3..1435d247263 100644 --- a/pkgs/applications/networking/browsers/kristall/default.nix +++ b/pkgs/applications/networking/browsers/kristall/default.nix @@ -1,31 +1,44 @@ -{ lib, mkDerivation, fetchFromGitHub, qtbase, qtmultimedia }: +{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, qmake, qtmultimedia }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kristall"; version = "0.3"; + src = fetchFromGitHub { owner = "MasterQ32"; repo = "kristall"; - rev = "V" + version; + rev = "V${version}"; sha256 = "07nf7w6ilzs5g6isnvsmhh4qa1zsprgjyf0zy7rhpx4ikkj8c8zq"; }; - buildInputs = [ qtbase qtmultimedia ]; + postPatch = lib.optionalString stdenv.cc.isClang '' + sed -i '1i #include <errno.h>' src/browsertab.cpp + ''; + + nativeBuildInputs = [ wrapQtAppsHook qmake ]; + + buildInputs = [ qtmultimedia ]; qmakeFlags = [ "src/kristall.pro" ]; - installPhase = '' + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv kristall.app $out/Applications + '' else '' install -Dt $out/bin kristall install -D Kristall.desktop $out/share/applications/net.random-projects.kristall.desktop + install -D src/icons/kristall.svg $out/share/icons/hicolor/scalable/apps/net.random-projects.kristall.svg + for size in 16 32 64 128; do + install -D src/icons/kristall-''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/net.random-projects.kristall.png + done ''; - meta = with lib; - src.meta // { - description = - "Graphical small-internet client, supports gemini, http, https, gopher, finger"; - homepage = "https://random-projects.net/projects/kristall.gemini"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.gpl3; - inherit (qtmultimedia.meta) platforms; - }; + meta = with lib; { + description = + "Graphical small-internet client, supports gemini, http, https, gopher, finger"; + homepage = "https://random-projects.net/projects/kristall.gemini"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.gpl3Only; + inherit (qtmultimedia.meta) platforms; + }; } diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index bc192fe4218..ab5e54dab77 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.20.1"; + version = "3.21.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-GTOdJ4dxR491WU6WM47xLHO7RGUGXkdHuQIDxJvVvFE="; + sha256 = "sha256-w0frk1Nd1/HTo94VAbD7QjVuT8laPbmgd8ENTb0+89c="; }; hardeningDisable = [ "format" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The ultimate desktop calculator"; homepage = "http://qalculate.github.io"; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner doronbehar ]; license = licenses.gpl2Plus; platforms = platforms.all; }; |