diff options
Diffstat (limited to 'pkgs/applications')
59 files changed, 482 insertions, 565 deletions
diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 3d7b0563ac222..b858edf29bca5 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , ffmpeg , glfw +, libglvnd , libogg , libvorbis , makeWrapper @@ -23,13 +24,13 @@ let in buildDotnetModule rec { pname = "famistudio"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; rev = "refs/tags/${version}"; - hash = "sha256-ydEWLL05B86672j3MVo/90tgDHg8FJ2EZaesqrBZy4A="; + hash = "sha256-WYy/6cWQg3Ayok/eAdnvlWAvdcuhy/sdlWOVvaYcPkc="; }; postPatch = let @@ -89,6 +90,10 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; + runtimeDeps = lib.optionals stdenv.hostPlatform.isLinux [ + libglvnd + ]; + executables = [ "FamiStudio" ]; postInstall = '' diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index c8a38cdbe960e..c0a30fb900162 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${finalAttrs.version}"; - hash = "sha256-bIX9BByUdScbS0NCrUjF5PTHG9T6hrPGjD5XM0eQgfA="; + hash = "sha256-2OgU2J/tot5HK4FV1pvZzI9u/e8p65Ymnqj7IdCcfIs="; }; strictDeps = true; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix deleted file mode 100644 index a1c74abeca1c8..0000000000000 --- a/pkgs/applications/audio/sublime-music/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, gobject-introspection -, gtk3 -, pango -, wrapGAppsHook3 -, chromecastSupport ? false -, serverSupport ? false -, keyringSupport ? true -, notifySupport ? true -, libnotify -, networkSupport ? true -, networkmanager -}: - -python3.pkgs.buildPythonApplication rec { - pname = "sublime-music"; - version = "0.12.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "sublime-music"; - repo = "sublime-music"; - rev = "refs/tags/v${version}"; - hash = "sha256-FPzeFqDOcaiariz7qJwz6P3Wd+ZDxNP57uj+ptMtEyM="; - }; - - postPatch = '' - sed -i "/--cov/d" setup.cfg - sed -i "/--no-cov-on-fail/d" setup.cfg - - # https://github.com/sublime-music/sublime-music/commit/f477659d24e372ed6654501deebad91ae4b0b51c - sed -i "s/python-mpv/mpv/g" pyproject.toml - ''; - - build-system = with python3.pkgs; [ - flit-core - ]; - - nativeBuildInputs = [ - gobject-introspection - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - pango - ] - ++ lib.optional notifySupport libnotify - ++ lib.optional networkSupport networkmanager - ; - - propagatedBuildInputs = with python3.pkgs; [ - bleach - bottle - dataclasses-json - deepdiff - levenshtein - mpv - peewee - pychromecast - pygobject3 - python-dateutil - requests - semver - thefuzz - ] - ++ lib.optional keyringSupport keyring - ; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - disabledTests = [ - # https://github.com/sublime-music/sublime-music/issues/439 - "test_get_music_directory" - ]; - - pythonImportsCheck = [ - "sublime_music" - ]; - - postInstall = '' - install -Dm444 sublime-music.desktop -t $out/share/applications - install -Dm444 sublime-music.metainfo.xml -t $out/share/metainfo - - for size in 16 22 32 48 64 72 96 128 192 512 1024; do - install -Dm444 logo/rendered/"$size".png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/sublime-music.png - done - ''; - - meta = with lib; { - description = "GTK3 Subsonic/Airsonic client"; - homepage = "https://sublimemusic.app/"; - changelog = "https://github.com/sublime-music/sublime-music/blob/v${version}/CHANGELOG.rst"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ albakham sumnerevans ]; - mainProgram = "sublime-music"; - }; -} diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index 16e1a24343c53..3234a719e3c00 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "x42-avldrums"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "x42"; repo = "avldrums.lv2"; rev = "v${version}"; - hash = "sha256-NNqBZTWjIM97qsXTW/+6T7eOAELi/OwXh4mCYPD/C6I="; + hash = "sha256-AZKHjzgw0TtLHh4TF+yOUSa+GlNVwyHCpJWAZikXTy4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index b236ed5da4424..cb6774fdc3fc1 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lndhub-go"; - version = "0.14.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = version; - sha256 = "sha256-m+Sc/rsYIbvd1oOqG4OT+wPtSxlgFq8m03n28eZIWJU="; + sha256 = "sha256-PHBzM/lYYu6hXa5jiFQR/K5j+vmxaYH7xuoxOhFbhMk="; }; - vendorHash = "sha256-a4yVuEfhLNM8IEYnafWf///SNLqQL5XZfGgJ5AZLx3c="; + vendorHash = "sha256-Vo29w04cRW0syD2tjieKVeZ3srFNuEC3T17birVWn6k="; doCheck = false; # tests require networking diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index 5c16de8597d2f..07be7664acba2 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2024.04"; + version = "2024.06"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - hash = "sha256-hh8D4IZX6RS/RXdhVONhgetqp89kpTC2IwDQ2KHdKsE="; + hash = "sha256-5fuRdVayvmM+yK1WsdtWlCZpxz7KKBs+ZRfnueP0Ny0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index f0863b771eba7..87b7a99833dec 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,7 +1,7 @@ { channel, pname, version, sha256Hash }: { alsa-lib -, bash +, runtimeShell , buildFHSEnv , cacert , coreutils @@ -65,6 +65,7 @@ , zlib , makeDesktopItem , tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper +, androidenv }: let @@ -214,17 +215,52 @@ let '') ]; }; -in runCommand - drvName - { - startScript = '' - #!${bash}/bin/bash - ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" + mkAndroidStudioWrapper = {androidStudio, androidSdk ? null}: runCommand drvName { + startScript = let + hasAndroidSdk = androidSdk != null; + androidSdkRoot = lib.optionalString hasAndroidSdk "${androidSdk}/libexec/android-sdk"; + in '' + #!${runtimeShell} + ${lib.optionalString hasAndroidSdk '' + echo "=== nixpkgs Android Studio wrapper" >&2 + + # Default ANDROID_SDK_ROOT to the packaged one, if not provided. + ANDROID_SDK_ROOT="''${ANDROID_SDK_ROOT-${androidSdkRoot}}" + + if [ -d "$ANDROID_SDK_ROOT" ]; then + export ANDROID_SDK_ROOT + # Legacy compatibility. + export ANDROID_HOME="$ANDROID_SDK_ROOT" + echo " - ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >&2 + + # See if we can export ANDROID_NDK_ROOT too. + ANDROID_NDK_ROOT="$ANDROID_SDK_ROOT/ndk-bundle" + if [ ! -d "$ANDROID_NDK_ROOT" ]; then + ANDROID_NDK_ROOT="$(ls "$ANDROID_SDK_ROOT/ndk/"* 2>/dev/null | head -n1)" + fi + + if [ -d "$ANDROID_NDK_ROOT" ]; then + export ANDROID_NDK_ROOT + echo " - ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT" >&2 + else + unset ANDROID_NDK_ROOT + fi + else + unset ANDROID_SDK_ROOT + unset ANDROID_HOME + fi + ''} + exec ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" ''; preferLocalBuild = true; allowSubstitutes = false; - passthru = { + passthru = let + withSdk = androidSdk: mkAndroidStudioWrapper { inherit androidStudio androidSdk; }; + in { unwrapped = androidStudio; + full = withSdk androidenv.androidPkgs.androidsdk; + inherit withSdk; + sdk = androidSdk; }; meta = with lib; { description = "Official IDE for Android (${channel} channel)"; @@ -245,9 +281,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ alapshin ]; - beta = [ alapshin ]; - canary = [ alapshin ]; + stable = [ alapshin numinit ]; + beta = [ alapshin numinit ]; + canary = [ alapshin numinit ]; dev = canary; }."${channel}"; mainProgram = pname; @@ -261,4 +297,5 @@ in runCommand ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${pname}.png ln -s ${desktopItem}/share/applications $out/share/applications - '' + ''; +in mkAndroidStudioWrapper { inherit androidStudio; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index bdaf63c658d42..7507faa4e81ec 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5327,6 +5327,18 @@ final: prev: meta.homepage = "https://github.com/folke/lazy.nvim/"; }; + lazydev-nvim = buildVimPlugin { + pname = "lazydev-nvim"; + version = "2024-06-09"; + src = fetchFromGitHub { + owner = "folke"; + repo = "lazydev.nvim"; + rev = "7cbb524c85f87017df9c1ea2377a1d840ad8ed51"; + sha256 = "034abfj3rskgqqcynw6mz61bhjmq8x8qn6f4lq6wvyhzhkfplaqb"; + }; + meta.homepage = "https://github.com/folke/lazydev.nvim/"; + }; + lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; version = "2024-05-13"; @@ -5903,6 +5915,18 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; + lz-n = buildNeovimPlugin { + pname = "lz.n"; + version = "2024-06-16"; + src = fetchFromGitHub { + owner = "nvim-neorocks"; + repo = "lz.n"; + rev = "ffd6633cbe2145177bd522fa340104fa44afbc1c"; + sha256 = "sha256-aV+m4+8oWwIPTQhilXfHOUyYqQGl4NRnk7HvEQYMp0Y="; + }; + meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; + }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c6414161485c8..fa6a8ac6848fe 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -451,6 +451,7 @@ https://github.com/sk1418/last256/,, https://github.com/latex-box-team/latex-box/,, https://github.com/dundalek/lazy-lsp.nvim/,HEAD, https://github.com/folke/lazy.nvim/,HEAD, +https://github.com/folke/lazydev.nvim/,, https://github.com/kdheepak/lazygit.nvim/,, https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, @@ -499,6 +500,7 @@ https://github.com/l3mon4d3/luasnip/,, https://github.com/alvarosevilla95/luatab.nvim/,, https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, +https://github.com/nvim-neorocks/lz.n/,, https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD, https://github.com/winston0410/mark-radar.nvim/,HEAD, https://github.com/iamcco/markdown-preview.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md index 656ea1bdb3ae0..12ac4f5f5bb2e 100644 --- a/pkgs/applications/editors/vscode/extensions/README.md +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -20,6 +20,11 @@ - `description` should mention it is a Visual Studio Code extension. - `downloadPage` is the VSCode marketplace URL. - `homepage` is the source-code URL. + - `maintainers`: + - optionally consider adding yourself as a maintainer to be notified of updates, breakages and help with upkeep. + - recommended format is: + - a `non-nested with`, such as: `with lib.maintainers; [ your-username ];`. + - maintainers are listed in alphabetical order. - verify `license` in upstream. * On commit messages: diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2a36d78978798..90b50d66f7c02 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.15.2"; - hash = "sha256-gurh2DSLH/gM/EZCUACHGlzOf0LPwkc+zYxw7AOcb1E="; + version = "1.17.2"; + hash = "sha256-IA09vUleY7hazu65kadES4iq3XojyJ3sXOOGaw0vJnU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -570,6 +570,22 @@ let }; }; + bierner.github-markdown-preview = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-markdown-preview"; + publisher = "bierner"; + version = "0.3.0"; + hash = "sha256-7pbl5OgvJ6S0mtZWsEyUzlg+lkUhdq3rkCCpLsvTm4g="; + }; + meta = { + description = "A VSCode extension that changes the markdown preview to support GitHub markdown features"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.github-markdown-preview"; + homepage = "https://github.com/mjbvz/vscode-github-markdown-preview"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + bierner.markdown-checkbox = buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-checkbox"; @@ -1291,7 +1307,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=discloud.discloud"; homepage = "https://github.com/discloud/vscode-discloud"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.astindev ]; + maintainers = [ lib.maintainers.diogomdp ]; }; }; @@ -1767,6 +1783,22 @@ let }; }; + garlicbreadcleric.pandoc-markdown-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pandoc-markdown-syntax"; + publisher = "garlicbreadcleric"; + version = "0.0.2"; + hash = "sha256-YAMH5smLyBuoTdlxSCTPyMIKOWTSIdf2MQVZuOO2V1w="; + }; + meta = { + description = "A VSCode extension that adds syntax highlighting for Pandoc-flavored Markdown"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=garlicbreadcleric.pandoc-markdown-syntax"; + homepage = "https://github.com/garlicbreadcleric/vscode-pandoc-markdown"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension { mktplcRef = { name = "html-slim-scss-css-class-completion"; @@ -2576,6 +2608,22 @@ let }; }; + lapo.asn1js = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "asn1js"; + publisher = "lapo"; + version = "0.1.4"; + hash = "sha256-utbIKlwNHnJZj/51f8hEDmUA/A26De/gY73iT4tXKRU="; + }; + meta = { + description = "Decode ASN.1 content inside VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=lapo.asn1js"; + homepage = "https://github.com/lapo-luchini/vscode-asn1js"; + maintainers = with lib.maintainers; [ katexochen ]; + license = lib.licenses.isc; + }; + }; + llvm-org.lldb-vscode = llvmPackages.lldb; llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { @@ -3943,8 +3991,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "4.0.2"; - hash = "sha256-k3FxRAtW9Fdhm7jD3ingFXONiBsOia1Whs7OPeDmlSw="; + version = "4.0.3"; + hash = "sha256-CEGwbw5RpFsfB/g2inScIqWB7/3oxgxz7Yuc6V3OiHg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -4590,8 +4638,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.2.0"; - sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz"; + version = "12.8.0"; + hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM="; }; meta = { description = "Bring real icons to your Visual Studio Code"; @@ -4829,6 +4877,22 @@ let }; }; + zaaack.markdown-editor = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-editor"; + publisher = "zaaack"; + version = "0.1.10"; + hash = "sha256-K1nczR059BsiHpT1xdtJjpFLl5krt4H9+CrEsIycq9U="; + }; + meta = { + description = "Visual Studio Code extension for WYSIWYG markdown editing"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zaaack.markdown-editor"; + homepage = "https://github.com/zaaack/vscode-markdown-editor"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + zainchen.json = buildVscodeMarketplaceExtension { mktplcRef = { name = "json"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 7bcbcc11a89da..780b0e12896ea 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.5.1"; - hash = "sha256-w+T4dySTt2RpdBYd1Nnxh8RR9wqEu9pkS4R1Ay7Fn+8="; + version = "2024.6.1"; + hash = "sha256-NOx0WJC32MUm6TmLkiN67FHKwBmB0S3feFVIQNxR2PQ="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index a74f934705f7d..07616924d18a0 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -3,15 +3,15 @@ stdenv, vscode-utils, autoPatchelfHook, - libxcrypt-legacy, + zlib, }: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.16.0"; - hash = "sha256-SHgS2C+ElTJW4v90Wg0QcsSL2FoSz+SxZQpgq2J4JiU="; + version = "1.19.0"; + hash = "sha256-Wit2ozgaVwINL3PvPfmZWQ4WN7seQMWfXwXGgEKecn0="; }; postPatch = '' @@ -24,7 +24,7 @@ vscode-utils.buildVscodeMarketplaceExtension { buildInputs = [ stdenv.cc.cc.lib - libxcrypt-legacy + zlib ]; meta = { diff --git a/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/applications/emulators/c64-debugger/default.nix index fcd3a0aa9b527..ad0da506b4ffb 100644 --- a/pkgs/applications/emulators/c64-debugger/default.nix +++ b/pkgs/applications/emulators/c64-debugger/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation { - name = "c64-debugger"; + pname = "c64-debugger"; version = "0.64.58.6"; src = fetchgit { diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index d723eaecc20c5..c00a8eef2b8e3 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.16.5"; + version = "0.16.6"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "sha256-w/l+L/Gs2ERzXLiGFrNKHBTGBLdr+2zn1ZYRHUtZcHg="; + sha256 = "sha256-URth/0hMfxnBJpfA1k+UU9/jJzfte2UXeLv5JnBDGUs="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index bd6b5e4d080d0..9abb44fd61a4e 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.10"; + version = "9.11"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-r8NLSRv6FMYsP99ifdK13Kxefp8/FFrbFDMleK+M8cA="; + hash = "sha256-36AMJk6nEWnQKoSagz5Iyudh+whCKgDfhkTr1nv4ckA="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-ZqajfgPSKTcNBiDWEc9UgZWWmvkJvTA0S+j98Qz/y08="; + hash = "sha256-vqlikMatRlGxvWJ6BJu2HyBclV4x+vzNPNe8py7jKqo="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/applications/graphics/brlcad/default.nix index f30a6acbbbee7..91b063f8fc935 100644 --- a/pkgs/applications/graphics/brlcad/default.nix +++ b/pkgs/applications/graphics/brlcad/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , fontconfig , libX11 @@ -11,15 +12,25 @@ stdenv.mkDerivation rec { pname = "brlcad"; - version = "7.34.2"; + version = "7.38.2"; src = fetchFromGitHub { owner = "BRL-CAD"; - repo = pname; + repo = "brlcad"; rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-oafu255xElEIk8p4yvNyR2maykUfxQui/L5MkicA+JA="; + hash = "sha256-23UTeH4gY2x/QGYZ64glAkf6LmsXBAppIOHgoUdxgpo="; }; + patches = [ + # This commit was bringing an impurity in the rpath resulting in: + # RPATH of binary /nix/store/rq2hjvfgq2nvh5zxch51ij34rqqdpark-brlcad-7.38.0/bin/tclsh contains a forbidden reference to /build/ + (fetchpatch { + url = "https://github.com/BRL-CAD/brlcad/commit/fbdbf042b2db4c7d46839a17bbf4985cdb81f0ae.patch"; + revert = true; + hash = "sha256-Wfihd7TLkE8aOpLdDtYmhhd7nZijiVGh1nbUjWr/BjQ="; + }) + ]; + nativeBuildInputs = [ cmake ]; @@ -36,11 +47,19 @@ stdenv.mkDerivation rec { "-DBRLCAD_ENABLE_STRICT=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + meta = with lib; { homepage = "https://brlcad.org"; description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system"; + changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${src.rev}"; license = with licenses; [ lgpl21 bsd2 ]; maintainers = with maintainers; [ GaetanLepage ]; platforms = platforms.linux; + # error Exactly one of ON_LITTLE_ENDIAN or ON_BIG_ENDIAN should be defined. + broken = stdenv.system == "aarch64-linux"; }; } diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index ffc612a33bfc7..6d938fe4bddc9 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.47.0"; + version = "1.48.1"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-ZYQjH3NUPeq5XgCZ6L78lJpgbK69ZMf2AzztbCgbYBo="; + hash = "sha256-U4MmVK75tPYJStJ0RRjfbzSbpGLJ07rJg6ClHI+tAfM="; }; nativeBuildInputs = [ @@ -62,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { natsort piexif pillow + pillow-heif curl-cffi pygobject3 python-magic diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 8ff55fda8e2b5..0501d9f707e69 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.21"; + version = "13.22"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-rg4czTni8toAwzppgNdi/lfUDudKkEqZUZziiIiyJm0="; + hash = "sha256-5YoFO1NHduV8qKZ8GPaFnKfRQRlhlG5swZo74SfOpZY="; }; buildInputs = [ diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 4fbcad6b8d3d5..23b12f032bd9f 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "holochain-launcher"; + pname = "holochain-launcher"; version = "0.11.5"; prerelease = "beta-2"; diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock index 33ea0c352d293..554a818901516 100644 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ b/pkgs/applications/misc/mission-center/Cargo.lock @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.5.1" +version = "0.5.2" dependencies = [ "dbus", "errno-sys", diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index e13774cf3c881..9188df9e5b3b4 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -1,38 +1,39 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchFromGitHub -, cargo -, libxml2 -, meson -, ninja -, pkg-config -, python311 -, rustPlatform -, symlinkJoin -, rustc -, wrapGAppsHook4 -, appstream-glib -, blueprint-compiler -, cairo -, cmake -, dbus -, desktop-file-utils -, gdk-pixbuf -, gettext -, glib -, graphene -, gtk4 -, libGL -, libadwaita -, libdrm -, mesa -, pango -, sqlite -, udev -, wayland -, dmidecode -, vulkan-loader +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + cargo, + libxml2, + meson, + ninja, + pkg-config, + python311, + rustPlatform, + symlinkJoin, + rustc, + wrapGAppsHook4, + appstream-glib, + blueprint-compiler, + cairo, + cmake, + dbus, + desktop-file-utils, + gdk-pixbuf, + gettext, + glib, + graphene, + gtk4, + libGL, + libadwaita, + libdrm, + mesa, + pango, + sqlite, + udev, + wayland, + dmidecode, + vulkan-loader, }: let @@ -45,28 +46,23 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-I/UkHXDGbKiOcn7R0nQVKcgdvyV4ycgQGNoHA6QMAnw="; + hash = "sha256-84D+CttolY5hleCJbDiN3mlk0+nlwwJUJhGoKGVT/lw="; }; cargoDeps = symlinkJoin { name = "cargo-vendor-dir"; paths = [ - (rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }) - (rustPlatform.importCargoLock { - lockFile = ./gatherer-Cargo.lock; - }) + (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }) + (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; }) ]; }; - nativeBuildInputs = [ blueprint-compiler cargo @@ -139,6 +135,7 @@ stdenv.mkDerivation rec { meta = { description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; homepage = "https://gitlab.com/mission-center-devs/mission-center"; + changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index 927b9f29c8169..d6ad543585a4f 100644 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -383,7 +383,7 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.5.1" +version = "0.5.2" dependencies = [ "anyhow", "arrayvec", diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix deleted file mode 100644 index c7091b00c7dc5..0000000000000 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, fetchFromGitHub -, python3Packages, wrapGAppsHook3, gobject-introspection -, gtk-layer-shell, pango, gdk-pixbuf, atk -# Extra packages called by various internal nwg-panel modules -, hyprland # hyprctl -, sway # swaylock, swaymsg -, systemd # systemctl -, wlr-randr # wlr-randr -, nwg-menu # nwg-menu -, brightnessctl # brightnessctl -, pamixer # pamixer -, pulseaudio # pactl -, libdbusmenu-gtk3 # tray -, playerctl -}: - -python3Packages.buildPythonApplication rec { - pname = "nwg-panel"; - version = "0.9.32"; - - src = fetchFromGitHub { - owner = "nwg-piotr"; - repo = "nwg-panel"; - rev = "refs/tags/v${version}"; - hash = "sha256-7UROYXmDDWW/NFmKy3h1PfkQGB74DogcgTQXGXojY4U="; - }; - - # No tests - doCheck = false; - - # Because of wrapGAppsHook3 - strictDeps = false; - dontWrapGApps = true; - - buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ]; - nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; - propagatedBuildInputs = (with python3Packages; - [ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ]) - # Run-time GTK dependency required by the Tray module - ++ [ libdbusmenu-gtk3 ]; - - postInstall = '' - mkdir -p $out/share/{applications,pixmaps} - cp $src/nwg-panel-config.desktop nwg-processes.desktop $out/share/applications/ - cp $src/nwg-shell.svg $src/nwg-panel.svg nwg-processes.svg $out/share/pixmaps/ - ''; - - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - --prefix XDG_DATA_DIRS : "$out/share" - --prefix PATH : "${lib.makeBinPath [ brightnessctl hyprland nwg-menu pamixer pulseaudio sway systemd wlr-randr ]}" - ) - ''; - - meta = with lib; { - homepage = "https://github.com/nwg-piotr/nwg-panel"; - description = "GTK3-based panel for Sway window manager"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ ludovicopiero ]; - mainProgram = "nwg-panel"; - }; -} diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index ccd283b6d5f06..24ff669e4f22a 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -17,7 +17,7 @@ }: python3Packages.buildPythonApplication rec { - name = "polychromatic"; + pname = "polychromatic"; version = "0.9.1"; format = "other"; diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 0c247ffb092f6..0f6be51187fa1 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -25,7 +25,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "Note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; - maintainers = with maintainers; [ max-niederman chewblacka ]; + maintainers = with maintainers; [ chewblacka ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; mainProgram = "remnote"; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 87925d732e89a..44ba291f31e98 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -18,11 +18,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.6"; + version = "2.1.8"; src = fetchPypi { inherit pname version; - hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM="; + hash = "sha256-65U/j6P6X4JzhL0aEOnzKa/Al6SYprOOxix2dtcusJQ="; }; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 69b13ae8e4f4b..004bd8920eb04 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-a1gUAyNx0gKNZRKpQrsG3neKIy+xPquKUrzmcVbfQ54="; + hash_darwin = "sha256-OvRkO/mBXOk3IqZtvjKzOsBPBaZzq+YOb//SsXtgB9k="; hash_darwin_aarch64 = - "sha256-8OzxncQs/pXIo7dVLCgOlyO5jjTKRdTMoMaQsAiJeO8="; - hash_linux = "sha256-lpYxCCjPacqZKiRMQrKdEaZJ8DO3jpbUK/6/j1i95a8="; - version = "126.0.6478.55"; + "sha256-ODR4fFW24yh4vIGcWjBVH+mfK+LECU/LXlWVq+NBNlI="; + hash_linux = "sha256-7vWid5i9bOyuGL2v9kdzv2yW2ZqWNNZDQScSDriaxxM="; + version = "126.0.6478.61"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-05-13"; }; }; - hash = "sha256-nXRzISkU37TIgV8rjO0qgnhq8uM37M6IpMoGHdsOGIM="; - version = "126.0.6478.55"; + hash = "sha256-cB2jrasrtaFWM8tpG9leuC+jUAvoU8g5977cn4r7rbw="; + version = "126.0.6478.61"; }; ungoogled-chromium = { deps = { diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 9541153d8cc1a..ff36607709bc3 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.13.3"; + packageVersion = "11.14.1"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -15,14 +15,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.12.0"; + version = "115.13.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-9EDTVckSqv/nyDi4qjMd54I69WiqM8v6om7zQLT+pQc="; + hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; }; extraConfigureFlags = [ @@ -31,6 +31,13 @@ "--with-unsigned-addon-scopes=app,system" ]; + extraPostPatch = '' + # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin + # https://github.com/NixOS/nixpkgs/issues/314115 + substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ + --replace-fail /usr/bin/floorp floorp + ''; + updateScript = ./update.sh; meta = { diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index c641a4cc37956..08385de1bff2c 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.15"; + version = "13.0.16"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-TypPevAkp1G7GPzBTRUv3N4UJydAqfllNekTsYfiisQ="; + hash = "sha256-+8jur2Fc+fhrWO9xyaSuwzUZnLLhTP/uz15+EX6E7K4="; }; }; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 2aa01bfe1b960..508946278f923 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.15"; + version = "13.0.16"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-e2YFrPzle9s/j3+uxFjoK538pLV1u1a4kD6V8RaqpOU="; + hash = "sha256-gSV2G9U0fh+PAe/vCInIjssBFk0ciiD6h0rpZUxVzs0="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-20C4UuSN2PZ2L3AZv7klNClD4RoThpmnKrpoK9An24w="; + hash = "sha256-Lh9rHrqX+eeQ47Z8e9ChRH8qWeDwSbyR5TnNfwHAb9M="; }; }; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 4e28f0750e49d..1c2402f6495b3 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.36"; + version = "3.11.37"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-6WZALdKORsa0wahPKgkpzjlktJQxnbiiJLXGv3E9MXM="; + hash = "sha256-bZd/iLEGF5+Zt4kKAvUmjHiPKA1v1FWf5/BEcsLy9MU="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix deleted file mode 100644 index de70f49fe6040..0000000000000 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost }: - -stdenv.mkDerivation rec { - pname = "SkypeExport"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "Temptin"; - repo = "SkypeExport"; - rev = "v${version}"; - sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; - }; - - patches = [ - (fetchpatch { - name = "boost167.patch"; - url = "https://github.com/Temptin/SkypeExport/commit/ef60f2e4fc9e4a5764c8d083a73b585457bc10b1.patch"; - sha256 = "sha256-t+/v7c66OULmQCD/sNt+iDJeQ/6UG0CJ8uQY2PVSFQo="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; - - preConfigure = "cd src/SkypeExport/_gccbuild/linux"; - installPhase = "install -Dt $out/bin SkypeExport"; - - meta = with lib; { - description = "Export Skype history to HTML"; - mainProgram = "SkypeExport"; - homepage = "https://github.com/Temptin/SkypeExport"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ yana ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 09840fbe61393..ec8bcb5a8d8eb 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,14 +2,14 @@ let versions = if stdenv.isLinux then { - stable = "0.0.54"; - ptb = "0.0.85"; - canary = "0.0.402"; + stable = "0.0.56"; + ptb = "0.0.90"; + canary = "0.0.422"; development = "0.0.19"; } else { - stable = "0.0.305"; - ptb = "0.0.114"; - canary = "0.0.510"; + stable = "0.0.307"; + ptb = "0.0.119"; + canary = "0.0.531"; development = "0.0.41"; }; version = versions.${branch}; @@ -17,15 +17,15 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-ruaotzJ+dvqNUV/e4xpJ1rorGiC4Im57BSSiddP8ZF8="; + hash = "sha256-HpdsvzWtB4AoqZXf7LV0J50/OQDsYgK8bkQ1HGvu7Ec="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-2RyilxldJX2wqKlEcrp6srj0O7UNHMxySRJD1xBfqMk="; + hash = "sha256-75YnLhgNTd7pwpTE9qSIF0rzBwmGJ/CYa+YgN3OQZ2w="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-YE+sHmEkUCHLflSUgf4aotWWdzhbFyzozc3vLcJ96yA="; + hash = "sha256-MTC079WTN0Vw57aLro1WkHRL09IKYjnUsfBAMiiHjI0="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -35,15 +35,15 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-UEKsweUvtVKXZDrdIYuo3FPSPrnY3ECIilntBs9ZrGU="; + hash = "sha256-FBYxQhtwctMQ8ByOgAVncWh5297k1Vh95w/rWnZg9Fw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-ahCgJ1aSLL7Mhx5Jjkeuqqlis8gqxHbIhQvlbUK2wIU="; + hash = "sha256-Y5t6ndecfRf3zVfYEvFGiFinQxRSa7VyfnkAors8VPY="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-viWOmu1+6tpzNDN/q0kXRMo+rohOP6/L7ke2EeBEADg="; + hash = "sha256-eMJ/OKi+k92QEk140UW3RIi5G/UFlR6mW9f8kPZbFaw="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index e25a94d0bef84..26b0e9c0225db 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -53,6 +53,6 @@ buildGoModule rec { description = "A terminal based Matrix client written in Go"; mainProgram = "gomuks"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ chvp emily ]; + maintainers = with maintainers; [ chvp ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 45c7e556a71d3..041a3949d92dc 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , asciidoc , pkg-config @@ -9,6 +8,7 @@ , cmark , coeurl , curl +, kdsingleapplication , libevent , libsecret , lmdb @@ -17,48 +17,29 @@ , nlohmann_json , olm , qtbase -, qtgraphicaleffects , qtimageformats , qtkeychain -, qtmacextras , qtmultimedia -, qtquickcontrols2 , qttools +, qtwayland , re2 , spdlog , wrapQtAppsHook -, voipSupport ? true , gst_all_1 , libnice }: stdenv.mkDerivation rec { pname = "nheko"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - hash = "sha256-2daXxTbpSUlig47y901JOkWRxbZGH4qrvNMepJbvS3o="; + hash = "sha256-hQb+K8ogNj/s6ZO2kgS/sZZ35y4CwMeS3lVeMYNucYQ="; }; - patches = [ - # The 2 following patches can be removed with the next version bump. - # Backport of https://github.com/Nheko-Reborn/nheko/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0. - (fetchpatch { - name = "nheko-fmt10.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/nheko/-/raw/1b0d5c9eff6409dfd82953f346546d36c288a4a9/nheko-0.11.3-fix-for-fmt-10.patch"; - hash = "sha256-UYqAu2iXT3Bn/MxCtybiJrJLfVMOOVRchWqrGuPfapI="; - }) - # https://github.com/Nheko-Reborn/nheko/pull/1552 - (fetchpatch { - name = "nheko-fmt10.1.patch"; - url = "https://github.com/Nheko-Reborn/nheko/commit/614facf93c2b5d6118beb822cc542ac53a883c37.patch"; - hash = "sha256-rjsQNDfj3Lzbv8ow3qiNozGXQFrtYLhArS6a9JCdgBQ="; - }) - ]; - nativeBuildInputs = [ asciidoc cmake @@ -72,6 +53,7 @@ stdenv.mkDerivation rec { cmark coeurl curl + kdsingleapplication libevent libsecret lmdb @@ -79,19 +61,18 @@ stdenv.mkDerivation rec { nlohmann_json olm qtbase - qtgraphicaleffects qtimageformats qtkeychain qtmultimedia - qtquickcontrols2 qttools + qtwayland re2 spdlog - ] ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optionals voipSupport (with gst_all_1; [ + ] + ++ (with gst_all_1; [ gstreamer gst-plugins-base - (gst-plugins-good.override { qt5Support = true; }) + (gst-plugins-good.override { qt6Support = true; }) gst-plugins-bad libnice ]); @@ -100,7 +81,7 @@ stdenv.mkDerivation rec { "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; - preFixup = lib.optionalString voipSupport '' + preFixup = '' # add gstreamer plugins path to the wrapper qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 5f84fa7dd9aa8..f982124cb8436 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.12.0-beta.2"; + version = "7.13.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-Hpg9pkRXbwF5uKhLzn1cfHTzlYmsZd5tndtwVFcL7iU="; + hash = "sha256-DvYRvIA+rg4RKXbqWjWj7oFnfLboEiMeP7HgGYkRBDM="; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 7bc13c1f85390..6fdabc3159008 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.1.5"; + version = "5.1.7"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-dlPt87SKP17v9QFiRZSSUtSLVGTGbeo05G/p05l2zVc="; + hash = "sha256-OH9+cH5CQyrp4DSKXEMs6csGiH+GAtxJT4P9YidmAcM="; }; patches = [ diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index c20d8f0a80795..010470c6fbaab 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; homepage = "https://github.com/de-vri-es/weechat-autosort"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ emily flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index b8bb3bc3b2371..a67903c6fe98a 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -99,6 +99,6 @@ in buildPythonPackage { homepage = "https://github.com/poljar/weechat-matrix"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ tilpner emily ]; + maintainers = with maintainers; [ tilpner ]; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1d98adf9a58a6..307a805ddf1ee 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.11.1"; + version = "115.12.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "1a1f438c7047908788bc983aa681c3293ce02da006477b491a49ced5941433ca3381e01f76afc6bb5572415025acfd0fa657f063ef26b3a63646594c27202717"; + sha512 = "d262ec2cea3fd003e66974b0bd8d61fb268ad2a233e54a6aea4803c5520e235ea308267f0484581ce235063c4fb90e621cdc1eea3f62212574b90427ede1c289"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 9d6b95754c612..39c160c771d8b 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -46,10 +46,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # fix build with openssl 3.0 - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-p2p/transmission/files/transmission-3.00-openssl-3.patch"; - hash = "sha256-peVrkGck8AfbC9uYNfv1CIu1alIewpca7A6kRXjVlVs="; - }) + ./transmission-3.00-openssl-3.patch ]; outputs = [ "out" "apparmor" ]; diff --git a/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch b/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch new file mode 100644 index 0000000000000..f288298cbf3d4 --- /dev/null +++ b/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch @@ -0,0 +1,37 @@ +From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 15 May 2022 10:54:38 -0400 +Subject: [PATCH] openssl: load "legacy" provider for RC4 + +--- + libtransmission/crypto-utils-openssl.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c +index 45fd71913..14d680654 100644 +--- a/libtransmission/crypto-utils-openssl.c ++++ b/libtransmission/crypto-utils-openssl.c +@@ -20,6 +20,9 @@ + #include <openssl/rand.h> + #include <openssl/ssl.h> + #include <openssl/x509.h> ++#if OPENSSL_VERSION_MAJOR >= 3 ++#include <openssl/provider.h> ++#endif + + #include "transmission.h" + #include "crypto-utils.h" +@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle) + + tr_rc4_ctx_t tr_rc4_new(void) + { ++#if OPENSSL_VERSION_MAJOR >= 3 ++ OSSL_PROVIDER_load(NULL, "default"); ++ OSSL_PROVIDER_load(NULL, "legacy"); ++#endif + EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new(); + + if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1))) +-- +2.35.1 + diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index d5db07a819aca..08cdc3498811d 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,13 +38,13 @@ let pname = "pcloud"; - version = "1.14.5"; - code = "XZ0AMJ0ZdrENNeVMNI4Tz3lO1nxr577ryOMV"; + version = "1.14.6"; + code = "XZQDbs0Z4ET1VL0SIUuzr5ewR9LYuf6ssLRk"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-a577iWPrke3EizG03m0+hjSoPzA4wDai/QMX2Zl7MF0="; + hash = "sha256-3HUVIDxeq7svzeWyZrxlE4TjZ8lOwT8bYgyRFRzGnmU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/sync/lcsync/default.nix b/pkgs/applications/networking/sync/lcsync/default.nix index ac4731d8536a5..9ba34ab6319c0 100644 --- a/pkgs/applications/networking/sync/lcsync/default.nix +++ b/pkgs/applications/networking/sync/lcsync/default.nix @@ -7,7 +7,7 @@ stdenv }: stdenv.mkDerivation (finalAttrs: { - name = "lcsync"; + pname = "lcsync"; version = "0.3.0"; src = fetchFromGitea { diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 0ffd47435ff2f..11e24de45199e 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.66.0"; + version = "1.67.0"; src = fetchFromGitHub { owner = "rclone"; repo = "rclone"; rev = "v${version}"; - hash = "sha256-75RnAROICtRUDn95gSCNO0F6wes4CkJteNfUN38GQIY="; + hash = "sha256-rTibyh5z89QuPgZMvv3Y6FCugxMIytAg1gdCxE3+QLE="; }; - vendorHash = "sha256-zGBwgIuabLDqWbutvPHDbPRo5Dd9kNfmgToZXy7KVgI="; + vendorHash = "sha256-Sw9zZf0rup+VyncIpJHp9PKUp60lv+TV4wbWtVTTK3w="; subPackages = [ "." ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7007b59b30129..d679b168e24ff 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -47,7 +47,7 @@ , libGLU , libGL , bsh -, CoinMP +, coinmp , libwps , libabw , libargon2 @@ -97,7 +97,7 @@ , libetonyek , liborcus , libpng -, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false , qtbase ? null @@ -288,7 +288,7 @@ in stdenv.mkDerivation (finalAttrs: { # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html (libpng.override { apngSupport = false; }) perlPackages.ArchiveZip - CoinMP + coinmp perlPackages.IOCompress abseil-cpp ant diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 5f2a117198965..941f34231ca94 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-4J3Xjm22HQG5MhEI/t7bzNbsCrNS3Vuv24sEHw73npk="; + hash = "sha256-fv+bH0fjcuVrs2nx2+GP5JEBeJtea8/beJDgNGtkE4M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 400e073f69057..56cfa5168a486 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "kent"; - version = "465"; + version = "466"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = pname; rev = "v${version}_base"; - hash = "sha256-QeHqXSbad5LCmQ8DfLxl2pyXJvKV4G7uLXBtRd7LME0="; + hash = "sha256-zoDZ+8G0SHKfWmkXBqp+WSjQXtmkcTIZjrjPhUIJw1c="; }; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 19c021684b3ff..c3df8340d20c8 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { description = "Tooling for Yosys-based verification flows"; homepage = "https://symbiyosys.readthedocs.io/"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ thoughtpolice emily ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; mainProgram = "sby"; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index edc517b54d59e..62489b6ee2498 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.11.3"; + version = "0.12.1"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-tJJxCtCNuPtoQYABEViS1G6aHrMTLn+r3hlTTkaJvCg="; + hash = "sha256-iDnTjrVDH8qBYkvNjLHYmTaK8vScluDM4+W/5Rdo+Xc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/video/kodi/addons/formula1/default.nix b/pkgs/applications/video/kodi/addons/formula1/default.nix new file mode 100644 index 0000000000000..0d374dc65be1b --- /dev/null +++ b/pkgs/applications/video/kodi/addons/formula1/default.nix @@ -0,0 +1,29 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests }: + +buildKodiAddon rec { + pname = "formula1"; + namespace = "plugin.video.formula1"; + version = "2.0.2"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-aClAgkJKvixeKzrwgEsfDhPXiFv9+ULLmb8c9QTaUgM="; + }; + + propagatedBuildInputs = [ + requests + ]; + + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.formula1"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/jaylinski/kodi-addon-formula1"; + description = "Videos from the Formula 1 website"; + license = licenses.mit; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/infotagger/default.nix b/pkgs/applications/video/kodi/addons/infotagger/default.nix index da4528ed0afc5..7ac5e48071073 100644 --- a/pkgs/applications/video/kodi/addons/infotagger/default.nix +++ b/pkgs/applications/video/kodi/addons/infotagger/default.nix @@ -2,13 +2,13 @@ buildKodiAddon rec { pname = "infotagger"; namespace = "script.module.infotagger"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "jurialmunkey"; repo = namespace; rev = "v${version}"; - hash = "sha256-Us7ud0QORGn+ALB4uyISekp0kUYY8nN8uFNg8MlxEB0="; + hash = "sha256-Ns1OjrYLKz4znXRxqUErDLcmC0HBjBFVYI9GFqDVurY="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/plugin-cache/default.nix b/pkgs/applications/video/kodi/addons/plugin-cache/default.nix new file mode 100644 index 0000000000000..c21f5e136e41e --- /dev/null +++ b/pkgs/applications/video/kodi/addons/plugin-cache/default.nix @@ -0,0 +1,26 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "plugin-cache"; + namespace = "script.common.plugin.cache"; + version = "3.0.0"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-5QcMNmWOEw2C26OXlvAvxqDxTpjIMBhwmaIFwVgHuIU="; + }; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.plugin-cache"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/anxdpanic/script.common.plugin.cache"; + description = "Common plugin cache"; + license = licenses.gpl3Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/simplecache/default.nix b/pkgs/applications/video/kodi/addons/simplecache/default.nix new file mode 100644 index 0000000000000..35c2cc5a1a336 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/simplecache/default.nix @@ -0,0 +1,26 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "simplecache"; + namespace = "script.module.simplecache"; + version = "2.0.2"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-xdOBIi99nspcDIKkjxcW1r/BqL8O9NxdDViTuvMtUmo="; + }; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.simplecache"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/kodi-community-addons/script.module.simplecache"; + description = "A simple object cache for Kodi addons"; + license = licenses.asl20; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/upnext/default.nix b/pkgs/applications/video/kodi/addons/upnext/default.nix new file mode 100644 index 0000000000000..dccfce4c3f0f6 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/upnext/default.nix @@ -0,0 +1,26 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "upnext"; + namespace = "service.upnext"; + version = "1.1.9+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-oNUk80MEzK6Qssn1KjT6psPTazISRoUif1IMo+BKJxo="; + }; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.upnext"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/im85288/service.upnext"; + description = "Up Next - Proposes to play the next episode automatically"; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 6c104cef676d2..acb652e33cb77 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.16"; + version = "1.7.18"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-OApJaH11iTvjW4gZaANSCVcxw/VHG7a/6OnYcUcHFME="; + hash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; }; vendorHash = null; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index 413de25764114..859ddf6dcecc0 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -22,27 +22,27 @@ let plugins = { hy3 = { fetchFromGitHub, cmake, hyprland }: - mkHyprlandPlugin hyprland { + mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl0.40.0"; - hash = "sha256-Y9bIML3C5xyKKv+Yel4LUfSkScwGunOVZkg+Z1dPwHI="; + rev = "hl${version}"; + hash = "sha256-gEEWWlQRvejSR2RRg78Lubz6siIgknqj6CslveyyIP4="; }; nativeBuildInputs = [ cmake ]; dontStrip = true; - meta = with lib; { + meta = { homepage = "https://github.com/outfoxxed/hy3"; description = "Hyprland plugin for an i3 / sway like manual tiling layout"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.aacebedo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aacebedo ]; }; }; }; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix deleted file mode 100644 index 958e84ac78f0e..0000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, makeWrapper -, meson -, cmake -, ninja -, binutils -, cairo -, epoll-shim -, git -, hyprcursor -, hyprland-protocols -, hyprlang -, hyprwayland-scanner -, jq -, libGL -, libdrm -, libexecinfo -, libinput -, libuuid -, libxkbcommon -, mesa -, pango -, pciutils -, pkgconf -, python3 -, systemd -, tomlplusplus -, wayland -, wayland-protocols -, wayland-scanner -, xwayland -, hwdata -, seatd -, libdisplay-info -, libliftoff -, xorg -, debug ? false -, enableXWayland ? true -, legacyRenderer ? false -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, wrapRuntimeDeps ? true - # deprecated flags -, nvidiaPatches ? false -, hidpiXWayland ? false -, enableNvidiaPatches ? false -}: -assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; -assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; -assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; - -stdenv.mkDerivation (finalAttrs: { - pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.40.0-unstable-2024-05-05"; - - src = fetchFromGitHub { - owner = "hyprwm"; - repo = finalAttrs.pname; - fetchSubmodules = true; - rev = "f15513309b24790099d42974274eb23f66f7c985"; - hash = "sha256-zKOfgXPTlRqCR+EME4qjN9rgAnC3viI5KWx10dhKszw="; - }; - - postPatch = '' - # Fix hardcoded paths to /usr installation - sed -i "s#/usr#$out#" src/render/OpenGL.cpp - ''; - - # used by version.sh - DATE = "2024-05-05"; - HASH = finalAttrs.src.rev; - - depsBuildBuild = [ - # to find wayland-scanner when cross-compiling - pkg-config - ]; - - nativeBuildInputs = [ - hwdata - hyprwayland-scanner - jq - makeWrapper - cmake - meson # for wlroots - ninja - pkg-config - wayland-scanner - python3 # for udis86 - ]; - - outputs = [ - "out" - "man" - "dev" - ]; - - buildInputs = [ - cairo - git - hyprcursor - hyprland-protocols - hyprlang - libGL - libdrm - libinput - libuuid - libxkbcommon - mesa - wayland - wayland-protocols - pango - pciutils - tomlplusplus - # for subproject wlroots-hyprland - seatd - libliftoff - libdisplay-info - xorg.xcbutilerrors - xorg.xcbutilrenderutil - ] - ++ lib.optionals stdenv.hostPlatform.isBSD [ epoll-shim ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] - ++ lib.optionals enableXWayland [ - xorg.libxcb - xorg.libXdmcp - xorg.xcbutil - xorg.xcbutilwm - xwayland - ] - ++ lib.optionals withSystemd [ systemd ]; - - cmakeBuildType = - if debug - then "Debug" - else "RelWithDebInfo"; - - - cmakeFlags = [ - (lib.cmakeBool "NO_XWAYLAND" (!enableXWayland)) - (lib.cmakeBool "LEGACY_RENDERER" legacyRenderer) - (lib.cmakeBool "NO_SYSTEMD" (!withSystemd)) - ]; - - postInstall = '' - ${lib.optionalString wrapRuntimeDeps '' - wrapProgram $out/bin/Hyprland \ - --suffix PATH : ${lib.makeBinPath [binutils pciutils pkgconf]} - ''} - ''; - - passthru.providedSessions = [ "hyprland" ]; - - meta = with lib; { - homepage = "https://github.com/hyprwm/Hyprland"; - description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; - license = licenses.bsd3; - maintainers = with maintainers; [ wozeparrot fufexan ]; - mainProgram = "Hyprland"; - platforms = lib.platforms.linux; - }; -}) |