diff options
Diffstat (limited to 'pkgs/applications')
73 files changed, 625 insertions, 354 deletions
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 1c0ddd1942d30..09abaa862f513 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.2.9"; + version = "2.3.0"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-8vsYn/4qkANp6f6avtdaXHfJD+9NTHTrl7i4RTlKXPQ="; + sha256 = "sha256-7SuM7a8IIecAJ83QvJfUba/wArAEXywqL2HwVbeG8H4="; }; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix new file mode 100644 index 0000000000000..1f09d99c88893 --- /dev/null +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, glib +, gtk3 +, libsoup +, keybinder3 +, gst_all_1 +, wrapGAppsHook +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "goodvibes"; + version = "0.7.5"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-CE9f0GnXr7wSpp8jyW0ZxGKx16r6tOaObzQXKcy5nPY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk3 + libsoup + keybinder3 + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + postPatch = '' + patchShebangs scripts + ''; + + meta = with lib; { + description = "A lightweight internet radio player"; + homepage = "https://gitlab.com/goodvibes/goodvibes"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index 7811125bd2459..524f89a26ac3f 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchFromGitHub , rustPlatform , meson @@ -22,26 +21,18 @@ stdenv.mkDerivation rec { pname = "netease-cloud-music-gtk"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "gmg137"; repo = pname; rev = version; - hash = "sha256-0pmuzdRQBdUS4ORh3zJQWb/hbhk7SY3P4QMwoy4Mgp8="; + hash = "sha256-A3mvf6TZ3+aiWA6rg9G5NMaDKvO0VQzwIM1t0MaTpTc="; }; - patches = [ - (fetchpatch { - name = "add-cargo-lock-for-2.0.2.patch"; - url = "https://github.com/gmg137/netease-cloud-music-gtk/commit/21b5d40d49e661fe7bd35ed10bb8b883ef7fcd9f.patch"; - hash = "sha256-pSgc+yJQMNyLPYUMc1Kp/Kr+++2tH8srIM5PgVeoZ+E="; - }) - ]; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; - hash = "sha256-7Z5i5Xqtk4ZbBXSVYg1e05ENa2swC88Ctd2paE60Yyo="; + inherit src; + hash = "sha256-Y7rZTbg0zd/eoo6E8TmV8JJPs1N0bLlBjvB6W07Kelg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/applications/audio/tagger/default.nix index 5d4052a8efa78..992934cd8ccd0 100644 --- a/pkgs/applications/audio/tagger/default.nix +++ b/pkgs/applications/audio/tagger/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tagger"; - version = "2022.10.5"; + version = "2022.10.6"; src = fetchFromGitHub { owner = "nlogozzo"; repo = "NickvisionTagger"; rev = version; - hash = "sha256-rkpeecJUOBom0clrwftBa/VxACTihfMfWVmfbZhMQ50="; + hash = "sha256-eo7H2pNtSChUAqjO0ocFjsGt4I0e8ZOHbZ/GoZgUva8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 9ac34e61b238b..05542ef4c24eb 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "1jmhngxyn2yf7k1dn98yr9d20jlvkmskbpzz5kbzci36v2wfmjrp"; + sha256 = "02j6n693lhfn9x8kaz253xm76zzsdz8h10rkyxnlqiwwbn1wnmsa"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 3fa08757f7de7..35470a7b8542c 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-jU0qN+T5bHn9l/SXDR/Wa8uCGyJhIDUCHzEQe39L2MQ="; + hash = "sha256-GqFtCK5hxnEfIfw3ITufeu26yueknuFZhLtGSXmJ8fE="; }; - cargoHash = "sha256-hdScQd0Fd6gE9/f4kk0zjZLK42oK1aaDzIOcAIsJqbU="; + cargoHash = "sha256-p4t+G13XaCl7+IbX5YyBFF0PmARbw4XlRvnA0PRcjvQ="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; @@ -33,6 +33,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; homepage = "https://github.com/romanz/electrs"; diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index ca8f33bcd5c57..915cb938423dc 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,13 +9,13 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.25"; + version = "1.10.26"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mnf0kMfQEEQMricZJfyF7ZB/2F1dyPBx9iT2v/rGh1U="; + sha256 = "sha256-eefQEOeKb6gZIJdK9cq20WnhwZE1qbyd8Cl0Hqh2+u8="; }; vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0="; @@ -46,7 +46,7 @@ in buildGoModule rec { "cmd/utils" ]; - # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.25/build/ci.go#L218 + # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.26/build/ci.go#L218 tags = [ "urfave_cli_no_docs" ]; # Fix for usb-related segmentation faults on darwin diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 4d2f727193ec0..4f6ae53ec7845 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.49.0"; + version = "2.49.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-5HrPeLeMPh6hc1OLZVSPWMSV+ZwjgQyUmFCW+ZyYdCA="; + hash = "sha256-8KGZRTJu3uGFyf4vogoC9kDrKegD8Op4Z7gqQK+UFl8="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index f80a598aea932..af60ffc9e589a 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.174.0"; + version = "1.175.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-3jj04ndyuJpfXu9z8j/Pdp8yNybmzLbrPr/S+uV7Rfg="; + hash = "sha256-Q4T4CmMK+sxOst18pW4L4uMYzc/heMetntM0L+HrSlo="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 1d26a8731c59f..9ea04447272f4 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.10.24", - "hash": "sha256-IXMOZV4NNL7VHzlbzPCcYOPYneV7bDYm5L7Ge/SlnJs=" + "rev": "2022.11.03", + "hash": "sha256-U6jF+gXFOuPY512y4KWL18q8rZlfNwGqB9fTUHAHXl8=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.10.25", - "hash": "sha256-eleuHFE+kBmqKBVKOPzUAi+LVgzRr8gIKdCIPzfxUOo=" + "rev": "2022.11.03", + "hash": "sha256-BLKzmkIopcvbngQFWS+f1MQfMBOpZ9S2qch7cDGY7/0=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -36,8 +36,8 @@ }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2021.10.27", - "hash": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA=" + "rev": "2022.10.26", + "hash": "sha256-pVVO3PMazcGizN3RI4zO2tgLJLDOYIKhwnMLBJ5IiwY=" }, "Emmet-Pascal": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix index a2605f33778d9..d4079a53dcaa0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix @@ -2,6 +2,8 @@ , trivialBuild , fetchFromGitHub , emacs +, evil +, markdown-mode }: trivialBuild rec { @@ -15,11 +17,9 @@ trivialBuild rec { hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8="; }; - buildInputs = [ - emacs - ] ++ propagatedUserEnvPkgs; + buildInputs = propagatedUserEnvPkgs; - propagatedUserEnvPkgs = with emacs.pkgs; [ + propagatedUserEnvPkgs = [ evil markdown-mode ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3282207ad797f..7b4bb66cdf6e8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4558,6 +4558,18 @@ final: prev: meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; + material-vim = buildVimPluginFrom2Nix { + pname = "material.vim"; + version = "2022-09-14"; + src = fetchFromGitHub { + owner = "kaicataldo"; + repo = "material.vim"; + rev = "81d5d0bb30677b0846a2721a600f2f45db6d10a7"; + sha256 = "1j23wi0hh5h0pc0rk5dxvsc60k484h5haa2gfxzahjqd7kzil4y8"; + }; + meta.homepage = "https://github.com/kaicataldo/material.vim/"; + }; + mayansmoke = buildVimPluginFrom2Nix { pname = "mayansmoke"; version = "2010-10-18"; @@ -5086,6 +5098,18 @@ final: prev: meta.homepage = "https://github.com/kassio/neoterm/"; }; + neotest = buildVimPluginFrom2Nix { + pname = "neotest"; + version = "2022-10-27"; + src = fetchFromGitHub { + owner = "nvim-neotest"; + repo = "neotest"; + rev = "0be9899e859da147ad28c23a30a1df2081c16741"; + sha256 = "08f7d8w82jk5jd2w4wrh8x4gyw0msv7m82cpzd1ahijg917818pd"; + }; + meta.homepage = "https://github.com/nvim-neotest/neotest/"; + }; + neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; version = "2022-10-29"; @@ -5830,6 +5854,18 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; + nvim-luadev = buildVimPluginFrom2Nix { + pname = "nvim-luadev"; + version = "2022-01-26"; + src = fetchFromGitHub { + owner = "bfredl"; + repo = "nvim-luadev"; + rev = "2a2c242bd751c289cfc1bc27f357925f68eba098"; + sha256 = "0prwzxgg6fqkfmqqs41c1c81lch2x4qrs7287l5b104rz3alcinn"; + }; + meta.homepage = "https://github.com/bfredl/nvim-luadev/"; + }; + nvim-luapad = buildVimPluginFrom2Nix { pname = "nvim-luapad"; version = "2022-10-26"; @@ -7877,6 +7913,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; + telescope_hoogle = buildVimPluginFrom2Nix { + pname = "telescope_hoogle"; + version = "2022-10-27"; + src = fetchFromGitHub { + owner = "luc-tielen"; + repo = "telescope_hoogle"; + rev = "6322f74655a2773974377a8fc8d170c00f24938f"; + sha256 = "1pjq5bwnrxb3qhvvqd9v996hqfkbg5ah7qmbzrq1287h13m5jy2n"; + }; + meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/"; + }; + template-string-nvim = buildVimPluginFrom2Nix { pname = "template-string.nvim"; version = "2022-08-18"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a923677b7cfef..6650e74ce48bf 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -381,6 +381,7 @@ https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/chentoast/marks.nvim/,, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, +https://github.com/kaicataldo/material.vim/,HEAD, https://github.com/vim-scripts/mayansmoke/,, https://github.com/echasnovski/mini.nvim/,, https://github.com/wfxr/minimap.vim/,, @@ -426,6 +427,7 @@ https://github.com/karb94/neoscroll.nvim/,, https://github.com/Shougo/neosnippet-snippets/,, https://github.com/Shougo/neosnippet.vim/,, https://github.com/kassio/neoterm/,, +https://github.com/nvim-neotest/neotest/,HEAD, https://github.com/MrcJkb/neotest-haskell/,HEAD, https://github.com/rose-pine/neovim/,main,rose-pine https://github.com/Shatur/neovim-ayu/,, @@ -490,6 +492,7 @@ https://github.com/mfussenegger/nvim-lint/,, https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,, https://github.com/neovim/nvim-lspconfig/,, https://github.com/RishabhRD/nvim-lsputils/,, +https://github.com/bfredl/nvim-luadev/,HEAD, https://github.com/rafcamlet/nvim-luapad/,, https://github.com/scalameta/nvim-metals/,, https://github.com/gpanders/nvim-moonwalk/,, @@ -660,6 +663,7 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, https://github.com/nvim-telescope/telescope.nvim/,, +https://github.com/luc-tielen/telescope_hoogle/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, https://github.com/wincent/terminus/,, diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index a05b0e48e0be7..f4d25b8547f4c 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "vis"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "1g05ncsnk57kcqm9wsv6sz8b24kyzj8r5rfpa1wfwj8qkjzx3vji"; + sha256 = "sha256-XvWj6fZxzXeRA5oCAqIIwlfjrJcHnDrjeiPExEQKSkY="; repo = "vis"; owner = "martanne"; }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 637aefc3074dd..337db00d6c5d5 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0cf6zlwslii30877p5vb0varxs6ai5r1g9wxx1b45yrmp7rvda91"; - x86_64-darwin = "0j9kb7j2rvrgc2dzxhi1nzs78lzhpkfk3gcqcq84hcsga0n59y03"; - aarch64-linux = "1bf2kvnd2pz2sk26bq1wm868bvvmrg338ipysmryilhk0l490vcx"; - aarch64-darwin = "1rwwrzabxgw2wryi6rp8sc1jqps54p7a3cjpn4q94kds8rk5j0qn"; - armv7l-linux = "0p2kwfq74lz43vpfh90xfrqsz7nwgcjsvqwkifkchp1m3xnil742"; + x86_64-linux = "1dcp6r78kaq3wzcw7dfra59kfpdzqy9qnlyp1ywayxh610ryjyfc"; + x86_64-darwin = "0ypxjh5z0v83y0wb22m942qqlvx5df7k4dk8ip9wqd4p7h8540q8"; + aarch64-linux = "1qq4zg0j3rpx06cqaic7a1x7ckk5wf8w1gp5y8hwhvkym4s8g4i7"; + aarch64-darwin = "18hrsvr7hgmlpi64dbk581i516my6c5zwz6g8awp4fhxilk0wbrg"; + armv7l-linux = "1y357ci4gllxg26m5qdv9652i5rra5vj972l7kdnxiimfgm6h83b"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.72.2"; + version = "1.73.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index f1432d8db5585..b88e5f2647290 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14337-5210df688"; - rpcs3Version = "0.0.24-14337-5210df688"; - rpcs3Revision = "5210df688262ec7fd8c21230d30e568d98724c8f"; - rpcs3Sha256 = "1m0j53xl6g01s27bi2p9j23m724gq7a3hss7kqhc239a5m9akqdg"; + rpcs3GitVersion = "14358-a00f9e421"; + rpcs3Version = "0.0.25-14358-a00f9e421"; + rpcs3Revision = "a00f9e42115527aa9654870f194cf2c64329f2ef"; + rpcs3Sha256 = "0avajihbs02nbfqs4kzgckl0v2z4z8h8fgcjs5m4zxvkgj5701nv"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 3fd7a488e40b5..fc940cfce3018 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -3,11 +3,11 @@ , lib , fetchurl # native -, autoreconfHook +, cmake , pkg-config # not native , gdal -, wxGTK31 +, wxGTK32 , proj , dxflib , curl @@ -31,24 +31,20 @@ mkDerivation rec { pname = "saga"; - version = "7.9.1"; + version = "8.4.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-Jq1LhBSeJuq9SlNl/ko5I8+jnjZnLMfGYNNUnzVWo7w="; + sha256 = "sha256-v6DPwV20fcsznrEaFJk0/ewU4z3cTjzYYuLkyMwSLV0="; }; + sourceRoot = "saga-${version}/saga-gis"; + nativeBuildInputs = [ - # Upstream's gnerated ./configure is not reliable - autoreconfHook + cmake pkg-config ]; - configureFlags = [ - "--with-system-svm" - # hdf is no detected otherwise - "HDF5_LIBS=-l${hdf5}/lib" - "HDF5_CFLAGS=-I${hdf5.dev}/include" - ]; + buildInputs = [ curl dxflib @@ -56,7 +52,7 @@ mkDerivation rec { libsvm hdf5 gdal - wxGTK31 + wxGTK32 proj libharu opencv @@ -77,9 +73,9 @@ mkDerivation rec { sqlite ]; - enableParallelBuilding = true; - - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; + cmakeFlags = [ + "-DOpenMP_SUPPORT=${if stdenv.isDarwin then "OFF" else "ON"}" + ]; meta = with lib; { description = "System for Automated Geoscientific Analyses"; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 83fd78c631340..8a40bac446e88 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,6 +5,7 @@ , cairo , cmake , fetchurl +, fetchpatch , gettext , ghostscript , glib @@ -78,6 +79,12 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + + # Fix build with Poppler 22.09 + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/b2f65dfb60ae0c8cd6cd9affd3d71064082a6201/trunk/inkscape-1.2.1-poppler-22.09.0.patch"; + sha256 = "pArvsS/qoCTMAisF8yj3agZKrb90zRFZkck1TX0KeGc="; + }) ]; postPatch = '' diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index b5964adbbca96..eb0eaaeda95d1 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , alsa-lib , appstream-glib +, clang +, cmake , desktop-file-utils , gio-sharp , glib @@ -22,24 +24,26 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.4"; + version = "0.5.7"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-CZLZblC10k5ynzDDXi/bOe6Rc6M94eywXjyu0ABOVq4="; + hash = "sha256-w4y+t8idcaNwvC2Wp9SRjcd4m23Zt+yHG2fjOA2rBU8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Udat35KqrMWR0Ckx34BWoF0HiJHZ5CP2CGFD6FNCWRA="; + hash = "sha256-Hybbbokru4vz5ly3oZuNGdBa+lYbhdYjESUpRxIUqJc="; }; nativeBuildInputs = [ appstream-glib # For appstream-util + clang + cmake desktop-file-utils # For update-desktop-database meson ninja @@ -52,6 +56,8 @@ stdenv.mkDerivation rec { wrapGAppsHook4 ]; + dontUseCmakeConfigure = true; + buildInputs = [ alsa-lib gio-sharp @@ -63,6 +69,8 @@ stdenv.mkDerivation rec { poppler ]; + LIBCLANG_PATH = "${clang.cc.lib}/lib"; + postPatch = '' pushd build-aux chmod +x meson_post_install.py diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 89223b2262826..85579f0521961 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.24.3"; + version = "1.24.4"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-zwAmMj9Px27e/xJPAsOUh4saCZNQYBdse0bcZu8M3xA="; + sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index 4e03059a8cc4a..5cfb8c7039eb6 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dstask"; - version = "0.23.1"; + version = "0.25"; src = fetchFromGitHub { owner = "naggie"; repo = pname; rev = "v${version}"; - sha256 = "0rfz8jim0xqcwdb5n28942v9r3hbvhjrwdgzvbwc9f9psqg2s8d2"; + sha256 = "sha256-nsEn9ZhrSWO0kltyEXaehMcFpqVbivSsXOxu/AX7A9U="; }; # Set vendorSha256 to null because dstask vendors its dependencies (meaning @@ -30,8 +30,6 @@ buildGoModule rec { "-X github.com/naggie/dstask.GIT_COMMIT=v${version}" ]; - subPackages = [ "cmd/dstask.go" ]; - meta = with lib; { description = "Command line todo list with super-reliable git sync"; homepage = src.meta.homepage; diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 0d01122e6a5ff..f1df7445fbe0a 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.15"; + version = "3.0.16"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-QeUopHBW3KZGkYklOJIjlNCQG+aab2vwbIsVBfQ07R4="; + hash = "sha256-hL4Ytu9zf8x+H/TuvJ3m0E3d8gMZFIDogWEYlaOap+g="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index aecd7a4b09001..7b2973b5075e7 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18570"; + version = "18583"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-EAEh/n7M56rzjtkIs8ZteDvOLuHxNsMyT7VGFyPre6s="; + hash = "sha256-6S6E7ngTCBXb0epPfYxIswLvfm9r2Ql0wgOs/PxpmIM="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-2xsHsaDxm/wjiCyS5tmD8uUlLrBdd3sS8JLal3pX3pA="; + hash = "sha256-3XEoSCXEpeqZj1y4nns5+0JR1SINYE1rsmQ4fMflxRQ="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index c79b709686154..26d5c3b65a368 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.9"; + version = "0.8.10"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-s9xG2SLkuaz8wRK47ywSw9JjsJlRjaMNeRmQY0ZnrK8="; + sha256 = "sha256-n6uRMkV/+U2M0/FjQJx0LIDGgeIX6TY58j2sweSmlbc="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index 2f33bb9935d23..f4c7869f152c7 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mangal"; - version = "3.14.2"; + version = "4.0.1"; src = fetchFromGitHub { owner = "metafates"; repo = pname; rev = "v${version}"; - hash = "sha256-W3oToI7frUfd3zwtr3UpbwAWzCVxDaZY9zhn8dO/4wA="; + hash = "sha256-pMiZgO/+koyIDm7ONZn0qEq+d6HeFfQFaU1Qjovqmc4="; }; proxyVendor = true; diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index a463f6e3eecb7..3108d78e8ff8b 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "4.2.1"; + version = "4.3.1"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cDX6XiAPFIS/csVpRl7yyAexiZwjmxp1Ng9gAo1uUw8="; + sha256 = "sha256-Utpv9VdX5vuUWDSGc3YcF8tHbvUZpPeXEDP4NKts+vI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 2ef17f9c1cdf3..85ef0c436691f 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.0.0"; + version = "1.0.3"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-KVWqdXzbQT93Dj4yesdnfFwAdYin1vfpPsj/ur1AGA0=" else "sha256-H1Cl9SBz/mwN8gezFkcV4KxI7+xVjQV2AtyLKyjVpI8="; + sha256 = if stdenv.isDarwin then "sha256-DYF9fEpZaP4tD/eeZAegDahR7UZyroqNB9bn2U7sgXs=" else "sha256-MpQk5g4184ZkCAjLU5Ug0ReWgVADskS1QuMcnPdNofs="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index f756e9788ac95..d401b2c421954 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -26,6 +26,7 @@ , avahi-compat # MacOS / darwin +, darwin , ApplicationServices , Carbon , Cocoa @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { patches = [ # Without this OpenSSL from nixpkgs is not detected ./darwin-non-static-openssl.patch + ] ++ lib.optionals (stdenv.isDarwin && !(darwin.apple_sdk.frameworks ? UserNotifications)) [ # We cannot include UserNotifications because of a build failure in the Apple SDK. # The functions used from it are already implicitly included anyways. ./darwin-no-UserNotifications-includes.patch @@ -76,6 +78,8 @@ stdenv.mkDerivation rec { Cocoa CoreServices ScreenSaver + ] ++ lib.optionals (stdenv.isDarwin && darwin.apple_sdk.frameworks ? UserNotifications) [ + darwin.apple_sdk.frameworks.UserNotifications ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux @@ -97,7 +101,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF" - ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.targetPlatform.darwinSdkVersion}"; + # NSFilenamesPboardType is deprecated in 10.14+ + ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.targetPlatform.darwinSdkVersion}"; doCheck = true; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 80a2047b61f84..be770a3021e8b 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.14"; + version = "0.9.15"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-1tnFBUB7/MjnrCkfKOR2SZ/GB5Ik115zsnwjkNMB05E="; + sha256 = "sha256-u2nEMS0lJ/Kf09+mWYWQLji9MVgjYAfUi5bmPEfTfFc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 7b94af3b52a11..f5c8e90d2703c 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config +{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config , libtool, openssl, qtbase, qttools, sphinx }: mkDerivation rec { @@ -12,6 +12,12 @@ mkDerivation rec { sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk"; }; + # Adaptions to stay OpenSSL 3.0 compatible + patches = [ (fetchpatch { + url = "https://github.com/chris2511/xca/commit/f5ac099e948ea354deac75ff9fa09d51453476e1.patch"; + hash = "sha256-4rRO2y9hZq879HTsgBgbXGRYEcgfG4niJKyK3l3PMZ8="; + }) ]; + buildInputs = [ libtool openssl qtbase ]; nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ]; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 7beaff12a337c..6cac0b4a5ab64 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "106.0.1-1", + "packageVersion": "106.0.3-1", "source": { - "rev": "106.0.1-1", - "sha256": "0dg4dvpa4fqhaikqnyqvxmi84g4gw535rdxmax724d0m6ksjm5yh" + "rev": "106.0.3-1", + "sha256": "0f0nz7fbp9k1pz7i8lh3fq3218crwqw2fdy9ia9hi9nlnybh114f" }, "firefox": { - "version": "106.0.1", - "sha512": "15f5a65a69e11dd0c463b358cafb5ad0f31db93619b9ec3f89e8c5e14d4d319d9423fe4dcd0dbbcbedc1ad444dcbd8e5e30e483220277f5b550bff6124b66519" + "version": "106.0.3", + "sha512": "226bde9082330abe134d1726cec59b473d4d6839ea55ca20faddb901f032d89eb9d2bd5d887ccd4ba515c6b1a44817420cfee2e9f4f8a79ed46a38287083d28d" } } diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index cefe6b575be17..577e4ba883d1a 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-ST5XVgij1h+4EWLlwdFmIYZ0RPSH5IoTw0YdP0a+Sa4="; + sha256 = "sha256-eVd3tH77Z3AlNpMEx+xnOQTELXFeGTLIslE++++Sdkw="; }; - vendorSha256 = "sha256-h6Ioy1wBOAOCGcqcLlPyqX5pyx22BIiHKx4ct0HmnyA="; + vendorSha256 = "sha256-n8NAxfNZ/q2gdA5N7dTNgvdB549aiRxFPJO4UsfIn2U="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 296679e487c52..2701a101b023e 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd"; - version = "2.4.15"; + version = "2.5.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-2D9JYQshq9riZsZxFpV10b8bnkg82Jnh4Cx/TSryZ4I="; + sha256 = "sha256-UwMJnmvwcN/OuIbFJJEE7A5WFjzfvpe5ljMmbSLQsnA="; }; - vendorSha256 = "sha256-n6elT6ETOtbZsFqfwMo9d2qqamS8jdrROjFjStNkalc="; + vendorSha256 = "sha256-LmIvNenKV6ie2FZBj/jN70pKe1m8kFg/IQ8z5q8tO8A="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 @@ -26,7 +26,7 @@ buildGoModule rec { "-X ${package_url}.gitCommit=${src.rev}" "-X ${package_url}.gitTag=${src.rev}" "-X ${package_url}.gitTreeState=clean" - "-X ${package_url}.kubectlVersion=v0.23.1" + "-X ${package_url}.kubectlVersion=v0.24.2" # NOTE: Update kubectlVersion when upgrading this package with # https://github.com/argoproj/argo-cd/blob/v${version}/go.mod#L95 # Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18 diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 203b0f37a3bf5..0728a03e976b8 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.31"; + version = "1.12.33"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-t/i1UhPfhT7+HAhVBhZKQezqpFrBrzimUHjIozQeJnk="; + hash = "sha256-T/fkQxRcwDYppGpAu1sBg8Oe8dAa4Bk/jt4jYMikPBE="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-MRBnwpuqYElxA4V1x7F4wccKV3T51RopfT37QUr7G4Y="; + vendorSha256 = "sha256-G26BfTdXMQP0U4FDRYkJNfUOGfqow714WPNBnBrXLZQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 774efb044af1f..9c28ba063e243 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, makeWrapper +, fetchpatch }: buildGoModule rec { @@ -15,7 +15,16 @@ buildGoModule rec { sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg="; }; - vendorSha256 = "sha256-OAFxEb7IWhyRBEi8vgmekDSL/YpmD4EmUfildRaPR24="; + patches = [ + # https://github.com/instrumenta/kubeval/pull/346 + (fetchpatch { + name = "bump-golang.org/x/sys.patch"; + url = "https://github.com/instrumenta/kubeval/commit/d64502b04d9e1b85fd3d5509049adb50f3e39954.patch"; + sha256 = "sha256-S/lgwdykFLU2QZRW927fgCPxaIAMK3vSqmH08pXBQxM="; + }) + ]; + + vendorSha256 = "sha256-R/vVrLsVSA9SGra4ytoHlQkPaIgQaj/XdivcQp8xjSM="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 6d86bc79e6b28..abaff42f3a32e 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal-cli"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - sha256 = "sha256-XEN4Ntt7yHng1+3E5SlxthEWPXJ+kSx9L1GbW9bV03Y="; + sha256 = "sha256-rdDtgSM2wZsHYv9tBNdcSHYXdvvEk5wqdLr1KjoPz1E="; }; vendorSha256 = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw="; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e7c0f949b5289..dd8b93a56528e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -111,13 +111,13 @@ "version": "2.24.1" }, "aws": { - "hash": "sha256-qm6iXQFnCFGSL9TsJlIwl/qTPagSaWbJOmLlzFBFAzo=", + "hash": "sha256-TQzVuqUhAfEqzCcxA5l993ww9X1dcBeKvddJKzYsBH8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.37.0", - "vendorHash": "sha256-EnCFfs+REgT3q2OprotXNvnLka4JRfj5c0VTi7Js7zc=", - "version": "4.37.0" + "rev": "v4.38.0", + "vendorHash": "sha256-6IyBJJV+PRFc8f12fBhtOUjbJdyQYanhsvAxugFf/EE=", + "version": "4.38.0" }, "azuread": { "hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=", @@ -129,13 +129,13 @@ "version": "2.30.0" }, "azurerm": { - "hash": "sha256-TOm7e3yLTsmWCIDHklUncCjI5vbd0u/HWH/koOL95u4=", + "hash": "sha256-SV5td8GMEpLGLQgbl+1v9F2/hIrXpKsMBfOK+2+jDvk=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.29.1", + "rev": "v3.30.0", "vendorHash": null, - "version": "3.29.1" + "version": "3.30.0" }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", @@ -147,14 +147,13 @@ "version": "1.0.0" }, "baiducloud": { - "deleteVendor": true, - "hash": "sha256-mM4wikawrXdePX2ZemsjyoHrf0LQ0gwoUspcbvBUSeA=", + "hash": "sha256-NKeCPoyeWGWyWScCqCsm4s0U9zCojJ6+OOr+nDdIFqM=", "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.16.3", - "vendorHash": "sha256-UxVRz0Nhz6jqXPlAAJZ+GJFu30JJ4hYvVi5OlXInE0g=", - "version": "1.16.3" + "rev": "v1.17.0", + "vendorHash": null, + "version": "1.17.0" }, "bigip": { "hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=", @@ -350,13 +349,13 @@ "version": "0.14.1" }, "docker": { - "hash": "sha256-hUKe9VjaNbiPhbxyFKly5PlKWngU2pl6ygwRJSokxr8=", + "hash": "sha256-/vz4rjENlVl9gqtxfqCV+k2SgsHZBcmA9Mz10Y2ay/E=", "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.22.0", - "vendorHash": "sha256-9dsmWkIYrN+GDd/r7kKYUyj+77hKuVilfpVUMpQMseo=", - "version": "2.22.0" + "rev": "v2.23.0", + "vendorHash": "sha256-0JRJAwc4LbPXi6GJdrIGwuIaCzaP5MtIMuijYoOEjYA=", + "version": "2.23.0" }, "elasticsearch": { "hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=", @@ -451,24 +450,24 @@ "version": "3.18.0" }, "google": { - "hash": "sha256-LyPvK1IPCCfYcRfh9nPyPBZh1cU3sSkUb6tYKUko2C4=", + "hash": "sha256-MvLzXucKSqyTO9bjbXtBzh3XsOizw0waMGDFhrYtoWM=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.42.0", + "rev": "v4.42.1", "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", - "version": "4.42.0" + "version": "4.42.1" }, "google-beta": { - "hash": "sha256-Yi5nFjnYXFztqQURX3LIdmFNam7Ebhp0jTTXyTcX28Q=", + "hash": "sha256-dtj1LWIXvjInGtbXy5FBdNmQzp+PRKXpnYzsSL/fIaE=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.42.0", + "rev": "v4.42.1", "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", - "version": "4.42.0" + "version": "4.42.1" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -580,13 +579,13 @@ "version": "0.1.2" }, "ibm": { - "hash": "sha256-OcOmcTZe2J0cz9glVi/oLp55QrhsOpT0sj0PS32vnow=", + "hash": "sha256-zxPl76D5ddw+7WowQf4LY9MYTGfX3CMEBQofXKwbowQ=", "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.46.0", - "vendorHash": "sha256-Zhk2Q7tnL3P/uLo/61o/XiiMKBdmb2749S/Ax1ZrxAo=", - "version": "1.46.0" + "rev": "v1.47.0", + "vendorHash": "sha256-Ggiu+nGTABxK+HiBvY2l/l3+Gqg4GoczZJf69v3Ylfk=", + "version": "1.47.0" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -715,14 +714,14 @@ "version": "2.0.3" }, "lxd": { - "hash": "sha256-x0f8kP7OsgSD8d9vu99vp7Xq3szwLKxoAZdUCJc8B7A=", + "hash": "sha256-DfRhPRclg/hCmmp0V087hl66WSFbEyXHFUGeehlU290=", "owner": "terraform-lxd", "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", "proxyVendor": true, "repo": "terraform-provider-lxd", - "rev": "v1.7.3", + "rev": "v1.8.0", "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=", - "version": "1.7.3" + "version": "1.8.0" }, "mailgun": { "hash": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=", @@ -843,13 +842,13 @@ "version": "1.7.1" }, "oci": { - "hash": "sha256-PSkD2HXGmSimJYQPZKuVCGvEa0sSNc4XMRRrM5O+/QE=", + "hash": "sha256-7822cLdHruCOYu0UGX5KV0f4+W2lQSb2b5SaLDM8cts=", "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.96.0", + "rev": "v4.98.0", "vendorHash": null, - "version": "4.96.0" + "version": "4.98.0" }, "okta": { "hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=", @@ -888,13 +887,13 @@ "version": "1.49.0" }, "opentelekomcloud": { - "hash": "sha256-oqagD7YK/HyAoeI5WBrHuAmWiLoz/1441zne8vqN3A8=", + "hash": "sha256-L28nrY2/UBi/W/mmK5ZPQub2Jf9vMethQo6JsSkepwU=", "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.31.6", - "vendorHash": "sha256-AuxvQffKOHPqda8nMJPxWVMui9+d8IhmbPsZK/9A1yI=", - "version": "1.31.6" + "rev": "v1.31.7", + "vendorHash": "sha256-wEtpZzrQoL0yJLsviwHI019KI04O+FAkXMsaJFztL/8=", + "version": "1.31.7" }, "opsgenie": { "hash": "sha256-DhECesGkBaQuk43pF4xk6zln+FzgL+1A1rSm0sqg7XQ=", @@ -915,13 +914,13 @@ "version": "0.22.0" }, "pagerduty": { - "hash": "sha256-S55TSm3aFe9ACo+ysNRnyQ/U55C2KoZroQEHVBXsSPI=", + "hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=", "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.3", + "rev": "v2.6.4", "vendorHash": null, - "version": "2.6.3" + "version": "2.6.4" }, "panos": { "hash": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=", @@ -1086,13 +1085,13 @@ "version": "0.7.1" }, "spotinst": { - "hash": "sha256-mcj16B7VM5mc5UUXSLdcGApPac6xPU86H0lgpeR1FMs=", + "hash": "sha256-9i8mHWn9+ey0tHPXOjZyNixcrdgAl2Y8sJq/q4WlZzo=", "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.86.0", + "rev": "v1.87.0", "vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=", - "version": "1.86.0" + "version": "1.87.0" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", @@ -1131,13 +1130,13 @@ "version": "0.13.5" }, "tencentcloud": { - "hash": "sha256-0nPMT5jZxqKbCLQmjBywCBh1T2P2Q1NdghXH12BXaE4=", + "hash": "sha256-lWePRU8kmOjOq9giCMdU5Aeb74WR/s6wIzShjzDBFjc=", "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.6", + "rev": "v1.78.7", "vendorHash": null, - "version": "1.78.6" + "version": "1.78.7" }, "tfe": { "hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=", @@ -1158,13 +1157,13 @@ "version": "1.0.0" }, "time": { - "hash": "sha256-tDYrKU/kggrv/p8QZ0LbHjQSOaNrQ0qy9ekY7DAXqEA=", + "hash": "sha256-FehWmIkL0o2pleafN/mlBa46cdFqCFUS+coOwFPdb9M=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", - "rev": "v0.9.0", - "vendorHash": "sha256-I4CnaSyn32S7FM56dYWZhzGUKByP2DXD0t/eBOL2ALs=", - "version": "0.9.0" + "rev": "v0.9.1", + "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=", + "version": "0.9.1" }, "tls": { "hash": "sha256-DBOkfvT0+mlgaWiBHggZUKvHL8jLZjQjRi0xFZKgcoM=", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 77939cfe42849..6614669518094 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.3"; - sha256 = "sha256-Oqswfw/ZkBJKldRd916Jfaugz66C3wE8VU44kAkGmUA="; - vendorSha256 = "sha256-mXCtgB1MdMP2XlJBagaDtZURw5o0JudAB2koHmfM0f8="; + version = "1.3.4"; + sha256 = "sha256-UaMZTBmaLHbW1mNjDrMQSPMLKRIADlVvyP2qwuAv2Zo="; + vendorSha256 = "sha256-Wwf2EcqtlNqcGijR8WWcdSsayJrbZO68JEBPKWHXHuw="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index be26e31c7e39b..cce2b739e1001 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "sha256-H1Nuu/T55e5zWUmofKoyVSA4TaJBdK+JeZtw+G/sC54="; + sha256 = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; }; - vendorSha256 = "sha256-ivkTtcvoH+i58iQM9T0xio0YUeMhNzDcmrCSuGFljEI="; + vendorSha256 = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 97a8d7d074e1b..7e7830fd1b56a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.62.0"; # Please backport all updates to the stable channel. + version = "5.63.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-ehRwGZM4lj+pgxUnBlBfcYt2JypuZ5PX3S5ymZriRWA="; + sha256 = "sha256-f8gQUnmI/VU0FteoMVY0k0RK1R7Ho7JRx+WoMhKki4s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 62327a8e9a898..3e6dfb1a7d22e 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -11,7 +11,6 @@ , openssl , pkg-config , c-ares -, abseil-cpp , libGL , zlib , curl @@ -51,7 +50,6 @@ mkDerivation rec { grpc protobuf openssl - abseil-cpp c-ares ]; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 35b4fa3aef43a..3d12b11b51410 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ... }: +{ lib, stdenv, fetchurl, libxcrypt, ... }: stdenv.mkDerivation rec { pname = "resilio-sync"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -D rslsync "$out/bin/rslsync" patchelf \ --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc ]} "$out/bin/rslsync" + --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc libxcrypt ]} "$out/bin/rslsync" ''; meta = with lib; { diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 8ceca271f11af..4bfe3efec1217 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-jAXxgSm0eEdFylukYGhIGtA0KniMiln1BIfuGZoboSM="; + hash = "sha256-XndTMPO1lN6bsjeHbvrZ+i4VwaKoUOcWOfbVQ2E7/eo="; }; - vendorSha256 = "sha256-yabX1A4Q/0ZQFMCrvO5oCI5y0o/dqQy3IplxZ6SsHuw="; + vendorSha256 = "sha256-ZxA05K5zKmQIm2R525DNXpGXqwM33j3PCuPN5d2qcj8="; doCheck = false; diff --git a/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix b/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix new file mode 100644 index 0000000000000..3ceb5c0e1afd2 --- /dev/null +++ b/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix @@ -0,0 +1,43 @@ +{ lib, writeScript, qt5, fetchurl, autoPatchelfHook }: + +qt5.mkDerivation rec { + pname = "synology-cloud-sync-decryption-tool"; + version = "027"; + + src = fetchurl { + url = "https://global.download.synology.com/download/Utility/SynologyCloudSyncDecryptionTool/${version}/Linux/x86_64/SynologyCloudSyncDecryptionTool-${version}_x64.tar.gz"; + sha256 = "sha256-EWxADvkfhnMwHIauJj3pH6SvSkkrc4cwAhsf1pWOOWQ="; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $NIX_BUILD_TOP/SynologyCloudSyncDecryptionTool $out/bin + + runHook postInstall + ''; + + passthru.updateScript = writeScript "update-synology-cloud-sync-decryption-tool" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + + set -euo pipefail + + version="$(curl -s https://www.synology.com/en-uk/releaseNote/SynologyCloudSyncDecryptionTool \ + | grep -oP '(?<=data-version=")\d+' \ + | head -1)" + update-source-version synology-cloud-sync-decryption-tool "$version" + ''; + + meta = with lib; { + description = "A desktop tool to decrypt data encrypted by Cloud Sync."; + homepage = "https://kb.synology.com/en-global/DSM/help/SynologyCloudSyncDecryptionTool/synologycloudsyncdecryptiontool"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ kalbasit ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 4efec422ce315..5a1a59d7c6e1f 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -9,7 +9,7 @@ , pkg-config , python3 , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 , glib , gtk4 , libadwaita @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; - repo = "warp"; + repo = pname; rev = "v${version}"; - hash = "sha256-ajz450ix68TDkhyAZd1IgZA/jUnXULrYZOSdcoOL+S0="; + hash = "sha256-0zjtaF0RwI7Sj2D5vRaiBJI+Bp/F17VO9ywMRqZyqxI="; }; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-08xbd2YmJw2NTrxBrnJZMV2VvX6V0eX+fxbEEWFoC9c="; + hash = "sha256-HotArxXfmT6Gw6ZZZQ4X6bTx0EFb6vZLbXxhddmGID8="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix index 44cd2ed0051f9..4c3735f77d5c3 100644 --- a/pkgs/applications/office/karlender/default.nix +++ b/pkgs/applications/office/karlender/default.nix @@ -11,22 +11,23 @@ rustPlatform.buildRustPackage rec { pname = "karlender"; - version = "0.6.2"; + version = "0.7.1"; src = fetchFromGitLab { - owner = "loers"; - repo = "karlender"; + owner = "floers"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-YF46C+Vz7eGl4lqOQXqiQqaa6ieo1p8l6QCh4oNSJEg="; + hash = "sha256-dgxhXxtwQvaWMLCh8ac67L+R6jnJQdFzoyWKyrboPTk="; }; - cargoSha256 = "sha256-Kx5K2tp5PAQWac8LVrmOsk8Qf9m34SJ1vyfv7Ef2Wr0="; + cargoHash = "sha256-DsayK3wk2BVG2tqijWWQqUv5uPb/lcZXmwy8pbmd430="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 glib ]; + buildInputs = [ gtk4 libadwaita @@ -52,7 +53,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Mobile-friendly GTK calendar application"; - homepage = "https://gitlab.com/loers/karlender"; + homepage = "https://gitlab.com/floers/karlender"; license = licenses.gpl3Plus; maintainers = with maintainers; [ chuangzhu ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index 1b85cae70c53f..940a648549235 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -112,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.83.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.83.1.tar.xz"; - sha256 = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4"; + name = "curl-7.86.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.86.0.tar.xz"; + sha256 = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b"; md5 = ""; - md5name = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4-curl-7.83.1.tar.xz"; + md5name = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b-curl-7.86.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -126,11 +126,11 @@ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { - name = "libepoxy-1.5.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz"; - sha256 = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4"; + name = "libepoxy-1.5.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.10.tar.gz"; + sha256 = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15"; md5 = ""; - md5name = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4-libepoxy-1.5.9.tar.xz"; + md5name = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15-libepoxy-1.5.10.tar.gz"; } { name = "epm-3.7.tar.gz"; @@ -154,11 +154,11 @@ md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.4.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz"; - sha256 = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b"; + name = "expat-2.4.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.9.tar.xz"; + sha256 = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354"; md5 = ""; - md5name = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b-expat-2.4.6.tar.xz"; + md5name = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354-expat-2.4.9.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -560,11 +560,11 @@ md5name = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931-xmlsec1-1.2.33.tar.gz"; } { - name = "libxml2-2.9.14.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.14.tar.xz"; - sha256 = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee"; + name = "libxml2-2.10.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.10.3.tar.xz"; + sha256 = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c"; md5 = ""; - md5name = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee-libxml2-2.9.14.tar.xz"; + md5name = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c-libxml2-2.10.3.tar.xz"; } { name = "libxslt-1.1.35.tar.xz"; @@ -637,11 +637,11 @@ md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; } { - name = "nss-3.79-with-nspr-4.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.79-with-nspr-4.34.tar.gz"; - sha256 = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835"; + name = "nss-3.83-with-nspr-4.34.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.83-with-nspr-4.34.1.tar.gz"; + sha256 = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30"; md5 = ""; - md5name = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835-nss-3.79-with-nspr-4.34.tar.gz"; + md5name = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30-nss-3.83-with-nspr-4.34.1.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -672,11 +672,11 @@ md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { - name = "openssl-1.1.1l.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz"; - sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1"; + name = "openssl-1.1.1q.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.1.1q.tar.gz"; + sha256 = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca"; md5 = ""; - md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz"; + md5name = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca-openssl-1.1.1q.tar.gz"; } { name = "liborcus-0.17.2.tar.bz2"; @@ -707,39 +707,39 @@ md5name = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc-pixman-0.40.0.tar.gz"; } { - name = "libpng-1.6.37.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; - sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; + name = "libpng-1.6.38.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.38.tar.xz"; + sha256 = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be"; md5 = ""; - md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; + md5name = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be-libpng-1.6.38.tar.xz"; } { - name = "poppler-21.11.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz"; - sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584"; + name = "poppler-22.09.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-22.09.0.tar.xz"; + sha256 = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e"; md5 = ""; - md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz"; + md5name = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e-poppler-22.09.0.tar.xz"; } { - name = "poppler-data-0.4.10.tar.gz"; - url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz"; - sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"; + name = "poppler-data-0.4.11.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz"; + sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c"; md5 = ""; - md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz"; + md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz"; } { - name = "postgresql-13.5.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2"; - sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3"; + name = "postgresql-13.8.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.8.tar.bz2"; + sha256 = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded"; md5 = ""; - md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2"; + md5name = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded-postgresql-13.8.tar.bz2"; } { - name = "Python-3.8.10.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz"; - sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9"; + name = "Python-3.8.15.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.15.tar.xz"; + sha256 = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550"; md5 = ""; - md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz"; + md5name = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550-Python-3.8.15.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -861,11 +861,11 @@ md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { - name = "zlib-1.2.12.tar.xz"; - url = "https://dev-www.libreoffice.org/src/zlib-1.2.12.tar.xz"; - sha256 = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"; + name = "zlib-1.2.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.2.13.tar.xz"; + sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98"; md5 = ""; - md5name = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18-zlib-1.2.12.tar.xz"; + md5name = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98-zlib-1.2.13.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index 53c732b59bfd9..dd51866033978 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "3"; - patch = "6"; + patch = "7"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - hash = "sha256-MwPWr2/7vFg0UFGgCQwTNvi5PEnHhhxlNLzuogWu1aM="; + hash = "sha256-UphmAklfbZdWGlTgmBGsXv53vYPY+oyRpFKfBhBX9Ls="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-vjthXfBP6vRY3lMBlithJM7b5SX3uvBwEpi30IeW/Dg="; + sha256 = "sha256-WRgPzLGywfQI6uFRBNhPZ2G1nhhiWa8WbaCYp2XRALk="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-b3VvaNEfnytWqJekAWOKokNoCnefXdQgYB7Hpptra0s="; + sha256 = "sha256-yBnnR0mTexkyWnJnSf2zC6w+DsdBTHU8frOTmPfEedA="; }; } diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d40c96ef486ae..16e65d283645c 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -63,6 +63,11 @@ mkDerivation rec { url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; }) + # For Poppler 22.09 + (fetchpatch { + url = "https://github.com/archlinux/svntogit-community/raw/ea402a588c65d11973b148cf203b3463213431cf/trunk/scribus-1.5.8-poppler-22.09.0.patch"; + sha256 = "IRQ6rSzH6ZWln6F13Ayk8k7ADj8l3lIJlGm/zjEURQM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index a56c8447e27d4..9c233f4692479 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-h/hyaRjunVkVoHmVpru481goN73Ano1TDRDDg5AVoTI="; + sha256 = "sha256-PqC7PqpRSm/Yt3pK8TuzcrhtfJSeJX6th2xb2n/Bul8="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/applications/radio/guglielmo/default.nix index 1702f5902021f..404ec7aa96a19 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/applications/radio/guglielmo/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "guglielmo"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "marcogrecopriolo"; repo = pname; rev = "v${version}"; - sha256 = "0s1iz9s0k897jayiwl3yr9ylpclw6bzcpmzhxqn0mkd7jhgfl4vx"; + sha256 = "sha256-djBQTYbpgPFBtQZ9fZBpECP20RxB49AdxLbq8mUU6rg="; }; postInstall = '' diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 567a587e6d5bc..88cff17bc3b83 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -17,17 +17,19 @@ , protobuf , speex , speexdsp +, cppzmq +, zeromq }: gnuradio3_8.pkgs.mkDerivation rec { pname = "qradiolink"; - version = "0.8.6-2"; + version = "0.8.7-1"; src = fetchFromGitHub { owner = "qradiolink"; repo = "qradiolink"; rev = version; - sha256 = "1694yyw0vc77m5pbc5rwl6khd8000dbrliz3q4vsa9dqnfnz1777"; + sha256 = "sha256-4WkAEJvWu1+ZYDeipRl1oJWn5IR1nTXJ8We0trhbkQE="; }; preBuild = '' @@ -62,6 +64,8 @@ gnuradio3_8.pkgs.mkDerivation rec { gnuradio3_8.qt.qtmultimedia libftdi libsndfile + cppzmq + zeromq gnuradio3_8.qwt ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ thrift diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index e04a8a907d191..1dac6525ee630 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { name = "CVE-2022-27419"; url = "https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904.patch"; sha256 = "172jndh8x5nlcbx2jp5y8fgfxsawwfz95037pcjp170gf93ijy88"; + }) ( fetchpatch { + name = "CVE-2022-25051"; + url = "https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8.patch"; + sha256 = "sha256-IfxwdnuA7WbaVdxMTln069mA5hKNuPz+XYQaNA4YY24="; })]; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/science/chemistry/element/default.nix b/pkgs/applications/science/chemistry/element/default.nix index 812272e2fb9b6..c9c609f4b8f2a 100644 --- a/pkgs/applications/science/chemistry/element/default.nix +++ b/pkgs/applications/science/chemistry/element/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "element"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = pname; rev = "v${version}"; - sha256 = "gjdcNvYNnxb6hOE/MQjTezZeYGBWTr4E8/Pt8YQv3lY="; + sha256 = "sha256-06RDZnie0Lv7i95AwnBGl6PPucuj8pIT6DHW3e3mu1o="; }; - vendorSha256 = "A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg="; + vendorSha256 = "sha256-A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg="; meta = with lib; { description = "The periodic table on the command line"; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index b9cc2274a3d68..0a190a1c90294 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,35 +1,37 @@ { lib, stdenv, fetchFromGitHub , perl, flex, bison, python3, autoconf +, which, cmake }: stdenv.mkDerivation rec { pname = "verilator"; - version = "4.226"; + version = "5.002"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-X6Kwpcm+ugu+4gVkWfsqdCPFTESHzJ1jjCPnGqE3/vo="; + hash = "sha256-RNoKAEF7zl+WqqbxGP/VvdQqQP8VI3hoQku3b/g0XpU="; }; enableParallelBuilding = true; buildInputs = [ perl ]; nativeBuildInputs = [ flex bison python3 autoconf ]; + checkInputs = [ which ]; - # these tests need some interpreter paths patched early on... - # see https://github.com/NixOS/nix/issues/1205 - doCheck = false; + doCheck = stdenv.isLinux; # darwin tests are broken for now... checkTarget = "test"; - preConfigure = '' - autoconf - ''; + preConfigure = "autoconf"; - postPatch = '' + preCheck = '' patchShebangs \ src/flexfix \ - src/vlcovgen + src/vlcovgen \ + bin/verilator \ + bin/verilator_coverage \ + test_regress/driver.pl \ + test_regress/t/*.pl ''; meta = with lib; { diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index c309423f142aa..c65507228f82b 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -4,6 +4,7 @@ , makeWrapper , readline , gmp +, pari , zlib # one of # - "minimal" (~400M): @@ -23,27 +24,31 @@ let # packages absolutely required for gap to start # `*` represents the version where applicable requiredPackages = [ - "GAPDoc-*" - "primgrp-*" - "SmallGrp-*" + "gapdoc" + "primgrp" + "smallgrp" "transgrp" ]; - # packages autoloaded by default if available + # packages autoloaded by default if available, and their dependencies autoloadedPackages = [ "atlasrep" - "autpgrp-*" - "alnuth-*" - "crisp-*" - "ctbllib-*" - "FactInt-*" + "autpgrp" + "alnuth" + "crisp" + "ctbllib" + "factint" "fga" - "irredsol-*" - "laguna-*" - "polenta-*" - "polycyclic-*" - "resclasses-*" - "sophus-*" - "tomlib-*" + "irredsol" + "laguna" + "polenta" + "polycyclic" + "resclasses" + "sophus" + "tomlib" + "autodoc" # dependency of atlasrep + "io" # used by atlasrep to fetch data from online sources + "radiroot" # dependency of polenta + "utils" # dependency of atlasrep ]; keepAll = keepAllPackages || (packageSet == "full"); packagesToKeep = requiredPackages ++ lib.optionals (packageSet == "standard") autoloadedPackages; @@ -61,11 +66,11 @@ in stdenv.mkDerivation rec { pname = "gap"; # https://www.gap-system.org/Releases/ - version = "4.11.1"; + version = "4.12.1"; src = fetchurl { url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"; - sha256 = "sha256-ZjXF2n2CdV+DOUhrnKwzdm9YcS8pfoI0+6QIGJAuowQ="; + sha256 = "sha256-+evvEe4xshDONuPHCWB0K04lMoK71ScK3JMkJzySsBY="; }; # remove all non-essential packages (which take up a lot of space) @@ -83,9 +88,14 @@ stdenv.mkDerivation rec { makeWrapper ]; - # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. - # tests are run twice, once with all packages loaded and once without - # checkTarget = "teststandard"; + propagatedBuildInputs = [ + pari # used at runtime by the alnuth package + ]; + + # "teststandard" is a superset of the tests run by "check". it takes ~20min + # instead of ~1min. tests are run twice, once with all packages loaded and + # once without. + # installCheckTarget = "teststandard"; doInstallCheck = true; installCheckTarget = "check"; @@ -104,34 +114,28 @@ stdenv.mkDerivation rec { # like the defaults the Makefile, but use gap from PATH instead of the # one from builddir installCheckFlagsArray+=( - "TESTGAP=gap --quitonbreak -b -m 100m -o 1g -q -x 80 -r -A" - "TESTGAPauto=gap --quitonbreak -b -m 100m -o 1g -q -x 80 -r" + "TESTGAPcore=gap --quitonbreak -b -q -r" + "TESTGAPauto=gap --quitonbreak -b -q -r -m 100m -o 1g -x 80" + "TESTGAP=gap --quitonbreak -b -q -r -m 100m -o 1g -x 80 -A" ) ''; postBuild = '' pushd pkg - bash ../bin/BuildPackages.sh + # failures are ignored unless --strict is set + bash ../bin/BuildPackages.sh ${lib.optionalString (!keepAll) "--strict"} popd ''; - installTargets = [ - "install-libgap" - "install-headers" - ]; - - # full `make install` is not yet implemented, just for libgap and headers postInstall = '' - # Install config.h, which is not currently handled by `make install-headers` - cp gen/config.h "$out/include/gap" - - mkdir -p "$out/bin" "$out/share/gap/" - - echo "Copying files to target directory" - cp -ar . "$out/share/gap/build-dir" - - makeWrapper "$out/share/gap/build-dir/bin/gap.sh" "$out/bin/gap" \ - --set GAP_DIR $out/share/gap/build-dir + # make install creates an empty pkg dir. since we run "make check" on + # installCheckPhase to make sure the installed GAP finds its libraries, we + # also install the tst dir. this is probably excessively cautious, see + # https://github.com/NixOS/nixpkgs/pull/192548#discussion_r992824942 + rm -r "$out/share/gap/pkg" + cp -ar pkg tst "$out/share/gap" + + makeWrapper "$out/lib/gap/gap" "$out/bin/gap" --add-flags "-l $out/share/gap" ''; preFixup = '' @@ -141,14 +145,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Computational discrete algebra system"; - maintainers = with maintainers; - [ - raskin - chrisjefferson - timokau - ]; + # We are also grateful to ChrisJefferson for previous work on the package, + # and to ChrisJefferson and fingolfin for help with GAP-related questions + # from the upstream point of view. + maintainers = teams.sage.members; platforms = platforms.all; - broken = stdenv.isDarwin; # keeping all packages increases the package size considerably, which is # why a local build is preferable in that situation. The timeframe is # reasonable and that way the binary cache doesn't get overloaded. diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 45a4799d1a031..1f8b33f687384 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -35,7 +35,7 @@ writeTextFile rec { export GRAPHS_DATA_DIR='${graphs}/share/graphs' export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves' export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes' - export GAP_ROOT_DIR='${gap}/share/gap/build-dir' + export GAP_ROOT_DIR='${gap}/share/gap' export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 6cdb7919d9ea8..e1d7d283dc2d8 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -130,6 +130,14 @@ stdenv.mkDerivation rec { rev = "2816dbacb342398a23bb3099e20c92c8020ab0fa"; sha256 = "sha256-tCOsMxXwPkRg3FJGVvTqDzlWdra78UfDY6nci0Nr9GI="; }) + + # https://trac.sagemath.org/ticket/34391 + (fetchSageDiff { + name = "gap-4.12-upgrade.patch"; + base = "9.8.beta2"; + rev = "eb8cd42feb58963adba67599bf6e311e03424328"; + sha256 = "sha256-0dKewOZe2n3PqSdxCJt18FkqwTdrD0VA5MXAMiTW8Tw="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 15b164284bfb6..bfa5addefee98 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.18.1"; + version = "2.19.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-igtbMrm4cgaBWxjvv8UjqvPNFSi1UxNgplWYArqRRi0="; + sha256 = "sha256-SqKjN9Met+NsfaQO3PGTPua/ZVaorYbSJHWeXgEm524="; }; - vendorSha256 = "sha256-XWquL/+47t467kOYpDgMmT7t3hbdCiPQnatRW+VtaYc="; + vendorSha256 = "sha256-VWeUVdrAzbS7OmHHZIPlyq6WVj4I39n7ozS7n3ReqJk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index dd244b3687c15..2d63ae403791c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.38.0"; + version = "2.38.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-kj6t4msYFN540GvajgqfXai3xLMEs/kFD/tGTwMQMgo="; + sha256 = "sha256-l9346liiueD7wlCOJFAoynWRG9ONFVFhaxSMGqV0Ctk="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -207,6 +207,7 @@ stdenv.mkDerivation (finalAttrs: { # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend + ln -s $out/share/git/contrib/git-jump/git-jump $out/bin/git-jump '' + lib.optionalString perlSupport '' # wrap perl commands makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ diff --git a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix new file mode 100644 index 0000000000000..7c0dbefc50696 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, jre +}: + +stdenv.mkDerivation rec { + pname = "gitnuro"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar"; + hash = "sha256-tAFFl14mmXhLr6V/vTDe9lwX7trsaTWgIqkwxD3mBUw="; + }; + + icon = fetchurl { + url = "https://raw.githubusercontent.com/JetpackDuba/Gitnuro/4cfc45069c176f807d9bfb1a7cba410257078d3c/icons/logo.svg"; + hash = "sha256-QGJcWTSJesIpDArOWiS3Kn1iznzeMFzvqS+CuNXh3as="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + makeWrapper ${jre}/bin/java $out/bin/gitnuro --add-flags "-jar $src" + install -Dm444 $icon $out/share/icons/hicolor/scalable/apps/com.jetpackduba.Gitnuro.svg + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Gitnuro"; + exec = "gitnuro"; + icon = "com.jetpackduba.Gitnuro"; + desktopName = "Gitnuro"; + categories = [ "Development" ]; + comment = meta.description; + }) + ]; + + meta = with lib; { + description = "A FOSS Git multiplatform client based on Compose and JGit"; + homepage = "https://gitnuro.jetpackduba.com"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 7e84a9815d166..fa88b70b47847 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-TV7ogO7mfRMpLekRAedJsdRJUBbPyxPO9MCoGg6uCno="; + sha256 = "sha256-e3kNr9FMcqznKLFXA8gNTBjaMyXhrWzIxMmX7r6aaWA="; }; vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a5eb46d834af7..693b7adf46b85 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "15.4.2", - "repo_hash": "sha256-KGVZrfrzfIn2ZQJ42FisLvjIGg0+QOnzfjCR6mQHjlM=", + "version": "15.4.4", + "repo_hash": "sha256-iIgN1j02Lr/RtNeopqs6ndFqw8YIU2F6c49RGWvpmgc=", "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.4.2-ee", + "rev": "v15.4.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.4.2", + "GITALY_SERVER_VERSION": "15.4.4", "GITLAB_PAGES_VERSION": "1.62.0", "GITLAB_SHELL_VERSION": "14.10.0", - "GITLAB_WORKHORSE_VERSION": "15.4.2" + "GITLAB_WORKHORSE_VERSION": "15.4.4" }, "vendored_gems": [ "bundler-checksum", diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 32786117c2132..44a8218e1fbc8 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.4.2"; + version = "15.4.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-DBAQ1dJLQ+Xno4e/n1jvgKiHAol/uTMjx6RtZIBwM3w="; + sha256 = "sha256-b8ChQYaj+7snlrLP4P9FIUSIq/SNMh9hFlFajOPcBEU="; }; vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 5b6617e0ab70f..2042b6c2bcefa 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.4.2"; + version = "15.4.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 58e76d2028412..20d4d463a0938 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,6 +1,5 @@ { lib , fetchFromSourcehut -, fetchpatch , buildGoModule , buildPythonPackage , srht @@ -13,36 +12,27 @@ , unzip }: let - version = "0.82.8"; + version = "0.83.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - hash = "sha256-M94zkEUJU8EwksN34sd5IkASDCQ0hHb98G5wzZsCrpg="; + hash = "sha256-u/y+sYu/09LypWI/ngghbge5SvkuLQpray10j0SjlOo="; }; buildsrht-api = buildGoModule ({ inherit src version; pname = "buildsrht-api"; modRoot = "api"; - vendorHash = "sha256-8z5m4bMwLeYg4i91MMjLMqbciWvqS0icCHFUJTUHBgk="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + vendorHash = "sha256-DfVWr/4J4ZrhHpy9CXPaAQcbag/9FmDgiexcNo0lEsk="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.20"; }); buildsrht-worker = buildGoModule { inherit src version; sourceRoot = "source/worker"; pname = "buildsrht-worker"; vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek="; - - patches = [ - (fetchpatch { - name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch"; - url = "https://git.sr.ht/~sircmpwn/builds.sr.ht/commit/f58bbde6bfed7d2321a3b17e991c91fc83d4c230.patch"; - stripLen = 1; - hash = "sha256-vQR/T5G5Gz5tY+SEZZabsbnFKW44b+Bs+GDdydyeCDs="; - }) - ]; }; in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 8e32b42912c0d..a3e8d5dc81355 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,17 +1,21 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-PBs86cvEacvCt/2JnURL4qKvXGXRZHWaGYrPUSsnt0I="; + sha256 = "sha256-XGZ6Jr/RVDOLDa0sANZIsKtNjY3pEBlOtei+xNGPBBY="; }; - cargoSha256 = "sha256-5CUbfI67gsINdHcxN8KbIN10Mu90rAU53DbmQ5QotWg="; + cargoSha256 = "sha256-sjMg5XMnAQZjp6z9prtRq+0pyNQ1oTm0/KWOZPxDW4w="; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "Sysrev version control"; diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/applications/virtualization/libgovirt/default.nix index 9c9da54c3632d..0815781c21f7d 100644 --- a/pkgs/applications/virtualization/libgovirt/default.nix +++ b/pkgs/applications/virtualization/libgovirt/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; }; + patches = lib.optionals stdenv.isDarwin [ + # The flag breaks the build on darwin and doesn't seem necessary + ./no-version-script-ld-flag.patch + ]; + nativeBuildInputs = [ pkg-config gobject-introspection @@ -46,8 +51,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/libgovirt"; description = "GObject wrapper for the oVirt REST API"; - maintainers = [ maintainers.amarshall ]; - platforms = platforms.linux; + maintainers = with maintainers; [ amarshall atemu ]; + platforms = with platforms; linux ++ darwin; license = licenses.lgpl21Plus; }; } diff --git a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch new file mode 100644 index 0000000000000..a837c3bf06421 --- /dev/null +++ b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch @@ -0,0 +1,14 @@ +--- a/govirt/Makefile.in ++++ b/govirt/Makefile.in +@@ -511,8 +511,7 @@ + libgovirt_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-dynamic \ +- -no-undefined \ +- -Wl,--version-script=$(srcdir)/govirt.sym ++ -no-undefined + + libgovirt_la_CFLAGS = \ + $(WARNINGFLAGS_C) + +Diff finished. Fri Oct 28 10:36:38 2022 diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 51733a08f4de8..ca98669ba4379 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QLF49k8f8YYwPl26pyz9/bbO4IO0KqSlgTFNjbvPf7k="; + sha256 = "sha256-9b1j3hY4ChlLIXmNsIjt6SjqHOYSqdY98amV36WPU74="; }; - cargoSha256 = "sha256-u0L3NJ4ku5ETBx6PKgVStrcSCX4I7E6GNtW+iv3yy2g="; + cargoSha256 = "sha256-s34mYMaHElBTD7I6QZtGsVTZUbVkcSmavvLs2k4mJDw="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 42a556a451fb4..46bbc3b914b93 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -14,7 +14,7 @@ , gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook , vncSupport ? !nixosTestRunner, libjpeg, libpng , smartcardSupport ? !nixosTestRunner, libcacard -, spiceSupport ? !stdenv.isDarwin && !nixosTestRunner, spice, spice-protocol +, spiceSupport ? true && !nixosTestRunner, spice, spice-protocol , ncursesSupport ? !nixosTestRunner, ncurses , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index ed882709aa143..2e8aa34286a6f 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -29,7 +29,7 @@ assert spiceSupport -> ( gdbm != null - && libcap != null + && (stdenv.isLinux -> libcap != null) && spice-gtk_libsoup2 != null && spice-protocol != null ); @@ -76,12 +76,13 @@ stdenv.mkDerivation rec { libvirt-glib libxml2 vte - ] ++ optionals spiceSupport [ + ] ++ optionals spiceSupport ([ gdbm - libcap spice-gtk_libsoup2 spice-protocol - ]; + ] ++ optionals stdenv.isLinux [ + libcap + ]); # Required for USB redirection PolicyKit rules file propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; @@ -94,8 +95,8 @@ stdenv.mkDerivation rec { meta = { description = "A viewer for remote virtual machines"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + maintainers = with maintainers; [ raskin atemu ]; + platforms = with platforms; linux ++ darwin; license = licenses.gpl2; }; passthru = { diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 4bcdf1643f1b7..3ddca4d40fd37 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-0mnhH/7Y4VXpNUU++ln2//9/vuTxq9sa2D933Cf7Ifw="; + hash = "sha256-fTaWfItY//fkvaYADeCBYg+dag59Y9Fw+Al0UgHnkXc="; }; nativeBuildInputs = [ |