diff options
Diffstat (limited to 'pkgs/applications')
17 files changed, 150 insertions, 26 deletions
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 3196d492fb50..63e2bd7f2dcc 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -17,7 +17,9 @@ , libxdg_basedir , wxGTK # GStreamer +, glib-networking , gst_all_1 +, libsoup_3 # User-agent info , lsb-release # rt2rtng @@ -58,6 +60,8 @@ stdenv.mkDerivation rec { libxdg_basedir lsb-release wxGTK + # for https gstreamer / libsoup + glib-networking ] ++ gstInputs ++ pythonInputs; @@ -89,6 +93,8 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]}) wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH + # for GStreamer + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.getLib libsoup_3}/lib") ''; meta = with lib; { diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 01ccc65d5f63..6490a15755fa 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.05"; + version = "7.06"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-jaT+3cIFVfBopgeeTkpNs9rFX50unlPJogdhkI9bsWU=" else { - x86_64-linux = "sha256-P/PnbJPr4ErDz5ho1/dLERhqkKjdetHzKpCpfVZAYb0="; - aarch64-linux = "sha256-PdnBVlHwoEEv2SPq/p5oyiOlduCEqL35gAY+QIJU1Ys="; + hash = if stdenv.isDarwin then "sha256-4ANi5KhNbJvDCO2iPX/oayGf/ZeIMfkhp0FQRrBYowo=" else { + x86_64-linux = "sha256-tq0K2HSDTZg7iw6ypS5oUuQi3HIYzbl9DWo2SOKGDVY="; + aarch64-linux = "sha256-MGpfdSQsMykp6QNq1JqxIsFqdhNyefPnEIyC4t1S6Vs="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 2abfe5f16d54..e44cefb02fd4 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "exodus"; - version = "23.10.24"; + version = "23.11.6"; src = fetchurl { name = "exodus-linux-x64-${version}.zip"; url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; - sha256 = "sha256-g28jSQaqjnM34sCpyYLSipUoU3pqAcXQIyWhlrR4xz4="; + sha256 = "sha256-s7LPOUDDQIgASMr3EmEUgtwWHl6mdDez4H3L+Mj3LQA="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index 3e7fb1ae5f32..a65a1428df0e 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -9,17 +9,18 @@ , openssl , readline , zlib +, nix-update-script }: stdenv.mkDerivation rec { pname = "ton"; - version = "2023.06"; + version = "2023.10"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - sha256 = "sha256-mDYuOokCGS1sDP6fHDXhGboDjn4JeyA5ea4/6RRt9x4="; + sha256 = "sha256-K1RhhW7EvwYV7/ng3NPjSGdHEQvJZ7K97YXd7s5wghc="; fetchSubmodules = true; }; @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { zlib ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "A fully decentralized layer-1 blockchain designed by Telegram"; homepage = "https://ton.org/"; diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index af5cf167a62c..e90526c0a6aa 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -2,7 +2,6 @@ , cups , dpkg , fetchurl -, gjs , glib , gtk3 , lib @@ -11,6 +10,7 @@ , libgcrypt , libkrb5 , mesa # for libgbm +, libGL , nss , xorg , systemd @@ -19,7 +19,6 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook -, makeWrapper }: let @@ -43,8 +42,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - # makeBinaryWrapper not support shell wrapper specifically for `NIXOS_OZONE_WL`. - (wrapGAppsHook.override { inherit makeWrapper; }) + wrapGAppsHook dpkg ]; @@ -76,7 +74,9 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/qq.desktop \ --replace "/opt/QQ/qq" "$out/bin/qq" \ --replace "/usr/share" "$out/share" - ln -s $out/opt/QQ/qq $out/bin/qq + makeWrapper $out/opt/QQ/qq $out/bin/qq \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" # Remove bundled libraries rm -r $out/opt/QQ/resources/app/sharp-lib @@ -91,13 +91,6 @@ stdenv.mkDerivation { runHook postInstall ''; - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ gjs ]}" - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - ) - ''; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index b3ea2b3fe820..93bb928c28f3 100644 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,8 +1,8 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-11-14 +# Last updated: 2023-12-05 { - version = "3.2.2-18394"; - urlhash = "fd2e886e"; - arm64_hash = "sha256-6E3h7Z4936YKZb+G0FoMb90T3EzH8z07mmGMnL4SDFk="; - amd64_hash = "sha256-L1M8O0FzVKLXNNYGGMPf1Nbh/DFxLHBlbzapr7uz5Sk="; + version = "3.2.3-19189"; + urlhash = "06d558c3"; + arm64_hash = "sha256-qNcw6P985F/JAB9roxaBR5hz2KcLiffUDKu/14nvvgE="; + amd64_hash = "sha256-37d7F1VB2puEFJC12x57aRj4NIYcCYyPCK06Z/OwNiM="; } diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 4831959d0fe0..3eb45eb9e528 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -11,6 +11,9 @@ , lxml , python , unzip +, pip +, pythonOlder +, setuptools }: let version = "0.86.10"; @@ -39,12 +42,20 @@ in buildPythonPackage rec { inherit src version; pname = "buildsrht"; + pyproject = true; + + disabled = pythonOlder "3.7"; postPatch = '' substituteInPlace Makefile \ --replace "all: api worker" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht redis diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index b413aa2c001d..65eac84daf8d 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -21,12 +21,17 @@ , importlib-metadata , tinycss2 , sassc +, pythonOlder , minify +, setuptools }: buildPythonPackage rec { pname = "srht"; version = "0.69.15"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -41,6 +46,10 @@ buildPythonPackage rec { patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedNativeBuildInputs = [ sassc minify diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 3a5163f9d171..8f6adfde2ed3 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -7,7 +7,10 @@ , scmsrht , pygit2 , minio +, pythonOlder , unzip +, pip +, setuptools }: let version = "0.84.2"; @@ -78,12 +81,20 @@ in buildPythonPackage rec { inherit src version; pname = "gitsrht"; + pyproject = true; + + disabled = pythonOlder "3.7"; postPatch = '' substituteInPlace Makefile \ --replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht scmsrht diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index f448109a6d7d..6bc266232902 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -8,11 +8,17 @@ , unidiff , python , unzip +, pip +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "hgsrht"; version = "0.32.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -49,6 +55,11 @@ buildPythonPackage rec { ''; }; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ python-hglib scmsrht diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 6f1b17b01c3e..bc7d243a7c0a 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -4,13 +4,19 @@ , buildPythonPackage , python , srht +, setuptools +, pip , pyyaml +, pythonOlder , unzip }: buildPythonPackage rec { pname = "hubsrht"; version = "0.17.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -30,6 +36,11 @@ buildPythonPackage rec { vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht pyyaml @@ -44,7 +55,13 @@ buildPythonPackage rec { ln -s ${hubsrht-api}/bin/api $out/bin/hubsrht-api ''; - pythonImportsCheck = [ "hubsrht" ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "hubsrht" + ]; meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 24b56b9dd3c1..6d62bdbdc1ec 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -9,11 +9,17 @@ , emailthreads , python , unzip +, pip +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "listssrht"; version = "0.57.8"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -34,6 +40,11 @@ buildPythonPackage rec { --replace "all: api" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht aiosmtpd diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index b01d739a0600..04bfabb8053b 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -6,11 +6,17 @@ , pygit2 , python , unzip +, pip +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "mansrht"; version = "0.16.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -30,6 +36,11 @@ buildPythonPackage rec { vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht pygit2 diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 28cab5852193..cbfc610fdf5f 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -13,6 +13,9 @@ , zxcvbn , python , unzip +, pip +, pythonOlder +, setuptools }: let version = "0.64.8"; @@ -35,12 +38,20 @@ in buildPythonPackage rec { pname = "metasrht"; inherit version src; + pyproject = true; + + disabled = pythonOlder "3.7"; postPatch = '' substituteInPlace Makefile \ --replace "all: api" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ alembic bcrypt diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 9f1aa7f91a79..59bd7c8334fa 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -3,8 +3,11 @@ , buildGoModule , buildPythonPackage , srht +, pip , pyyaml , python +, pythonOlder +, setuptools , unzip }: @@ -28,12 +31,20 @@ in buildPythonPackage rec { inherit src version; pname = "pastesrht"; + pyproject = true; + + disabled = pythonOlder "3.7"; postPatch = '' substituteInPlace Makefile \ --replace "all: api" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht pyyaml diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 810f3007c253..cadf3d0989b9 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -4,11 +4,16 @@ , srht , pyyaml , buildsrht +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "scmsrht"; version = "0.22.23"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -17,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ srht pyyaml @@ -28,6 +37,7 @@ buildPythonPackage rec { ''; dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ "scmsrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 0a5cefc130d5..2fc9c4485fd7 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -8,11 +8,16 @@ , factory-boy , python , unzip +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "todosrht"; version = "0.74.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -33,6 +38,10 @@ buildPythonPackage rec { vendorHash = "sha256-rvfG5F6ez8UM0dYVhKfzwtb7ZEJlaKMBAfKDbo3Aofc="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ srht alembic |