diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-24 00:13:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-24 00:13:13 +0000 |
commit | 466ddc4b5f917da844a3ede0133e0430070c2ba6 (patch) | |
tree | 6099073040af1c5db1d7cf46682c4979d07ccb86 /pkgs/applications | |
parent | 69d32db54427d937384cfcede967af2bf30d9535 (diff) | |
parent | 759b885493f1254e8eaeae303f315d5186025d74 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/applications')
33 files changed, 178 insertions, 373 deletions
diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix index 6f5d171e2ef1f..2d048bc358fe7 100644 --- a/pkgs/applications/audio/audacious/plugins.nix +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -41,6 +41,7 @@ , qtmultimedia , qtx11extras , soxr +, vgmstream , wavpack }: @@ -109,6 +110,10 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postInstall = '' + ln -s ${vgmstream.override { buildAudaciousPlugin = true; }}/lib/audacious/Input/* $out/lib/audacious/Input + ''; + meta = audacious.meta // { description = "Plugins for Audacious music player"; }; diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix index 15125358e4647..6dd2256d7c8a4 100644 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -2,7 +2,6 @@ , stdenv , buildDotnetModule , fetchFromGitHub -, autoPatchelfHook , fontconfig , xorg , libglvnd @@ -27,7 +26,6 @@ buildDotnetModule rec { dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ]; nativeBuildInputs = [ - autoPatchelfHook copyDesktopItems graphicsmagick ]; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index c4213c06f8bcb..baa0f0b0e76a1 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.67"; + version = "1.68"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-fTUTXwS6A72zhKkANlSljQVvPeN5rOTyuyb8vLxYfdk="; + sha256 = "sha256-xlXwOxmJ5cL1ouTOnFwTvx959IDQIvJ0ZRk+G9p0HbA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix index ed8cb27b506eb..99802872ef036 100644 --- a/pkgs/applications/audio/vgmstream/default.nix +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config -, mpg123, ffmpeg, libvorbis, libao, jansson, speex +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, gtk3 +, audacious, mpg123, ffmpeg, libvorbis, libao, jansson, speex , nix-update-script +, buildAudaciousPlugin ? false # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support }: stdenv.mkDerivation rec { @@ -19,16 +20,29 @@ stdenv.mkDerivation rec { extraArgs = [ "--version-regex" "r(.*)" ]; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional buildAudaciousPlugin gtk3; - buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ]; + buildInputs = [ + mpg123 + ffmpeg + libvorbis + libao + jansson + speex + ] ++ lib.optional buildAudaciousPlugin (audacious.override { audacious-plugins = null; }); + + preConfigure = '' + substituteInPlace cmake/dependencies/audacious.cmake \ + --replace "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$out/lib/audacious\")" + ''; cmakeFlags = [ - # There's no nice way to build the audacious plugin without a circular dependency - "-DBUILD_AUDACIOUS=OFF" # It always tries to download it, no option to use the system one "-DUSE_CELT=OFF" - ]; + ] ++ lib.optional (! buildAudaciousPlugin) "-DBUILD_AUDACIOUS=OFF"; meta = with lib; { description = "A library for playback of various streamed audio formats used in video games"; diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index 79355f3979dca..1371be1a97520 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, buildDotnetModule, dotnetCorePackages, - autoPatchelfHook, zlib, openssl, }: @@ -25,7 +24,6 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; - nativeBuildInputs = [autoPatchelfHook]; buildInputs = [stdenv.cc.cc.lib zlib]; runtimeDeps = [openssl zlib]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 2ddd3e0bda3f4..b95985dbb6268 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -11,12 +11,12 @@ , pyright , ruff , tempel +, writeScript , writeText -, unstableGitUpdater }: let - rev = "0b30d95c6de95b150d93ecee325b95e04ff09e46"; + rev = "4d18701bdef13f6bdc0ad58d26896dff0548dbab"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20231021.309"; # 3:09 UTC + version = "20240423.38"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-hR7bZh0ElJ8F9ToJ4dkazF19T8PE01MTcxKrjeaEp4o="; + hash = "sha256-6taxbsu5v/mQBwl0CPt/fsTQpclNhi2alp/xIh5omJA="; }; commit = rev; @@ -88,7 +88,22 @@ melpaBuild { runHook postCheck ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts coreutils git gnused + set -eu -o pipefail + + tmpdir="$(mktemp -d)" + git clone --depth=1 https://github.com/manateelazycat/lsp-bridge.git "$tmpdir" + + pushd "$tmpdir" + commit=$(git show -s --pretty='format:%H') + # Based on: https://github.com/melpa/melpa/blob/2d8716906a0c9e18d6c979d8450bf1d15dd785eb/package-build/package-build.el#L523-L533 + version=$(TZ=UTC git show -s --pretty='format:%cd' --date='format-local:%Y%m%d.%H%M' | sed 's|\.0*|.|') + popd + + update-source-version emacsPackages.lsp-bridge $version --rev="$commit" + ''; meta = with lib; { description = "A blazingly fast LSP client for Emacs"; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 48f6720104b17..99d6d4986c581 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8184,6 +8184,18 @@ final: prev: meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; + nvim-sops = buildVimPlugin { + pname = "nvim-sops"; + version = "2023-07-31"; + src = fetchFromGitHub { + owner = "lucidph3nx"; + repo = "nvim-sops"; + rev = "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef"; + sha256 = "0fvxnx5ji3d4kgsxl2ssqs7s567ibk4h38mz70m3nhs3sxk696lj"; + }; + meta.homepage = "https://github.com/lucidph3nx/nvim-sops/"; + }; + nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; version = "2024-04-17"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 25709a73a6980..8fa26fd32adcd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -688,6 +688,7 @@ https://github.com/dstein64/nvim-scrollview/,, https://github.com/s1n7ax/nvim-search-and-replace/,HEAD, https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, +https://github.com/lucidph3nx/nvim-sops/,HEAD, https://github.com/nvim-pack/nvim-spectre/,, https://github.com/chrisgrieser/nvim-spider/,HEAD, https://github.com/kylechui/nvim-surround/,main, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5e5f8b35d4a1a..07bcb8e01a0b3 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1793,8 +1793,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.172.758"; - hash = "sha256-sK3IiA4mQ6Hse+UpZ81Zb5iBSREzTrs7ypsfGbJiXm4="; + version = "1.180.827"; + hash = "sha256-HA1na9FoExIiAay+tEjxWKqpG2+wq4Oww77Gl2Bhciw="; }; meta = { @@ -1810,8 +1810,8 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.13.2024022301"; # compatible with vscode >= 1.87 - hash = "sha256-WdojLEdrg6iqTH/cNPEWb6VEfk+gIHh2M5GHrAURjy8="; + version = "0.14.2024032901"; # compatible with vscode 1.88.1 + hash = "sha256-+6N7IGO5j0wP5Zg8CwapHeKGWiZzc43VM4jCtqJDJIQ="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; diff --git a/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix index ec054521240de..22344e3b2b2b9 100644 --- a/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { publisher = "nvarner"; # Please update the corresponding binary (typst-lsp) when updating # this extension. - version = "0.12.1"; - hash = "sha256-JcfFaR1wU5XwapH8vnfVy7Cb7DfUWVeoLfBV3wEtCpE="; + version = "0.13.0"; + hash = "sha256-xiFUJymZOTEqlGvCHvLiI0pVg7NLgIXhZ7x8yx+a5mY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 8efe9c7ab8227..9ee1f53601a3b 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.6"; + version = "9.7"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-Dglg7YK2AX6ILtozOLrRJwoRd7bPBfA6wfqxVavoIEg="; + hash = "sha256-2fPDM2VuiL1M71Mx80sci2nJZKUnWe73RdjdrlGhU1M="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "9.0.0"; + version = "9.1.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-efbEMQBnVWbBEvQZm56nuUTTOBZLNL2R+hGwsKQU4cQ="; + hash = "sha256-igoeaDe0lN9Jkn5ddZscaQjom4ovjjrQJeHCiBiCR24="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-6AKN/KpmsTw9qxErhTTzqWuglgFdOAhtaoBlVRcs71Q="; + hash = "sha256-KU6i1P81Fr+4aZH/SJ+YibaIfX88SZMPdPcGS2mT2CE="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index 4906a06123c80..ee2df2a60f693 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -1,5 +1,6 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, testers +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, imagemagick, testers , imagePreviewSupport ? true +, sixelPreviewSupport ? true , neoVimSupport ? true , improvedEncodingDetection ? true , rightToLeftTextSupport ? false @@ -7,22 +8,23 @@ python3Packages.buildPythonApplication rec { pname = "ranger"; - version = "1.9.3"; + version = "1.9.3-unstable-2023-08-23"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "v${version}"; - sha256= "1rygfryczanvqxn43lmlkgs04sbqznbvbb9hlbm3h5qgdcl0xlw8"; + rev = "38bb8901004b75a407ffee4b9e176bc0a436cb15"; + hash = "sha256-NpsrABk95xHNvhlRjKFh326IW83mYj1cmK3aE9JQSRo="; }; LC_ALL = "en_US.UTF-8"; - nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook astroid pylint ]; propagatedBuildInputs = [ less file ] ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] + ++ lib.optionals sixelPreviewSupport [ imagemagick ] ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; @@ -49,10 +51,6 @@ python3Packages.buildPythonApplication rec { --replace "set preview_images false" "set preview_images true" ''; - passthru.tests.version = testers.testVersion { - package = ranger; - }; - meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = "https://ranger.github.io/"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index a213c7ef89b8c..7ef91e330cbd5 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -63,6 +63,8 @@ stdenv.mkDerivation { $out/bin/${mainProgram} --version ''; + passthru.updateScript = ./update.sh; + passthru.tests.version = testers.testVersion { package = _1password; }; diff --git a/pkgs/applications/misc/1password/update.sh b/pkgs/applications/misc/1password/update.sh new file mode 100755 index 0000000000000..562c1af31a257 --- /dev/null +++ b/pkgs/applications/misc/1password/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nurl xq-xml + +set -eu + +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_linux() { + VER="$1" + ARCH="$2" + URL="https://cache.agilebits.com/dist/1P/op2/pkg/v${VER}/op_${ARCH}_v${VER}.zip" + nurl --hash --expr "(import <nixpkgs> { }).fetchzip { url = \"$URL\"; stripRoot = false; }" +} + +fetch_darwin() { + VER="$1" + URL="https://cache.agilebits.com/dist/1P/op2/pkg/v${VER}/op_apple_universal_v${VER}.pkg" + nurl --hash --expr "(import <nixpkgs> { }).fetchurl { url = \"$URL\"; }" +} + +replace_sha() { + sed -i "s|\"$1\" \"sha256-.\{44\}\"|\"$1\" \"$2\"|" "$NIX_DRV" +} + +CLI_VERSION="$(curl -Ls https://app-updates.agilebits.com/product_history/CLI2 | xq -q 'h3' | head -n1)" + +CLI_LINUX_AARCH64_SHA256=$(fetch_linux "$CLI_VERSION" "linux_arm64") +CLI_LINUX_I686_SHA256=$(fetch_linux "$CLI_VERSION" "linux_386") +CLI_LINUX_X64_SHA256=$(fetch_linux "$CLI_VERSION" "linux_amd64") +CLI_DARWIN_UNIVERSAL_SHA256=$(fetch_darwin "$CLI_VERSION") + +sed -i "s/version = \".*\"/version = \"$CLI_VERSION\"/" "$NIX_DRV" + +replace_sha "linux_arm64" "$CLI_LINUX_AARCH64_SHA256" +replace_sha "linux_386" "$CLI_LINUX_I686_SHA256" +replace_sha "linux_amd64" "$CLI_LINUX_X64_SHA256" +replace_sha "apple_universal" "$CLI_DARWIN_UNIVERSAL_SHA256" diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index 797a8ffe5c936..d8ae98e66acd6 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -15,7 +15,6 @@ , makeDesktopItem , copyDesktopItems , icoutils -, autoPatchelfHook , bintools , fixDarwinDylibNames , autoSignDarwinBinariesHook @@ -40,8 +39,7 @@ buildDotnetModule rec { nativeBuildInputs = [ copyDesktopItems icoutils - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/applications/misc/gnome-frog/default.nix index 6570ea7968539..85dde662becd0 100644 --- a/pkgs/applications/misc/gnome-frog/default.nix +++ b/pkgs/applications/misc/gnome-frog/default.nix @@ -25,13 +25,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-frog"; - version = "1.4.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "TenderOwl"; repo = "Frog"; rev = "refs/tags/${version}"; - sha256 = "sha256-w/ENUhJt7bYy5htBLolb/HysK8/scRaPQX5qEezQcXY="; + sha256 = "sha256-zL6zuqHF1pTXT3l1mAFx2EL+0ThzjXfst/nEyNVorZg="; }; format = "other"; @@ -70,7 +70,11 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + loguru + nanoid + posthog pygobject3 + python-dateutil pillow pytesseract pyzbar diff --git a/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch b/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch index aac9b4f76fd24..5ae0458ceeea7 100644 --- a/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch +++ b/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch @@ -1,28 +1,8 @@ -diff --git a/frog/config.py b/frog/config.py -index 9837755..b73e4e3 100644 ---- a/frog/config.py -+++ b/frog/config.py -@@ -30,10 +30,14 @@ import os - APP_ID = "com.github.tenderowl.frog" - RESOURCE_PREFIX = "/com/github/tenderowl/frog" - -+# This is based from the XDG Base Directory specification. -+if not os.getenv('XDG_DATA_HOME'): -+ os.environ['XDG_DATA_HOME'] = os.path.expanduser("~/.local/share") -+ - if not os.path.exists(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')): - os.mkdir(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')) - - tessdata_url = "https://github.com/tesseract-ocr/tessdata/raw/main/" - tessdata_best_url = "https://github.com/tesseract-ocr/tessdata_best/raw/main/" - tessdata_dir = os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata') --tessdata_config = f'--tessdata-dir {tessdata_dir} –psm 6' -+tessdata_config = f'–-psm 6 --tessdata-dir {tessdata_dir}' diff --git a/frog/language_manager.py b/frog/language_manager.py -index 5752be6..4f6a908 100644 +index d822c44..bc289db 100644 --- a/frog/language_manager.py +++ b/frog/language_manager.py -@@ -156,7 +156,7 @@ class LanguageManager(GObject.GObject): +@@ -193,7 +193,7 @@ class LanguageManager(GObject.GObject): os.mkdir(tessdata_dir) dest_path = os.path.join(tessdata_dir, 'eng.traineddata') diff --git a/pkgs/applications/misc/smpq/default.nix b/pkgs/applications/misc/smpq/default.nix deleted file mode 100644 index a1879241bd214..0000000000000 --- a/pkgs/applications/misc/smpq/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, stormlib }: - -stdenv.mkDerivation rec { - pname = "smpq"; - version = "1.6"; - - src = fetchurl { - url = "https://launchpad.net/smpq/trunk/${version}/+download/${pname}_${version}.orig.tar.gz"; - sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm"; - }; - - cmakeFlags = [ - "-DWITH_KDE=OFF" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ stormlib ]; - - meta = with lib; { - description = "StormLib MPQ archiving utility"; - homepage = "https://launchpad.net/smpq"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = with maintainers; [ aanderse karolchmist ]; - mainProgram = "smpq"; - }; -} diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix deleted file mode 100644 index d4122e6571d98..0000000000000 --- a/pkgs/applications/misc/waybar/default.nix +++ /dev/null @@ -1,211 +0,0 @@ -{ lib -, stdenv -, bash -, fetchFromGitHub -, fetchFromGitLab -, SDL2 -, alsa-lib -, catch2_3 -, fftw -, glib -, gobject-introspection -, gtk-layer-shell -, gtkmm3 -, howard-hinnant-date -, hyprland -, iniparser -, jsoncpp -, libdbusmenu-gtk3 -, libevdev -, libinotify-kqueue -, libinput -, libjack2 -, libmpdclient -, libnl -, libpulseaudio -, libsigcxx -, libxkbcommon -, meson -, ncurses -, ninja -, pipewire -, pkg-config -, playerctl -, portaudio -, python3 -, scdoc -, sndio -, spdlog -, sway -, udev -, upower -, wayland -, wireplumber -, wrapGAppsHook - -, cavaSupport ? true -, evdevSupport ? true -, experimentalPatches ? true -, hyprlandSupport ? true -, inputSupport ? true -, jackSupport ? true -, mpdSupport ? true -, mprisSupport ? stdenv.isLinux -, nlSupport ? true -, pipewireSupport ? true -, pulseSupport ? true -, rfkillSupport ? true -, runTests ? true -, sndioSupport ? true -, swaySupport ? true -, traySupport ? true -, udevSupport ? true -, upowerSupport ? true -, wireplumberSupport ? true -, withMediaPlayer ? mprisSupport && false -, nix-update-script -}: - -let - # Derived from subprojects/cava.wrap - libcava.src = fetchFromGitHub { - owner = "LukashonakV"; - repo = "cava"; - rev = "0.10.1"; - hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw="; - }; - - wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec { - version = "0.4.17"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pipewire"; - repo = "wireplumber"; - rev = version; - hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; - }; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "waybar"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "Alexays"; - repo = "Waybar"; - rev = finalAttrs.version; - hash = "sha256-p1VRrKT2kTDy48gDXPMHlLbfcokAOFeTZXGzTeO1SAE="; - }; - - postUnpack = lib.optional cavaSupport '' - pushd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1 - patchShebangs . - popd - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - scdoc - wrapGAppsHook - ] ++ lib.optional withMediaPlayer gobject-introspection; - - propagatedBuildInputs = lib.optionals withMediaPlayer [ - glib - playerctl - python3.pkgs.pygobject3 - ]; - - strictDeps = false; - - buildInputs = [ - gtk-layer-shell - gtkmm3 - howard-hinnant-date - jsoncpp - libsigcxx - libxkbcommon - spdlog - wayland - ] - ++ lib.optionals cavaSupport [ - SDL2 - alsa-lib - fftw - iniparser - ncurses - portaudio - ] - ++ lib.optional evdevSupport libevdev - ++ lib.optional hyprlandSupport hyprland - ++ lib.optional inputSupport libinput - ++ lib.optional jackSupport libjack2 - ++ lib.optional mpdSupport libmpdclient - ++ lib.optional mprisSupport playerctl - ++ lib.optional nlSupport libnl - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional sndioSupport sndio - ++ lib.optional swaySupport sway - ++ lib.optional traySupport libdbusmenu-gtk3 - ++ lib.optional udevSupport udev - ++ lib.optional upowerSupport upower - ++ lib.optional wireplumberSupport wireplumber_0_4 - ++ lib.optional (cavaSupport || pipewireSupport) pipewire - ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; - - nativeCheckInputs = [ catch2_3 ]; - doCheck = runTests; - - mesonFlags = (lib.mapAttrsToList lib.mesonEnable { - "cava" = cavaSupport; - "dbusmenu-gtk" = traySupport; - "jack" = jackSupport; - "libinput" = inputSupport; - "libnl" = nlSupport; - "libudev" = udevSupport; - "man-pages" = true; - "mpd" = mpdSupport; - "mpris" = mprisSupport; - "pipewire" = pipewireSupport; - "pulseaudio" = pulseSupport; - "rfkill" = rfkillSupport; - "sndio" = sndioSupport; - "systemd" = false; - "tests" = runTests; - "upower_glib" = upowerSupport; - "wireplumber" = wireplumberSupport; - }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); - - postPatch = '' - substituteInPlace include/util/command.hpp \ - --replace-fail /bin/sh ${lib.getExe' bash "sh"} - ''; - - preFixup = lib.optionalString withMediaPlayer '' - cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py - - wrapProgram $out/bin/waybar-mediaplayer.py \ - --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - homepage = "https://github.com/alexays/waybar"; - description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; - changelog = "https://github.com/alexays/waybar/releases/tag/${finalAttrs.version}"; - license = lib.licenses.mit; - mainProgram = "waybar"; - maintainers = with lib.maintainers; [ - FlorianFranzen - lovesegfault - minijackson - rodrgz - synthetica - khaneliman - ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index 748c2d3b84c92..23d9f2404ea20 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -9,6 +9,7 @@ , pango , wayland , wayland-protocols +, wayland-scanner , libxkbcommon , scdoc }: @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ]; meta = with lib; { diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix deleted file mode 100644 index 6cba42d0c1582..0000000000000 --- a/pkgs/applications/misc/wttrbar/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "wttrbar"; - version = "0.9.4"; - - src = fetchFromGitHub { - owner = "bjesus"; - repo = "wttrbar"; - rev = version; - hash = "sha256-kRrVqUfkrSK/9z3Hj4J+mKcdV7JdTzjhxlVRa/kf8sw="; - }; - - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - - cargoHash = "sha256-HxSyGME95FWR5VwodmrMUX0jPlfE9SJV0WBbICuuTok="; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "A simple but detailed weather indicator for Waybar using wttr.in"; - homepage = "https://github.com/bjesus/wttrbar"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ khaneliman ]; - mainProgram = "wttrbar"; - }; -} diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d75b5df530328..76825427b8950 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -22,18 +22,18 @@ ungoogled-chromium = { deps = { gn = { - hash = "sha256-JvilCnnb4laqwq69fay+IdAujYC1EHD7uWpkF/C8tBw="; - rev = "d4f94f9a6c25497b2ce0356bb99a8d202c8c1d32"; + hash = "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ="; + rev = "22581fb46c0c0c9530caa67149ee4dd8811063cf"; url = "https://gn.googlesource.com/gn"; - version = "2024-02-19"; + version = "2024-03-14"; }; ungoogled-patches = { - hash = "sha256-ojKIAkJB/gfg6scCxUYNAGx4lsquAaCySBDcUCFLqSU="; - rev = "d5773b0fb696ef107cc6df6a94cbe732c9e905f9"; + hash = "sha256-zgkt0stU/H5Mji429tigVbjOq27Op8UppHTjG6neoeA="; + rev = "124.0.6367.60-1"; }; }; - hash = "sha256-7H7h621AHPyhFYbaVFO892TtS+SP3Qu7cYUVk3ICL14="; - hash_deb_amd64 = "sha256-tNkO1mPZg1xltBfoWeNhLekITtZV/WNgu//i2DJb17c="; - version = "123.0.6312.122"; + hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog="; + hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI="; + version = "124.0.6367.60"; }; } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index b898cd823b355..fbffb1a9e61ba 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,9 +1,9 @@ { beta = import ./browser.nix { channel = "beta"; - version = "124.0.2478.39"; + version = "124.0.2478.51"; revision = "1"; - hash = "sha256-0KQU/JS6hlv2SLMB8RKyITUiodByBUstrhcwIefn3Yw="; + hash = "sha256-qQTRPkQBLRZhOqBT8U0PGcmmR2zNRxJiFl3N2UPwoSo="; }; dev = import ./browser.nix { channel = "dev"; @@ -13,8 +13,8 @@ }; stable = import ./browser.nix { channel = "stable"; - version = "123.0.2420.97"; + version = "124.0.2478.51"; revision = "1"; - hash = "sha256-q7Pcbi0JQr/wvKIrgueD9f2Z6v1DMoD2bcRJKGqDYjs="; + hash = "sha256-dAiTS+KvKVwL6tNp4YsQfH4wdNIJoBJngcLBXgHArjE="; }; } diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 6c05705e565cc..cd27e74a7ca33 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "istioctl"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-zWg0UK9RHq/25GWpsvb/U5YJPkgd7aUC/Dva8jGFwfo="; + hash = "sha256-U0SCjozy968pcXMGyUgM47VGYYNwPq8wOzTnKp49ZY4="; }; vendorHash = "sha256-23t1xJPRip0ojXmUl1qlk6QJsYHT+9EAS080m6c0d6U="; diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index 794b184e245f1..1869cc83d9165 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zXglsfPsJi9DVxlRPniSBsdF1xEMYqqGr46ThpQj3gQ="; + sha256 = "sha256-1gEEmF9RRMwFAvmhLwidkVh+lnibs6x5ZHy/nJRum9E="; }; - vendorHash = "sha256-uf7nBnS1wmbz4xcVA5qF82QMPsLdSucje1NNaPyheCw="; + vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q="; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 8f158f1cd5e80..3faa5ff0ccec7 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.29.4"; + version = "1.30.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-7Rxbcsl77iFiHkU/ovyn74aXs/i5G/m5h5Ii0y1CRho="; + hash = "sha256-7xRRpchjwtV3dGbZ2hN9qj6soAuiF/K7vTY0LzE6Z5w="; }; vendorHash = null; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index b29d4d3c9c64e..c1ca934437a7a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -120,6 +120,8 @@ in stdenv.mkDerivation rec { libappindicator-gtk3 libnotify libdbusmenu + pipewire + stdenv.cc.cc xdg-utils wayland ]; @@ -158,7 +160,6 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc pipewire ] }" --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index d521080460920..6ac38b50e8355 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.102.2"; + version = "1.102.4"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-GpHX34iHKeoT7AuEf76QTpTIrATLZyAoUxMoIouhvyA="; + hash = "sha256-ryOWnVcJOUs9kToXtwjUTk7nwuAW0NCDn5Npn27hKXU="; }; subPackages = [ "cmd/uplink" ]; diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index b39d7ae26079d..7437707582516 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "unstable-2024-04-08"; + version = "unstable-2024-04-19"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "c0be6c47309aa40d44784a3a4c4c07bc4e8fb6fa"; - hash = "sha256-UVCazX0P03+e1exnpXrGNc/1vHxLH04Xtvgsy00UAoI="; + rev = "5d5a538e7c378e9e2d9fabdf88fa2c6dd6d13e2c"; + hash = "sha256-vPj3YKNJAZgdhw/VVrJIo2P7IyHrt7hVpnUQCUCZmR8="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 00ef5d428337d..b1c9c62a5748b 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -60,6 +60,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/1c3f991b9d3c5778e409e5414c6cfcd456113f19.diff"; hash = "sha256-uCXchYx26DdxTjR1k2748KCEHPnekKS2fAM7SpyhNvM="; }) + + # https://github.com/sagemath/sage/pull/37763 + (fetchpatch { + name = "scipy-fault-tolerance.patch"; + url = "https://github.com/sagemath/sage/commit/547d502ed56f9fd44eb5d9b4ee0824746c60fef7.diff"; + hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg="; + }) ]; # Patches needed because of package updates. We could just pin the versions of diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index ff1f8e98a79d0..bdef9fe1ea7d9 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.196"; + version = "5.12.197"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-vv60+8H6WQes+xVJRsgLppwQ/DkQbfNC6tRx2TB/4HQ="; + hash = "sha256-Z03FDdlg1IBXHpurKr6RwmtZkaptyeQe+0lgKn/GTTQ="; }; - cargoHash = "sha256-jK2GTI+T7Ie5cdQQQHh2aj6Egb/5BxsfJkFrSo+z7Pc="; + cargoHash = "sha256-V8TV8RM3T7DYqwNV/r5PkkJVtyAQLdY3BR3sz26phdY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 07da8f64a6f75..490a0c4644043 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -5,15 +5,15 @@ let in { sublime-merge = common { - buildVersion = "2091"; - aarch64sha256 = "dkPKuuzQQtL3eZlaAPeL7e2p5PCxroFRSp6Rw5wHODc="; - x64sha256 = "T5g6gHgl9xGytEOsh3VuB08IrbDvMu24o/1edCGmfd4="; + buildVersion = "2096"; + aarch64sha256 = "IHPJJ/oQ3SLemRyey5syTL0sf5GEeHSylDX+EQNNQGU="; + x64sha256 = "41I6p5wNx2pF56np7gHqp396RHpXtQu5ruksUywF/Ug="; } { }; sublime-merge-dev = common { - buildVersion = "2094"; + buildVersion = "2095"; dev = true; - aarch64sha256 = "ZJgq971EPzq+BWxTQAoX6TgUmTfpf9sI4CHPcvgPTfI="; - x64sha256 = "6FLfszhP+BGHX5FrycMlznREmGDLyDyo6rgmqxhtCak="; + aarch64sha256 = "FmXz8VAWS7e0bB9NeXbihnhdhWMyNJJs6PNt+K2G0Bk="; + x64sha256 = "83Hw27RgGPgugpf4eMuWT6/MSQ2Q2VBCbaXoSGFtTPI="; } { }; } diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 50e49fd192acd..a32d4bd8db441 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.29.2"; + version = "1.29.3"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-il28u2+Jv2gh6XqRV4y6u0FDZ4flmcp+bOj9aibL+ro="; + hash = "sha256-JJuqYC4GAZqXyyAjVoPipnGjRGbVx1rfH4UrtIOP7cc="; }; vendorHash = null; |