diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-01 03:08:16 +0200 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-01 03:08:16 +0200 |
commit | 0eb4c474a0993d46bfab9b11066166155e102434 (patch) | |
tree | 9b3297caaa415d55e0b5d92db5be2233e780ec0a /pkgs/applications | |
parent | 8314cc67bfdc9e7752cf4c85686bafb4f4366794 (diff) | |
parent | 55ad6fff31059a6fc688518f71e90dcaa2b84e10 (diff) | |
download | nixpkgs-0eb4c474a0993d46bfab9b11066166155e102434.tar nixpkgs-0eb4c474a0993d46bfab9b11066166155e102434.tar.gz nixpkgs-0eb4c474a0993d46bfab9b11066166155e102434.tar.bz2 nixpkgs-0eb4c474a0993d46bfab9b11066166155e102434.tar.lz nixpkgs-0eb4c474a0993d46bfab9b11066166155e102434.tar.xz nixpkgs-0eb4c474a0993d46bfab9b11066166155e102434.tar.zst nixpkgs-0eb4c474a0993d46bfab9b11066166155e102434.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications')
31 files changed, 311 insertions, 500 deletions
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 5eb94f8445e..5f750a885d1 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "3.3.7"; + version = "3.3.11"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "13jr45kzv0xjhhqk30qpq793349qyx8jpas4kl6i6bk3xfrd3fbz"; + sha256 = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; @@ -36,11 +36,8 @@ stdenv.mkDerivation rec { cp -r opt/bitwig-studio $out/libexec ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio cp -r usr/share $out/share - substitute usr/share/applications/bitwig-studio.desktop \ - $out/share/applications/bitwig-studio.desktop \ - --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio - runHook postInstall + runHook postInstall ''; postFixup = '' @@ -60,7 +57,6 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" done - ''; meta = with lib; { diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix index d690f5e0671..a8db24c3528 100644 --- a/pkgs/applications/graphics/hdrmerge/default.nix +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -3,7 +3,6 @@ , fetchpatch , fetchFromGitHub , cmake -, extra-cmake-modules , qtbase , wrapQtAppsHook , libraw @@ -17,12 +16,12 @@ mkDerivation rec { pname = "hdrmerge"; - version = "unstable-2020-11-12"; + version = "unstable-2023-01-04"; src = fetchFromGitHub { owner = "jcelaya"; repo = "hdrmerge"; - rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da"; - sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz"; + rev = "ca38b54f980564942a7f2b014a5f57a64c1d9019"; + hash = "sha256-DleYgpDXP0NvbmEURXnBfe3OYnT1CaQq+Mw93JQQprE="; }; nativeBuildInputs = [ @@ -39,17 +38,11 @@ mkDerivation rec { ]; patches = [ + # https://github.com/jcelaya/hdrmerge/pull/222 (fetchpatch { - # patch FindAlglib.cmake to respect ALGLIB_DIR - # see https://github.com/jcelaya/hdrmerge/pull/213 - name = "patch-hdrmerge-CMake.patch"; - url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch"; - sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi"; - }) - (fetchpatch { - name = "support-libraw-0.21.patch"; - url = "https://github.com/jcelaya/hdrmerge/commit/779e566b3e2807280b78c79affda2cdfa64bde87.diff"; - sha256 = "48sivCfJWEtGiBXTrO+SWTVlT9xyx92w2kkB8Wt/clk="; + name = "exiv2-0.28.patch"; + url = "https://github.com/jcelaya/hdrmerge/commit/377d8e6f3c7cdd1a45b63bce2493ad177dde03fb.patch"; + hash = "sha256-lXHML6zGkVeWKvmY5ECoJL2xjmtZz77XJd5prpgJiZo="; }) ]; diff --git a/pkgs/applications/graphics/nufraw/default.nix b/pkgs/applications/graphics/nufraw/default.nix index f6031bea069..8b5966bbaf0 100644 --- a/pkgs/applications/graphics/nufraw/default.nix +++ b/pkgs/applications/graphics/nufraw/default.nix @@ -1,6 +1,7 @@ -{ stdenv +{ lib +, stdenv , fetchurl -, lib +, fetchpatch , autoreconfHook , bzip2 @@ -49,14 +50,28 @@ stdenv.mkDerivation rec { "--enable-dst-correction" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + postInstall = lib.optionalString addThumbnailer '' mkdir -p $out/share/thumbnailers substituteAll ${./nufraw.thumbnailer} $out/share/thumbnailers/${pname}.thumbnailer ''; - # Fixes an upstream issue where headers with templates were included in an extern-C scope - # which caused the build to fail - patches = [ ./move-extern-c.patch ]; + patches = [ + # Fixes an upstream issue where headers with templates were included in an extern-C scope + # which caused the build to fail + (fetchpatch { + name = "0001-nufraw-glib-2.70.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0001-nufraw-glib-2.70.patch"; + hash = "sha256-XgzgjikWTcqymHa7bKmruNZaeb2/lpN19HXoRUt5rTk="; + }) + ] ++ lib.optionals (lib.versionAtLeast exiv2.version "0.28") [ + (fetchpatch { + name = "0002-exiv2-error.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0002-exiv2-error.patch"; + hash = "sha256-40/Wwk1sWiaIWp077EYgP8jFO4k1cvf30heRDMYJw3M="; + }) + ]; meta = with lib; { homepage = "https://nufraw.sourceforge.io/"; @@ -70,6 +85,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ asbachb ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/nufraw/move-extern-c.patch b/pkgs/applications/graphics/nufraw/move-extern-c.patch deleted file mode 100644 index 43a4942d3e6..00000000000 --- a/pkgs/applications/graphics/nufraw/move-extern-c.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/uf_glib.h b/uf_glib.h -index c1a17bd..8a10800 100644 ---- a/uf_glib.h -+++ b/uf_glib.h -@@ -13,13 +13,13 @@ - #ifndef _UF_GLIB_H - #define _UF_GLIB_H - -+#include <glib.h> -+#include <glib/gstdio.h> -+ - #ifdef __cplusplus - extern "C" { - #endif - --#include <glib.h> --#include <glib/gstdio.h> -- - // g_win32_locale_filename_from_utf8 is needed only on win32 - #ifdef _WIN32 - #define uf_win32_locale_filename_from_utf8(__some_string__) \ diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 3b17ce8fd4f..fed2c944e5c 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,28 +1,70 @@ -{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw -, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols2, qttools, qtgraphicaleffects -, extra-cmake-modules, poppler, kimageformats, libarchive, pugixml, wrapQtAppsHook}: +{ lib +, stdenv +, fetchurl +, cmake +, extra-cmake-modules +, qttools +, wrapQtAppsHook +, exiv2 +, graphicsmagick +, kimageformats +, libarchive +, libraw +, mpv +, poppler +, pugixml +, qtbase +, qtdeclarative +, qtgraphicaleffects +, qtmultimedia +, qtquickcontrols +, qtquickcontrols2 +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "photoqt"; - version = "3.1"; + version = "3.3"; src = fetchurl { - url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz"; - hash = "sha256-hihfqE7XIlSAxPg3Kzld3LrYS97wDH//GGqpBpBwFm0="; + url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; + hash = "sha256-AD+Uww/tmXRiAkmeuHBBollE6Y9L7c+fB882ALVtSXQ="; }; - nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ]; + # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'? + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace cplusplus/main.cpp \ + --replace "std::setlocale" "setlocale" + ''; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + qttools + wrapQtAppsHook + ]; buildInputs = [ - qtbase qtquickcontrols2 exiv2 graphicsmagick poppler - qtmultimedia qtdeclarative libraw qtgraphicaleffects - kimageformats libarchive pugixml + exiv2 + graphicsmagick + kimageformats + libarchive + libraw + mpv + poppler + pugixml + qtbase + qtdeclarative + qtgraphicaleffects + qtmultimedia + qtquickcontrols + qtquickcontrols2 ]; cmakeFlags = [ - "-DFREEIMAGE=OFF" "-DDEVIL=OFF" "-DCHROMECAST=OFF" + "-DFREEIMAGE=OFF" + "-DIMAGEMAGICK=OFF" ]; preConfigure = '' @@ -30,9 +72,11 @@ mkDerivation rec { ''; meta = { - homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; + homepage = "https://photoqt.org/"; license = lib.licenses.gpl2Plus; + mainProgram = "photoqt"; + maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 5044e60161c..738f78cf347 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,18 +1,26 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, wrapQtAppsHook, qtbase, exiv2 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "phototonic"; version = "2.1"; src = fetchFromGitHub { - repo = "phototonic"; owner = "oferkv"; + repo = "phototonic"; rev = "v${version}"; - sha256 = "0csidmxl1sfmn6gq81vn9f9jckb4swz3sgngnwqa4f75lr6604h7"; + hash = "sha256-BxJgTKblOKIwt88+PT7XZE0mk0t2B4SfsdXpQHttUTM="; }; + patches = [ + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/phototonic/-/raw/fcfa17307ad8988750cc09200188c9365c2c0b79/exiv2-0.28.patch"; + hash = "sha256-EayJYM4qobUWosxV2Ylj+2eiyhk1jM8OfnFZDbVdGII="; + }) + ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; buildInputs = [ qtbase exiv2 ]; - nativeBuildInputs = [ qmake ]; preConfigure = '' sed -i 's;/usr;$$PREFIX/;g' phototonic.pro @@ -20,9 +28,9 @@ mkDerivation rec { meta = with lib; { description = "An image viewer and organizer"; - homepage = "https://sourceforge.net/projects/phototonic/"; - license = licenses.gpl3; - platforms = platforms.linux; + homepage = "https://github.com/oferkv/phototonic"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/maui/booth.nix b/pkgs/applications/maui/booth.nix index 0f753832ad1..f8205589585 100644 --- a/pkgs/applications/maui/booth.nix +++ b/pkgs/applications/maui/booth.nix @@ -7,6 +7,7 @@ , kirigami2 , mauikit , mauikit-filebrowsing +, prison , qtgraphicaleffects , qtmultimedia , qtquickcontrols2 @@ -27,6 +28,7 @@ mkDerivation { kirigami2 mauikit mauikit-filebrowsing + prison qtgraphicaleffects qtmultimedia qtquickcontrols2 diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix index 5379910c880..b64a3d8455e 100644 --- a/pkgs/applications/maui/default.nix +++ b/pkgs/applications/maui/default.nix @@ -61,6 +61,7 @@ let mauikit = callPackage ./mauikit.nix { }; mauikit-accounts = callPackage ./mauikit-accounts.nix { }; mauikit-calendar = callPackage ./mauikit-calendar { }; + mauikit-documents = callPackage ./mauikit-documents.nix { }; mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { }; mauikit-imagetools = callPackage ./mauikit-imagetools.nix { }; mauikit-terminal = callPackage ./mauikit-terminal.nix { }; diff --git a/pkgs/applications/maui/mauikit-documents.nix b/pkgs/applications/maui/mauikit-documents.nix new file mode 100644 index 00000000000..19d8e9faa20 --- /dev/null +++ b/pkgs/applications/maui/mauikit-documents.nix @@ -0,0 +1,44 @@ +{ lib +, mkDerivation +, cmake +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kfilemetadata +, kguiaddons +, ki18n +, kiconthemes +, kio +, mauikit +, poppler +}: + +mkDerivation { + pname = "mauikit-documents"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + karchive + kconfig + kcoreaddons + kfilemetadata + kguiaddons + ki18n + kiconthemes + kio + mauikit + poppler + ]; + + meta = { + homepage = "https://invent.kde.org/maui/mauikit-documents"; + description = "MauiKit QtQuick plugins for text editing"; + license = with lib.licenses; [ bsd2 lgpl21Plus ]; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/maui/shelf.nix b/pkgs/applications/maui/shelf.nix index 3942b9a34d6..3ac80451253 100644 --- a/pkgs/applications/maui/shelf.nix +++ b/pkgs/applications/maui/shelf.nix @@ -9,6 +9,7 @@ , kio , kirigami2 , mauikit +, mauikit-documents , mauikit-filebrowsing , mauikit-texteditor , qtmultimedia @@ -32,6 +33,7 @@ mkDerivation { kio kirigami2 mauikit + mauikit-documents mauikit-filebrowsing mauikit-texteditor qtmultimedia diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix index 2221ae4a42f..6473b9607bf 100644 --- a/pkgs/applications/maui/srcs.nix +++ b/pkgs/applications/maui/srcs.nix @@ -4,19 +4,19 @@ { agenda = { - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "${mirror}/stable/maui/agenda/0.5.0/agenda-0.5.0.tar.xz"; - sha256 = "1ak87cda64c05knzdjf6sxjn70chs2sa6zh2adhq3mqm3dh9flf7"; - name = "agenda-0.5.0.tar.xz"; + url = "${mirror}/stable/maui/agenda/0.5.1/agenda-0.5.1.tar.xz"; + sha256 = "1c45fnlg15pjd3ljmm3w2jcrq94jirrykpq1xrvgfbv5d50796x7"; + name = "agenda-0.5.1.tar.xz"; }; }; arca = { - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "${mirror}/stable/maui/arca/0.5.0/arca-0.5.0.tar.xz"; - sha256 = "12bqk5dxh1rqnbj61kymkzzgmilas6jilid4rijdgjaahdahw6hk"; - name = "arca-0.5.0.tar.xz"; + url = "${mirror}/stable/maui/arca/0.5.1/arca-0.5.1.tar.xz"; + sha256 = "0irbc1ysnia5wp398ddijad77qg7gd076fkm972wgk4pmqnm0rcz"; + name = "arca-0.5.1.tar.xz"; }; }; bonsai = { @@ -28,35 +28,35 @@ }; }; booth = { - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "${mirror}/stable/maui/booth/1.1.0/booth-1.1.0.tar.xz"; - sha256 = "1jr5iha1lvqnsh29y6k60nd63dqyh1clj8idqssfvaz09skbyk1q"; - name = "booth-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/booth/1.1.1/booth-1.1.1.tar.xz"; + sha256 = "1s3h083qbjjj5dmm27vc66vx0mzgpl4klhi9cc07z3apjldf1si0"; + name = "booth-1.1.1.tar.xz"; }; }; buho = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/buho/3.0.0/buho-3.0.0.tar.xz"; - sha256 = "1426b9wr8l8rzxgyahlchv9d4dgpqz5dr5nza3jax6mlh4ams507"; - name = "buho-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/buho/3.0.1/buho-3.0.1.tar.xz"; + sha256 = "0favgdwnb8gvmpisq58bmjvnajzgdk886z5m07vz4mfj7ipjjzbv"; + name = "buho-3.0.1.tar.xz"; }; }; clip = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/clip/3.0.0/clip-3.0.0.tar.xz"; - sha256 = "0a6z4h5rp3kmy5pp37df0abvbqxd6hx1jkss9w2sh59v8zijvrck"; - name = "clip-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/clip/3.0.1/clip-3.0.1.tar.xz"; + sha256 = "1acjnam8ljc6mw7xbphh99li9437kqlmdb258j7w3vgnqh2psipx"; + name = "clip-3.0.1.tar.xz"; }; }; communicator = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/communicator/3.0.0/communicator-3.0.0.tar.xz"; - sha256 = "01qgqirjax3l8sn9813dl6ppz9p2syg83ljrxqgaj94h08ll2vi0"; - name = "communicator-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/communicator/3.0.1/communicator-3.0.1.tar.xz"; + sha256 = "1j4yaw8w1hyvndra881r70ayz4ph00w41hhysqhgccxr36abcncl"; + name = "communicator-3.0.1.tar.xz"; }; }; era = { @@ -68,123 +68,123 @@ }; }; fiery = { - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "${mirror}/stable/maui/fiery/1.1.0/fiery-1.1.0.tar.xz"; - sha256 = "16kwi6gwxzrb2c8x9s97ibsflv30j3z3sp2if6ypand74ni1b4px"; - name = "fiery-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/fiery/1.1.1/fiery-1.1.1.tar.xz"; + sha256 = "03aszdvksx5bsrh479wl6vq28l026ddfv8p9privigjpcdbbaslk"; + name = "fiery-1.1.1.tar.xz"; }; }; index-fm = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/index/3.0.0/index-fm-3.0.0.tar.xz"; - sha256 = "1w9fdwn7yvy389300p8qhb3795zzaqkqfrc1vnxydgzn995yv80w"; - name = "index-fm-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/index/3.0.1/index-fm-3.0.1.tar.xz"; + sha256 = "046in0bqblpqcxp4rz417pjpy1m57p611wlzdsw8hp4dl1l2qmn9"; + name = "index-fm-3.0.1.tar.xz"; }; }; mauikit = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit/3.0.0/mauikit-3.0.0.tar.xz"; - sha256 = "1n95fcwgda9m9fmc90q0079xx4m9yh99yd51pj0nw7ynazlq2wyy"; - name = "mauikit-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit/3.0.1/mauikit-3.0.1.tar.xz"; + sha256 = "0vlxs13k3wk2kk3jcxrdmpa3d9gblvzp22sqqd7nys6kilq8kzdb"; + name = "mauikit-3.0.1.tar.xz"; }; }; mauikit-accounts = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-accounts/3.0.0/mauikit-accounts-3.0.0.tar.xz"; - sha256 = "0ff7zrlvhqfsnwbfbp5bz3vgxldxl09rlaajz4g9k7n81apa0fgv"; - name = "mauikit-accounts-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-accounts/3.0.1/mauikit-accounts-3.0.1.tar.xz"; + sha256 = "1b6nmnh5fh6gis7r56s41204g9y7cp5g2qmsk0r6b3a3x0ndwmqj"; + name = "mauikit-accounts-3.0.1.tar.xz"; }; }; mauikit-calendar = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-calendar/1.1.0/mauikit-calendar-1.1.0.tar.xz"; - sha256 = "1532ndxw6a2isw1zxhp5khk0ydczm03d7b42c5smjy56fkp7xmgx"; - name = "mauikit-calendar-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-calendar/3.0.1/mauikit-calendar-3.0.1.tar.xz"; + sha256 = "1s95nkbyc4k8999hsnr5aw80qhr66q4z51wq2ail3h0df7p1f700"; + name = "mauikit-calendar-3.0.1.tar.xz"; }; }; mauikit-documents = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-documents/1.1.0/mauikit-documents-1.1.0.tar.xz"; - sha256 = "06r5jf0rmrry9hd0gbjz63a0f5r8dykkggww531jaqm898h79wrs"; - name = "mauikit-documents-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-documents/3.0.1/mauikit-documents-3.0.1.tar.xz"; + sha256 = "1w2dszggxbqla5ab3739l1j79l2qa3br8drvkidivir8vwxifj3v"; + name = "mauikit-documents-3.0.1.tar.xz"; }; }; mauikit-filebrowsing = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.0/mauikit-filebrowsing-3.0.0.tar.xz"; - sha256 = "03qdiww4dh6picsfhmzg0v5mf3ygsnprwq3x6s1lzlanl5a83pyk"; - name = "mauikit-filebrowsing-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.1/mauikit-filebrowsing-3.0.1.tar.xz"; + sha256 = "0z8070p1m2c2mv3xdhsz4scnasbwxf698mql0svqzmjiy8vjfnn2"; + name = "mauikit-filebrowsing-3.0.1.tar.xz"; }; }; mauikit-imagetools = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-imagetools/3.0.0/mauikit-imagetools-3.0.0.tar.xz"; - sha256 = "0lj8d6k78xiy3wcc2jhhqvdw0p5vji95280dvclkmh0ilvb7lfrd"; - name = "mauikit-imagetools-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-imagetools/3.0.1/mauikit-imagetools-3.0.1.tar.xz"; + sha256 = "0aayhmmk6bd3n5p1mgm9k1jycsw8li5fs1xq7x42h93zhvxcw1va"; + name = "mauikit-imagetools-3.0.1.tar.xz"; }; }; mauikit-terminal = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-terminal/1.1.0/mauikit-terminal-1.1.0.tar.xz"; - sha256 = "0aki6m39yy2cnq3v6mdgyzld3slp0k5qd7v5g5hqb38mrbsbl66a"; - name = "mauikit-terminal-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-terminal/3.0.1/mauikit-terminal-3.0.1.tar.xz"; + sha256 = "1w7d04cdq2b4mkjl7ngj1v580dlhrpvr1n0gy5jcfv6x4ia3g8k3"; + name = "mauikit-terminal-3.0.1.tar.xz"; }; }; mauikit-texteditor = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-texteditor/3.0.0/mauikit-texteditor-3.0.0.tar.xz"; - sha256 = "1flbgsrp91fgv9m1xvlzsng3ks94i07k79832nx2azzs4g704sgf"; - name = "mauikit-texteditor-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-texteditor/3.0.1/mauikit-texteditor-3.0.1.tar.xz"; + sha256 = "063zxzc530zgamr6fm5brm2rqpmq4rx4wsq7cx7sxfgyknag52m6"; + name = "mauikit-texteditor-3.0.1.tar.xz"; }; }; mauiman = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauiman/1.1.0/mauiman-1.1.0.tar.xz"; - sha256 = "13s6wvp7h4zivw2m4hblsyha9qkihfqx41gh9jyw9pj8kmfp08v5"; - name = "mauiman-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauiman/3.0.1/mauiman-3.0.1.tar.xz"; + sha256 = "0nygvb0nixcidla94xhwa4rrdwi3r2kcq62m9a3sabpl0z22mppq"; + name = "mauiman-3.0.1.tar.xz"; }; }; nota = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/nota/3.0.0/nota-3.0.0.tar.xz"; - sha256 = "0jk18qxkcx6n54pnm4mr2vpnhi07hscavacr1kijk4rxf0dyxf1i"; - name = "nota-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/nota/3.0.1/nota-3.0.1.tar.xz"; + sha256 = "1ynnpkwjmj9xx5xzlz32y0k6mcrz2y50z1s4lq5kshiwa3vbjn61"; + name = "nota-3.0.1.tar.xz"; }; }; pix = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/pix/3.0.0/pix-3.0.0.tar.xz"; - sha256 = "1h82c3xip1s3ii5f1maq5d9invgbxzarai8ba6c274lkv70yv1ni"; - name = "pix-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/pix/3.0.1/pix-3.0.1.tar.xz"; + sha256 = "1c1fz21x324r606ab7qsnbqpz3xvc4b6794xbf7vm6p7cfsgkdq7"; + name = "pix-3.0.1.tar.xz"; }; }; shelf = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/shelf/3.0.0/shelf-3.0.0.tar.xz"; - sha256 = "1944626qyxyybd8asfs00mkvljykz5ndxmnmi4jiz01j0xc70dyd"; - name = "shelf-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/shelf/3.0.1/shelf-3.0.1.tar.xz"; + sha256 = "02qg37qpfccan3n87pbq3i7zyl22g32ipr8smbdcpwdyhxz1v00q"; + name = "shelf-3.0.1.tar.xz"; }; }; station = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/station/3.0.0/station-3.0.0.tar.xz"; - sha256 = "04kidqm8hcxf8l1r6qi5bfxg6rkdy77i4inzgsgf3i7ky6gvah96"; - name = "station-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/station/3.0.1/station-3.0.1.tar.xz"; + sha256 = "11nbhax5xxrypy6ly5i609yvg7n754fhwjdpbf8c5c8j7285lnbz"; + name = "station-3.0.1.tar.xz"; }; }; strike = { @@ -196,11 +196,11 @@ }; }; vvave = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/vvave/3.0.0/vvave-3.0.0.tar.xz"; - sha256 = "1x2vbmc3qk2kgx64dm8k5xm16vlvnhfnhgzv5kx1qxpr7kr3vif8"; - name = "vvave-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/vvave/3.0.1/vvave-3.0.1.tar.xz"; + sha256 = "0z7y27sdwcpxh0jr8k0h17rk0smljvky28ck741ysxqdv992bbk9"; + name = "vvave-3.0.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 7f783eb371e..a2262134f66 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.12.16"; + version = "2.12.18"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -17,9 +17,9 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "sha256-9ib8lymmSINqC0oXUxkKcpKfPh7qmU3YytU1/4aKMLg="; - x86_64-darwin = "sha256-vWc5yx3i5Ru8vrQbrTQwr43ZMBzOAb9254cxTHg6A/Q="; - aarch64-darwin = "sha256-dhwPqT+zfBYOVUV5JprPfgrSJR2ZNsC3LJmRHGJVM4k="; + x86_64-linux = "1fwcqgqni7d9x0prdy3p8ccc5lzgn57rhph4498vs1q40kyq8823"; + x86_64-darwin = "sha256-atd7nkefLvilTq39nTLbXQhm1zzBCHOLL7MRJwlTSMk="; + aarch64-darwin = "sha256-xiWXD+ULSVJ80uruYz0uRFkDRT1QOUd6FSWDKK9yLMc="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch b/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch deleted file mode 100644 index 4555f8a8704..00000000000 --- a/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c -index eb672f06..f0f546da 100644 ---- a/types/wlr_output_layout.c -+++ b/types/wlr_output_layout.c -@@ -242,6 +242,9 @@ bool wlr_output_layout_contains_point(struct wlr_output_layout *layout, - if (reference) { - struct wlr_output_layout_output *l_output = - wlr_output_layout_get(layout, reference); -+ if (!l_output) { -+ return false; -+ } - struct wlr_box *box = output_layout_output_get_box(l_output); - return wlr_box_contains_point(box, lx, ly); - } else { \ No newline at end of file diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index babd3578d25..10342269d6f 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitLab +, fetchurl , fetchpatch , meson , ninja @@ -16,6 +16,7 @@ , libdrm , libxkbcommon , wlroots +, xorg }: let @@ -25,43 +26,19 @@ let # https://source.puri.sm/Librem5/phosh/-/issues/422 (fetchpatch { name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; - url = "https://source.puri.sm/Librem5/wlroots/-/commit/4f66b0931aaaee65367102e9c4ccb736097412c7.patch"; - hash = "sha256-2Vy5a4lWh8FP2PN6xRIZv6IlUuLZibT0MYW+EyvVULs="; + url = "https://gitlab.gnome.org/World/Phosh/phoc/-/raw/acb17171267ae0934f122af294d628ad68b09f88/subprojects/packagefiles/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; + hash = "sha256-uNJaYwkZImkzNUEqyLCggbXAoIRX5h2eJaGbSHj1B+o="; }) - - # xdg-activation: Deduplicate token creation code - (fetchpatch { - name = "xdg-activation-deduplicate-token-creation-code.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/dd03d839ab56c3e5d7c607a8d76e58e0b75edb85.patch"; - sha256 = "sha256-mxt68MISC24xpaBtVSc1F2W4cyNs5wQowtbUQH9Eqr8="; - }) - - # seat: Allow to cancel touches - (fetchpatch { - name = "seat-Allow-to-cancel-touches.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/17b2b06633729f1826715c1d0b84614aa3cedb3a.patch"; - sha256 = "sha256-BAeXa3ZB5TXnlq0ZP2+rZlVXEPWpLP4Wi4TLwoXjkz4="; - }) - - # From - # https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/13fcdba75cf5f21cfd49c1a05f4fa62f77619b40 - # which has been merged upstream, but doesn't cleanly apply on to the - # latest released version. - ./0001-handle-outputs-that-arent-in-the-layout.patch ]; }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.27.0"; + version = "0.31.0"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - group = "World"; - owner = "Phosh"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-4/Fxo72KXLy3gxXMS+PrTUbZl0EFt2GPMXg8+/fE7MY="; - fetchSubmodules = true; + src = fetchurl { + # This tarball includes the meson wrapped subproject 'gmobile'. + url = "https://storage.puri.sm/releases/phoc/phoc-${version}.tar.xz"; + hash = "sha256-P7Bs9JMv6KNKo4d2ID0/Ba4+Nel6DMn8o4I7EDvY4vY="; }; nativeBuildInputs = [ @@ -83,6 +60,7 @@ in stdenv.mkDerivation rec { gnome.mutter wayland phocWlroots + xorg.xcbutilwm ]; mesonFlags = ["-Dembed-wlroots=disabled"]; diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 173e50d1751..66a9eedeff6 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-YjRbrhJSbX1OLEc7A72ubg1KtzJSWY0KphD4d8dAKQ8="; + hash = "sha256-thpVcJ1HRhoOAli7829zM4fermEcS9FwzKX7ZjHGhZg="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-OZ/eui+LR+Gn1nmu9wryGmz3jiUMuDScmTZ5G8UKWP8="; + vendorHash = "sha256-S7fahA+ykviQoWc7p0CcTGfouswxQNBn4HH+tbl0fbI="; proxyVendor = true; # Exclude broken genji, hive & impala drivers (bad group) @@ -73,6 +73,7 @@ buildGoModule rec { homepage = "https://github.com/xo/usql"; changelog = "https://github.com/xo/usql/releases/tag/v${version}"; license = licenses.mit; + mainProgram = "usql"; maintainers = with maintainers; [ georgyo anthonyroussel ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 250355aa428..e062a3d1515 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "43.3"; + version = "44.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-GNICAk9SPrLc+zm3tHVwkQdiS20j4MVktGIbNWEEMHs="; + hash = "sha256-mdv/yDUi6tzYc3C7dtmkAWtk4IqzHvOZVO2CA3TP9TE="; }; outputs = [ "out" "devdoc" ]; diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix deleted file mode 100644 index 733e4c04a9c..00000000000 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchzip }: - -stdenv.mkDerivation rec { - pname = "octant"; - version = "0.25.1"; - - src = - let - inherit (stdenv.hostPlatform) system; - suffix = { - x86_64-linux = "Linux-64bit"; - aarch64-linux = "Linux-arm64"; - x86_64-darwin = "macOS-64bit"; - aarch64-darwin = "macOS-arm64"; - }.${system} or (throw "Unsupported system: ${system}"); - fetchsrc = version: sha256: fetchzip { - url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/octant_${version}_${suffix}.tar.gz"; - sha256 = sha256.${system}; - }; - in - fetchsrc version { - x86_64-linux = "sha256-bYqycTB036J8trojySPNkC+jrw76F7+N4I4puGCyalU="; - aarch64-linux = "sha256-DlzSIZCAASPnflXQ8ndPU7/0jXA18U4bGGOfmgLXPr0="; - x86_64-darwin = "sha256-FaPyrPzO7AzC6LHQP5c58NjLTqU+ei8vFffT8x6mUhQ="; - aarch64-darwin = "sha256-31CYhAsHYIVAenp8hFHYj8LhFf3lSiOTw7gULBu3gio="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - install -D octant $out/bin/octant - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/octant --help - $out/bin/octant version | grep "${version}" - runHook postInstallCheck - ''; - - dontPatchELF = true; - dontPatchShebangs = true; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - homepage = "https://octant.dev/"; - changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md"; - description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters"; - longDescription = '' - Octant is a tool for developers to understand how applications run on a - Kubernetes cluster. - It aims to be part of the developer's toolkit for gaining insight and - approaching complexity found in Kubernetes. Octant offers a combination of - introspective tooling, cluster navigation, and object management along - with a plugin system to further extend its capabilities. - ''; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix deleted file mode 100644 index fc48ce1e9ef..00000000000 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, appimageTools, fetchurl, undmg }: - -let - pname = "octant-desktop"; - version = "0.23.0"; - name = "${pname}-${version}"; - - inherit (stdenv.hostPlatform) system; - - suffix = { - x86_64-linux = "AppImage"; - x86_64-darwin = "dmg"; - }.${system} or (throw "Unsupported system: ${system}"); - - src = fetchurl { - url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; - sha256 = { - x86_64-linux = "sha256-K4z6SVCiuqy3xkWMWpm8KM7iYVXyKcnERljMG3NEFMw="; - x86_64-darwin = "sha256-WYra0yw/aPW/wUGrlIn5ud3kjFTkekYEi2LWZcYO5Nw="; - }.${system}; - }; - - linux = appimageTools.wrapType2 { - inherit name src passthru meta; - - profile = '' - export LC_ALL=C.UTF-8 - ''; - - multiArch = false; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - extraInstallCommands = - let appimageContents = appimageTools.extractType2 { inherit name src; }; in - '' - mv $out/bin/{${name},${pname}} - install -Dm444 ${appimageContents}/octant.desktop -t $out/share/applications - substituteInPlace $out/share/applications/octant.desktop \ - --replace 'Exec=AppRun --no-sandbox' 'Exec=${pname}' - install -m 444 -D ${appimageContents}/octant.png \ - $out/share/icons/hicolor/512x512/apps/octant.png - ''; - }; - - darwin = stdenv.mkDerivation { - inherit name src passthru meta; - - nativeBuildInputs = [ undmg ]; - sourceRoot = "Octant.app"; - installPhase = '' - mkdir -p $out/Applications/Octant.app - cp -R . $out/Applications/Octant.app - ''; - }; - - passthru = { updateScript = ./update-desktop.sh; }; - - meta = with lib; { - homepage = "https://octant.dev/"; - changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md"; - description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters"; - longDescription = '' - Octant is a tool for developers to understand how applications run on a - Kubernetes cluster. - It aims to be part of the developer's toolkit for gaining insight and - approaching complexity found in Kubernetes. Octant offers a combination of - introspective tooling, cluster navigation, and object management along - with a plugin system to further extend its capabilities. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - }; - -in -if stdenv.isDarwin -then darwin -else linux diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix deleted file mode 100644 index f59b8d26de0..00000000000 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "starboard-octant-plugin"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "aquasecurity"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-JTSZtIRVFdUjhQsp2EMukeoVIo6nNx4xofq+3iOZUIk="; - }; - - vendorHash = "sha256-1zrB+CobUBgdpBHRJPpfDYCD6oVWY4j4Met9EqNQQbE="; - - ldflags = [ - "-s" "-w" - ]; - - meta = with lib; { - homepage = "https://github.com/aquasecurity/starboard-octant-plugin"; - changelog = "https://github.com/aquasecurity/starboard-octant-plugin/releases/tag/v${version}"; - description = "Octant plugin for viewing Starboard security information"; - longDescription = '' - This is an Octant plugin for Starboard which provides visibility into vulnerability assessment reports for - Kubernetes workloads stored as custom security resources. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - }; -} diff --git a/pkgs/applications/networking/cluster/octant/update-desktop.sh b/pkgs/applications/networking/cluster/octant/update-desktop.sh deleted file mode 100755 index 4450834b4b7..00000000000 --- a/pkgs/applications/networking/cluster/octant/update-desktop.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/desktop.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find desktop.nix in $ROOT" - exit 1 -fi - -fetch_arch() { - VER="$1"; SUFFIX="$2" - URL="https://github.com/vmware-tanzu/octant/releases/download/v${VER}/Octant-${VER}.${SUFFIX}" - nix-prefetch "{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - pname = \"octant-desktop\"; version = \"${VER}\"; - src = fetchurl { url = \"$URL\"; }; -} -" -} - -replace_sha() { - sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" -} - -OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') - -OCTANT_DESKTOP_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "AppImage") -OCTANT_DESKTOP_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "dmg") - -sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" - -replace_sha "x86_64-linux" "$OCTANT_DESKTOP_LINUX_X64_SHA256" -replace_sha "x86_64-darwin" "$OCTANT_DESKTOP_DARWIN_X64_SHA256" diff --git a/pkgs/applications/networking/cluster/octant/update.sh b/pkgs/applications/networking/cluster/octant/update.sh deleted file mode 100755 index 3e2b56b7a61..00000000000 --- a/pkgs/applications/networking/cluster/octant/update.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/default.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find default.nix in $ROOT" - exit 1 -fi - -fetch_arch() { - VER="$1"; ARCH="$2" - URL="https://github.com/vmware-tanzu/octant/releases/download/v${VER}/octant_${VER}_${ARCH}.tar.gz" - nix-prefetch "{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = \"octant\"; version = \"${VER}\"; - src = fetchzip { url = \"$URL\"; }; -} -" -} - -replace_sha() { - sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" -} - -OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') - -OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit") -OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64") -OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit") -OCTANT_DARWIN_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-arm64") - -sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" - -replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256" -replace_sha "aarch64-linux" "$OCTANT_LINUX_AARCH64_SHA256" -replace_sha "x86_64-darwin" "$OCTANT_DARWIN_X64_SHA256" -replace_sha "aarch64-darwin" "$OCTANT_DARWIN_AARCH64_SHA256" diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index d749e350962..4fd9a36b0f5 100644 --- a/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "abaddon"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "uowuo"; repo = "abaddon"; rev = "v${version}"; - hash = "sha256-KrBZESYab7QFwUfpTl40cgKn/if31oqA9oCe0PwoYbs="; + hash = "sha256-Rz3c6RMZUiKQ0YKKQkCEkelfIGUq+xVmgNskj7uEjGI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 8d15b8e466b..d4877da6942 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.taha ]; + mainProgram = "twt"; }; } diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 089521233b7..4ed7a286c46 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.15.12.22445"; - versions.x86_64-darwin = "5.15.12.22445"; - versions.x86_64-linux = "5.15.12.7665"; + versions.aarch64-darwin = "5.16.1.23158"; + versions.x86_64-darwin = "5.16.1.23158"; + versions.x86_64-linux = "5.16.1.8561"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-pTpNbKmJGTxRIrfD/zWIrkouhCbErxu9Gjy9mDdTtHc="; + hash = "sha256-D3eYHbnNSLLmOh7eIT2+J7PubhBZONqHThB6ibJLqGY="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-EItKg22id/e7OfJaWxxJdl9B+3nDHNl6ENvfGR4QJ6Y="; + hash = "sha256-kvnaHwwWUiJmNsef6H5S/JHHtQgfFJd9rWwzTvi05g0="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-DMFMLwxPt1LV4Qhhrw6gdToe0z9743hGcxVWeR4O1YU="; + hash = "sha256-zT0qGl8ODIcBISiRQ184aVr9hE8ZHnYatolqcsS6dpo="; }; }; diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index ed2817ed10a..019da469512 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -3,37 +3,38 @@ , fetchFromGitHub , cmake , openssl -, protobuf3_19 +, protobuf3_21 , catch2 , boost181 , icu }: let boost = boost181.override { enableStatic = true; }; + protobuf = protobuf3_21.override { enableShared = false; }; in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; version = "3.1.0"; - src = fetchFromGitHub { - owner = "aws-samples"; - repo = "aws-iot-securetunneling-localproxy"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY="; - }; + src = fetchFromGitHub { + owner = "aws-samples"; + repo = "aws-iot-securetunneling-localproxy"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY="; + }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl protobuf3_19 catch2 boost icu ]; + buildInputs = [ openssl protobuf catch2 boost icu ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - meta = with lib; { - description = "AWS IoT Secure Tunneling Local Proxy Reference Implementation C++"; - homepage = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy"; - license = licenses.asl20; - maintainers = with maintainers; [spalf]; - platforms = platforms.unix; - }; - }) + meta = with lib; { + description = "AWS IoT Secure Tunneling Local Proxy Reference Implementation C++"; + homepage = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy"; + license = licenses.asl20; + maintainers = with maintainers; [ spalf ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 6629c7f0ae3..2d9148b4821 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.2.2"; + version = "6.3.0"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256-i6VLKGHst6gykXOpkt+VFMkdm9RLAWVgAhQ2UZ7Lt5Y="; + sha256 = "sha256-axdkoqCLg0z1kLa/S0kS4d8yGFuKJRDPRte9c8PYniU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index db0411f1337..255927d893d 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja +{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja, cmake , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg , libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook @@ -6,17 +6,25 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "1.0.6"; + version = "1.2.0"; src = fetchFromGitLab { owner = "free-astro"; - repo = pname; + repo = "siril"; rev = version; - sha256 = "sha256-KFCA3fUMVFHmh1BdKed5/dkq0EeYcmoWec97WX9ZHUc="; + hash = "sha256-lCoFQ7z6cZbyNPEm5s40DNdvTwFonHK3KCd8RniqQWs="; }; + patches = [ + (fetchpatch { + name = "siril-1.2-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-R1yslW6hzvJHKo0/IqBxkCuqcX6VrdRSz68gpAExxVE="; + }) + ]; + nativeBuildInputs = [ - meson ninja pkg-config git criterion wrapGAppsHook + meson ninja cmake pkg-config git criterion wrapGAppsHook ]; buildInputs = [ @@ -26,6 +34,7 @@ stdenv.mkDerivation rec { # Necessary because project uses default build dir for flatpaks/snaps dontUseMesonConfigure = true; + dontUseCmakeConfigure = true; configureScript = '' ${meson}/bin/meson --buildtype release nixbld . diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 5b08fbfd670..6e5e4feb16f 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "neuron"; - version = "8.2.2"; + version = "8.2.3"; # format is for pythonModule conversion format = "other"; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/neuronsimulator/nrn/releases/download/${version}/full-src-package-${version}.tar.gz"; - sha256 = "sha256-orGeBxu3pu4AyAW5P1EGJv8G0dOUZcSOjpUaloqicZU="; + sha256 = "sha256-k8+71BRfh+a73sZho6v0QFRxVmrfx6jqrgaqammdtDI="; }; meta = with lib; { diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 057b242e609..d9d12cbf388 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-ALMgsRFsrlt7QzZNv/t5EkcdFx9ITYJ2RgXXFYWNl1s="; + sha256 = "sha256-cf9PLYoA5vB86P7mm3bcweu7cnvmdgtYfB+7XM97Yeo="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 62be45cba27..a5f6820342d 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.36.1"; + version = "2.37"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-jq9Frh3rufI9Q3auh2Qfoo89x+jKsbxBB8ojreVgmjc="; + hash = "sha256-6OAubRkNXIm1HaiDq4jzBPUhgbwQowSZXSqAzAe7Rv0="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix index c4060a1e6f4..215b871312a 100644 --- a/pkgs/applications/window-managers/maui-shell/default.nix +++ b/pkgs/applications/window-managers/maui-shell/default.nix @@ -84,5 +84,7 @@ mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ onny ]; platforms = platforms.linux; + # https://github.com/Nitrux/maui-shell/issues/56 + broken = true; }; } |