diff options
Diffstat (limited to 'pkgs/applications')
22 files changed, 395 insertions, 252 deletions
diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix index 7aaa8ddd8435f..9a2a2f109b025 100644 --- a/pkgs/applications/audio/noise-repellent/default.nix +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -1,22 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat, lv2 }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, cmake, libspecbleach, lv2 }: stdenv.mkDerivation rec { pname = "noise-repellent"; - version = "0.1.5"; + version = "0.2.1"; src = fetchFromGitHub { owner = "lucianodato"; repo = pname; - rev = version; - sha256 = "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl"; - fetchSubmodules = true; + rev = "v${version}"; + sha256 = "sha256-hMNVzhJZFGFeu5aygLkfq495O0zpaIk41ddzejvDITE="; }; - mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); + mesonFlags = [ + "--prefix=${placeholder "out"}/lib/lv2" + "--buildtype=release" + ]; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config cmake ]; buildInputs = [ - fftwFloat lv2 + libspecbleach lv2 ]; meta = with lib; { @@ -24,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lucianodato/noise-repellent"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index d2fe381ac6aeb..65cf657d8a408 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -10,14 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.80.699.gc3dac750"; + version = "1.1.84.716.gc5f8b819"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "58"; + rev = "60"; deps = [ alsa-lib @@ -80,7 +80,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "91385a5a8de31d6e9f1945d23108447fd369c1cdc2e4d95cbb7cec5d403c3be14a1b0fabe3fb01aef809a39b033d289add1bcb307ab19c7fcb63689dbae57c53"; + sha512 = "1209b956822d8bb661daa2c88616bed403ec26dc22c6b866cecff59235c56112284c2f99aa06352fc0df6fcd15225a6ad60afd3b4ff4d7b948ab83e70ab31a71"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 86eb399dd44a0..7273212bfdb60 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchurl -, jdk, cmake, zlib, python3 -, dotnet-sdk_5 +, jdk, cmake, gdb, zlib, python3 +, dotnet-sdk_6 , maven , autoPatchelfHook , libdbusmenu @@ -53,6 +53,9 @@ let # bundled cmake does not find libc rm -rf bin/cmake/linux ln -s ${cmake} bin/cmake/linux + # bundled gdb does not find libcrypto 10 + rm -rf bin/gdb/linux + ln -s ${gdb} bin/gdb/linux autoPatchelf $PWD/bin @@ -207,7 +210,7 @@ let postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' rm -rf lib/ReSharperHost/linux-x64/dotnet mkdir -p lib/ReSharperHost/linux-x64/dotnet/ - ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet + ln -s ${dotnet-sdk_6}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet ''); }); diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 9303fd9a4cd62..7e48ace5161b1 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,26 +3,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2021.3.3", - "sha256": "35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d", - "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "a8ad8db6362d60a5ce60a7552110887dbd12e8420c839c368b55808b68dea38b", + "url": "https://download.jetbrains.com/cpp/CLion-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2021.3.4", - "sha256": "a34670f1a6c77e00237302a70f22fb5bf089dfe128341fd89b2f25bb8becb325", - "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1.1", + "sha256": "d4ffcb4371ee6e9f03704fa6282630349fd4ff4759846c02d43bb37e3caeae67", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.tar.gz", + "version-major-minor": "2022.1.1" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2021.3.3", - "sha256": "9d2b709703516eddeb7f4d6568a7de2e268de4258c7bc7787baee806fbaee4a3", - "url": "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "7803f432b62b7b9a9f340fd48375f50d60b0e5412b052b70e175de8edf82a947", + "url": "https://download.jetbrains.com/go/goland-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -51,76 +51,76 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "761b347142035e8b74cc5a9939100af9d45f1f6ee29de1e78cd6b1ff06fe20e2", - "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "e30d6991c98addcc02ab05c623d0c42797d605db73c01b7c153bf2246c877395", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "f1ae01f471d01c6f09aab0a761c6dea9834ef584f2aaf6d6ebecdce6b55a66e8", - "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "35d857df0ac4bd76caba60ac329c9183594be142094d0592f2afa40534be85eb", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "6bd9573a84c1f2ae6b9b6612f0859aee21133f479ace43602dc0af879f9d9e67", - "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "9b160ed74f384be31ff376af73f91924a212e6440ce142a581b22f261e6cf605", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2021.3.3", - "sha256": "1dc57d5d7932d4a8dea51fc5cbdaa52f9626490092978f02fa15bb41cb84068f", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "e5d2018bf352f4ff17299d2ee4f286d654946fe4dac2ff47d3dc853820364673", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "697510ee2401bb7cbe75193f015d8c2dd1677117defbc2a6f5f3c1443f20dea2", - "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "495c0d86eb7f3bed0ed692a7ae37e8b3b333c58ae891ca3891a311db6b951401", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "18a53c1b1b92e9b7e516b425a390f23f46b880a704d1cb223d1ba64410b15060", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "d9dd5815cc456d74f7dc47533ade3990d0f2f9ce0c4dab3d5ae9b04e01d1746c", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.tar.gz", + "version-major-minor": "2022.1" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2021.3.3", - "sha256": "342a4d8549ae4623a5edfa7f9737887cf0a25c1a61bb414b54b742b1c5a1a84d", - "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "4972403e5ed7587ad76dcfb08b975879a2a955e9be9f88344e369cd4006b2d52", + "url": "https://download.jetbrains.com/cpp/CLion-2022.1.dmg", + "version-major-minor": "2022.1" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2021.3.4", - "sha256": "27e709d2ced66d37a615d8c56885828e49a08962708e28df1a20f324c626bf52", - "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.dmg", - "version-major-minor": "2021.3" + "version": "2022.1.1", + "sha256": "6ea0c0c972bad06fd0378a2c1e9a1cb1b3ec50d52cc98d0f9c98327cc7af2a1e", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.dmg", + "version-major-minor": "2022.1.1" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2021.3.3", - "sha256": "4b245b6fe0cf588adbf36e68f12397d5fd311b0b6d49f17ba374ebaa10d207c9", - "url": "https://download.jetbrains.com/go/goland-2021.3.3.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "ec44455e83b8c8d85614b63815245a0dff984796a432e05801787c7f8474900b", + "url": "https://download.jetbrains.com/go/goland-2022.1.dmg", + "version-major-minor": "2022.1" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -149,76 +149,76 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2021.3.2", - "sha256": "596a9d5fdc30d5fba65ddd482da90f9d555fed748b930587562022bfe7df4e14", - "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "daa3c749b3a41e106384ac8e003957a46f38dfc844cebfce8c802c4a223535b8", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.dmg", + "version-major-minor": "2022.1" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2021.3.2", - "sha256": "b8f41f5dddeda0ed5f5c81ba57d2560ccc6e227987882fb6bf305b5d1d8c6909", - "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "99ba20a8b0752ca58e1fc814fb19766fd19c376b42e3cbfa4102c67bc21942ec", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.dmg", + "version-major-minor": "2022.1" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2021.3.2", - "sha256": "188b998660e7cfb7ac1364c818c008a5608ab2aeb17c6cc19d1d9dda547d3775", - "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "ab5496370a6145073dbd423e47d6112d9c726a4a286d2528e66711f865d92d56", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.dmg", + "version-major-minor": "2022.1" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2021.3.3", - "sha256": "41a0939cb6258a0fb303268c5a466a663cf3588af14bcbb351be4c3a1d158094", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "38867fb7ca4b5af013f33b4db3b15994b6e732b121176f98480b5ff1b49ef17e", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.dmg", + "version-major-minor": "2022.1" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2021.3.2", - "sha256": "ba27c14b21d66ca96a64ceb7dc5d9f0952254a5f405b3201f51d2ad3cc749a96", - "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "b33f34b889fde6ebe6348499e2ad15bb85937aba1e2a8a9543c411b2476ec4ff", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.dmg", + "version-major-minor": "2022.1" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2021.3.2", - "sha256": "932d4920f831d1ceae68a474444c37d986277d8d3288d3aab93dd43d99336a36", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "0bd2be5ea0ccabfb7a806ca4c46d33f1e9106c2256243c48091ff61d5ac29a08", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.dmg", + "version-major-minor": "2022.1" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2021.3.3", - "sha256": "fbf651fa4a5925fe729be30ca8a6fa3be84dc4d7827dbcf74f4d28c52b903cc2", - "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "333d4ac5757f537ad67863dd6fb03644722ab8fce1596976fa99e5ae9de7991c", + "url": "https://download.jetbrains.com/cpp/CLion-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2021.3.4", - "sha256": "7a77ba9fce56c781ae6a4fc65eaab4bcc10780b6bd679b04d74146719e42890a", - "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1.1", + "sha256": "2ba92ed34366b111a39ba0632d91dbaf232633f5f5557a208dd8ab7696179b6f", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1-aarch64.dmg", + "version-major-minor": "2022.1.1" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2021.3.3", - "sha256": "54397d48e20fb534206e13f84b35868b1eaea13175176487b1239b23db4e13db", - "url": "https://download.jetbrains.com/go/goland-2021.3.3-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "0506a817e35a80d3d776484a88bf4136628b589a8f5754833387a8dec99798d3", + "url": "https://download.jetbrains.com/go/goland-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -247,50 +247,50 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "ba15c3f843c85141a9adaec1c4611224a853bd98649148751e34ac304591a314", - "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "d13744e7a70a9716f1b99cb9b77c77e17cb4710466a29db490ef6e707a54ae21", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "407bf395cfb6d61f1c0861c7679b197238780e82a019e10162b8cd7130edb15a", - "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "1873565756716cb0eee23c60068dd5d394413b2b2e54b4b75cbe8b882540a0b7", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "12fa34d1e60a555bac230acea9cd46c7adfe9ca42ff3e458c79d33e5b88eb8db", - "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "ba0ea4ff52703a53a9c7e14d42c9ae12688b94364ced77a28d4ed0c417c9642f", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2021.3.3", - "sha256": "65603860d1fd3134c5659f5a06de7cac17f3183a01056b79cfe72242b99adb37", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "273f40eda119a034ada821db2257e3b5c2bfb835c287365398237f5d9a9daad3", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "33773222b2fa14300de5ed12ca96c3442b933f66cef67cebc9610e5cef51c75e", - "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "06d932a587adcd25b4e70d0b27c2c229381144deaef90cbcdc345edd822e04ed", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "f4788ec0c55123b1f4e14934792f65bf8040e2a2ee673e985b50b8feded60408", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "96ec148af1b20ea9d2cb6f8b1f268f96607269e8dd3caf521b48464fe21a7177", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" } } } diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/applications/editors/lifeograph/default.nix index b998b02f50da8..0a999bf993f6f 100644 --- a/pkgs/applications/editors/lifeograph/default.nix +++ b/pkgs/applications/editors/lifeograph/default.nix @@ -1,21 +1,21 @@ { stdenv, lib, fetchgit, pkg-config, meson, ninja -, enchant, gtkmm3, libchamplain, libgcrypt }: +, enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }: stdenv.mkDerivation rec { pname = "lifeograph"; - version = "2.0.2"; + version = "2.0.3"; src = fetchgit { url = "https://git.launchpad.net/lifeograph"; - # Specific commit hash related to version - rev = "d635bbb30011c0d33c33643e6fa5c006f98ed7d6"; - sha256 = "0j9wn5bj7cbfnmyyx7ikx961sksv50agnb53prymldbsq43rfgnq"; + rev = "v${version}"; + sha256 = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM="; }; nativeBuildInputs = [ meson ninja pkg-config + shared-mime-info # for update-mime-database ]; buildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix index 3bfc94bb6ea4c..ae9cbb7fb095d 100644 --- a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix @@ -37,8 +37,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.66.1"; - sha256 = "sha256-+v4UnGRG5xOc8k0IzvHUBHa128fhgd3jcmEuciiMQmI="; + version = "0.78.0"; + sha256 = "sha256-vd+9d86Z8429QpQVCZm8gtiJDcMpD++aiFVwvCrPg5w="; }; postPatch = '' diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index f92f3686611fa..d9b6db8d653da 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.37"; + version = "1.3.38"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "sha256-kNwi8ae9JA5MkGWpQJYr8T2kPJm8w2yxEcw8Gg10d9Q="; + sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU="; }; patches = [ diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8bd3dcb870405..c390e004c8cce 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -154,6 +154,7 @@ let kmime = callPackage ./kmime.nix {}; kmines = callPackage ./kmines.nix {}; kmix = callPackage ./kmix.nix {}; + kmousetool = callPackage ./kmousetool.nix {}; kmplot = callPackage ./kmplot.nix {}; knavalbattle = callPackage ./knavalbattle.nix {}; knetwalk = callPackage ./knetwalk.nix {}; diff --git a/pkgs/applications/kde/kmousetool.nix b/pkgs/applications/kde/kmousetool.nix new file mode 100644 index 0000000000000..fb4323455b795 --- /dev/null +++ b/pkgs/applications/kde/kmousetool.nix @@ -0,0 +1,35 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, ki18n +, kiconthemes +, knotifications +, kxmlgui +, kwindowsystem +, phonon +, libXtst +, libXt +}: + +mkDerivation { + pname = "kmousetool"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + ki18n + kiconthemes + knotifications + kxmlgui + kwindowsystem + phonon + libXtst + libXt + ]; + meta = { + homepage = "https://github.com/KDE/kmousetool"; + description = "Program that clicks the mouse for you"; + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.jayesh-bhoot ]; + }; +} + diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 45a91522a2ab2..55895b8790a0a 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -20,13 +20,13 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.4.14-trento-1"; + version = "2022.4.28-trento"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "16cb01fhxa64f8fadwpr0mawfmchig6xlbx20mz4q9yh5fnagywj"; + sha256 = "sha256-PVtjKAwCA9GliUDIoAFMqeVFZYPo2dxCWhW9lSotC6w="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 586272b184611..37afb77f43bc4 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.29.3"; - sha256 = "02qdczd8x6dl6gsyjyrmga9i67shm54xixckxvva1lhl33zz5wwm"; - manifestsSha256 = "0ar73dwz5j19qwcp85cd87gx0kwm7ys4xcyk91gj88s5i3djd9sl"; + version = "0.29.4"; + sha256 = "110wbz5dyzrzndr937in663cs9hwfs3glgm63f0md9gjj67mz0kk"; + manifestsSha256 = "14vrkadv2gsz360s0naqr002sw8n5kvgskc13yx936mcz2vs465y"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-VWTtHquq/8/nKBGLuIdg2xkpGz1ofhPlQf3NTaQaHBI="; + vendorSha256 = "sha256-/8gRyaXTCWe+F4X3z5iT8QhE3LdiNEYKHjtoYKJB/HU="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 6c88926ca2429..1f2e98593529f 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-7YtszdwauTz9LfZ77d13fDU6vQm5hiJrIOiqpqIginQ="; + sha256 = "sha256-XvV6OlGHW/eB0EUrmyTlFVbDjbxUpVo6WvrEnh6Q68I="; }; - vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k="; + vendorSha256 = "sha256-Ex86yLMTqqiSkJns/eeodmGswAzPVQAQOf8Wqi7DRaE="; nativeBuildInputs = [ installShellFiles ]; @@ -26,6 +26,11 @@ buildGoModule rec { subPackages = [ "istioctl/cmd/istioctl" ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/istioctl version --remote=false | grep ${version} > /dev/null + ''; + postInstall = '' $out/bin/istioctl collateral --man --bash --zsh installManPage *.1 diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 93ccd873f777f..69142045fee8f 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo="; + sha256 = "sha256-Q67dictDE+HWw99lFAiidBvIL30mMAkjYb2CDLDcalw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0f1f3a73bc1df..03fcabd3681ae 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -330,19 +330,19 @@ "owner": "dome9", "provider-source-address": "registry.terraform.io/dome9/dome9", "repo": "terraform-provider-dome9", - "rev": "v1.25.2", - "sha256": "sha256-6AtJEeAoOfqGwLC687aMTBg4yRXIDYqDbkXyXuiV8aQ=", + "rev": "v1.25.3", + "sha256": "sha256-0Pde+xVToBP5gavr0ckEIUmgCmRBbqSP5C0YkMthQGQ=", "vendorSha256": null, - "version": "1.25.2" + "version": "1.25.3" }, "elasticsearch": { "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.0", - "sha256": "sha256-wl8pRAB97JObpZvi2rdyDZP5itKcOnm6Gsbku1+5oqQ=", - "vendorSha256": "sha256-OCXTZg0JkaxJDEgoF2Qs4BcMSiYkQpLmehWdCpEmTzk=", - "version": "2.0.0" + "rev": "v2.0.1", + "sha256": "sha256-WdGwLQe4jInZiMxJ7BasfwVBsei0V02D6vAA4dLLoAI=", + "vendorSha256": "sha256-gBC5+6bGJzfb0yLKlolfrZNuhpPacqX3p1HjIB4i3IU=", + "version": "2.0.1" }, "exoscale": { "owner": "exoscale", @@ -366,10 +366,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v1.1.2", - "sha256": "sha256-CxyVW9uE9mK+ZF8fyjAsrFKY82xAyGn9k1jOFqTaAhA=", + "rev": "v1.1.3", + "sha256": "sha256-zkZ3ZORky0OmM5YvDU30lqpIhO7f49imW+pWjndXSwQ=", "vendorSha256": null, - "version": "1.1.2" + "version": "1.1.3" }, "flexibleengine": { "owner": "FlexibleEngineCloud", @@ -384,10 +384,10 @@ "owner": "fortinetdev", "provider-source-address": "registry.terraform.io/fortinetdev/fortios", "repo": "terraform-provider-fortios", - "rev": "v1.14.0", - "sha256": "078wvbihrs6j5yrbqsx5g6l7z05y98kwlyanq5w99fsazz78rr4h", + "rev": "v1.14.1", + "sha256": "sha256-9e1PEg8RtJa7DR5g3cCdAhubFxt7vN5dPjaBA+F7Y4E=", "vendorSha256": null, - "version": "1.14.0" + "version": "1.14.1" }, "gandi": { "owner": "go-gandi", @@ -421,29 +421,29 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.18.0", - "sha256": "sha256-/s0O2ZBNPfBNffZp9sdG2omfXKDgwLaX4cJZs553WLU=", + "rev": "v4.19.0", + "sha256": "sha256-b6oEKiz8REeJIDFLDI80+kA4f32KRjZy/GhKg0qeN24=", "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", - "version": "4.18.0" + "version": "4.19.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.18.0", - "sha256": "sha256-mVuo+dFDNcmWIh9WJNkkpowF7lI3mQy8scgij6jM9Zw=", + "rev": "v4.19.0", + "sha256": "sha256-MPB/ca0GIIs7yEfIyqeOkzK2mkEdkE/DkEbaSqpaF0U=", "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", - "version": "4.18.0" + "version": "4.19.0" }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.21.1", - "sha256": "sha256-2eTVJB0Scs6cZzwy+DQLgKqP0JPNnQMjUcG7THH2Cgg=", - "vendorSha256": "sha256-YfE5ob/gB+X9x0Zx6gqjUR3+P+EhQrZ6aNiHOkbkNIc=", - "version": "1.21.1" + "rev": "v1.22.0", + "sha256": "sha256-0OkFf2YiwJHwXheYkN1HA1DG5vadyhZOzVjmu0BNDHI=", + "vendorSha256": "sha256-Pd4cSmDzRhu8MD2osXg6mVYiKG2VM6MQ67aC6jDy59U=", + "version": "1.22.0" }, "gridscale": { "owner": "gridscale", @@ -458,10 +458,10 @@ "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.33.1", - "sha256": "1mskbr0adhnri72fa3afghxpcfbzq0qnpslhh9gdnymvs3afjbdg", - "vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv", - "version": "1.33.1" + "rev": "v1.33.2", + "sha256": "sha256-kERpOIEy6UsT2BEY9kkINuWbncDXJuwWjR/Kzua97m8=", + "vendorSha256": "sha256-p+NFt9QjbR12bGnCrhUTJzwtBagjXn5w1UcQFMQpY+I=", + "version": "1.33.2" }, "helm": { "owner": "hashicorp", @@ -602,10 +602,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.10.0", - "sha256": "sha256-pA0yI59iRBmiT3rdvoP4vkSz/+bH29O4eLGPCBjfiZU=", + "rev": "v2.11.0", + "sha256": "sha256-qrADveCJUvYcseTUmqQzmRKn4Whb/KfJjwz2+6V7yZc=", "vendorSha256": null, - "version": "2.10.0" + "version": "2.11.0" }, "launchdarkly": { "owner": "launchdarkly", @@ -746,10 +746,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.43.3", - "sha256": "sha256-RSE0JHhIKR0Xst2iol3L02OZnEHwkVoaN32Yu2YZy7s=", - "vendorSha256": "sha256-4C8OWJSaUp4W8ScERveGYJ0m8avl6HHeTtGleJa5mdk=", - "version": "2.43.3" + "rev": "v2.43.4", + "sha256": "sha256-7ckPPU5ieVEZogW7lWd5vMHyXSlTuSqXj1suxKfEyis=", + "vendorSha256": "sha256-HhjTcdw8LbwMJ7P5LcZtgtEojLsqnsiBDrRIp62EZhQ=", + "version": "2.43.4" }, "nomad": { "owner": "hashicorp", @@ -801,19 +801,19 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.72.0", - "sha256": "sha256-ztlMhwcRraPdR95iZGiEKJAKe7PZeE4ABLBNVo2maUQ=", + "rev": "v4.73.0", + "sha256": "sha256-duONflOa+ZmWNAOZTcjLJUaeIUSiDR3VC4+SC4UXBBg=", "vendorSha256": null, - "version": "4.72.0" + "version": "4.73.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.24.0", - "sha256": "sha256-nP42jYvdXmW4gz1fRcEm3Cmv7RXlpk6l2qL5dImIvAw=", - "vendorSha256": "sha256-S4HVfl/PbgpgWFedkWM+EGyYAL5P0cdkLMYL+y+aX8w=", - "version": "3.24.0" + "rev": "v3.25.1", + "sha256": "sha256-+XCpk/vfAD8TWxMdi/WqXxDEh6cEZ684Zr+vkHnNMsI=", + "vendorSha256": "sha256-LHiOQNFkMajqytrv387yIhAyCQCaG2Kw5OCI8Xe7u2k=", + "version": "3.25.1" }, "oktaasa": { "owner": "oktadeveloper", @@ -855,10 +855,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.29.2-alpha.1", - "sha256": "sha256-OAbsX7GMGeDvc22xj4V/Jfap2ROg7ECTFf+FJTm0aDM=", - "vendorSha256": "sha256-kSZvxbovF2/oCqFY/0zpGmAhLFuCw6nWG3B4ppyxzLY=", - "version": "1.29.2-alpha.1" + "rev": "v1.29.2", + "sha256": "sha256-V5EGRd5/JmCDaF1fQkpwHA4DNVFKwvGnMR/AyKvgLtk=", + "vendorSha256": "sha256-FOcddb1+uG5avqYZMvzR1UXDvtDDwtxBzf7FsN6ZROM=", + "version": "1.29.2" }, "opsgenie": { "owner": "opsgenie", diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index f719cc91bd6de..3b11f7fc1a89a 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -48,9 +48,25 @@ , zlib }: +# How to update Linphone? (The Qt desktop app) +# +# Belledonne Communications (BC), the company making Linphone, has split the +# project into several sub-projects that they maintain, plus some third-party +# dependencies that they also extend with commits of their own, specific to +# Linphone and not (yet?) upstreamed. +# +# All of this is organised in a Software Development Kit (SDK) meta-repository +# with git submodules to pin all those repositories into a coherent whole. +# +# The Linphone Qt desktop app uses this SDK as submodule as well. +# +# So, in order to update the desktop app to a new release, one has to follow +# the submodule chain and update the corresponding derivations here, in nixpkgs, +# with the corresponding version number (or commit hash) + mkDerivation rec { pname = "linphone-desktop"; - version = "4.2.5"; + version = "4.4.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -58,12 +74,13 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz"; + sha256 = "sha256-BBOTyKMZikkxMJSmzAuChVHpVeCvbAimn1K3REGbqEg="; }; patches = [ ./do-not-build-linphone-sdk.patch ./remove-bc_compute_full_version-usage.patch + ./no-store-path-in-autostart.patch ]; # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21 @@ -77,12 +94,21 @@ mkDerivation rec { # there might be some build inputs here that aren't needed for # linphone-desktop. buildInputs = [ + # Made by BC bcg729 bctoolbox belcard belle-sip belr bzrtp + liblinphone + mediastreamer + mediastreamer-openh264 + ortp + + # Vendored by BC but we use upstream, might cause problems + libmatroska + cairo cyrus_sasl ffmpeg @@ -91,19 +117,14 @@ mkDerivation rec { gtk2 libX11 libexosip - liblinphone - libmatroska libnotify libosip libsoup libupnp libxml2 mbedtls - mediastreamer - mediastreamer-openh264 minizip2 openldap - ortp pango qtbase qtgraphicaleffects @@ -117,7 +138,9 @@ mkDerivation rec { ]; nativeBuildInputs = [ + # Made by BC bcunit + cmake graphviz intltool @@ -126,7 +149,6 @@ mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include" "-DMINIZIP_LIBRARIES=minizip" ]; @@ -160,18 +182,25 @@ mkDerivation rec { # Linphone will randomly crash when it tries to access those files. Then, # those just need to be copied manually below. installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/lib cp linphone-app/linphone $out/bin/ + cp linphone-app/libapp-plugin.so $out/lib/ + mkdir -p $out/lib/mediastreamer/plugins + ln -s ${mediastreamer-openh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ + ln -s ${mediastreamer}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ wrapProgram $out/bin/linphone \ --set MEDIASTREAMER_PLUGINS_DIR \ - ${mediastreamer-openh264}/lib/mediastreamer/plugins + $out/lib/mediastreamer/plugins mkdir -p $out/share/applications cp linphone-app/linphone.desktop $out/share/applications/ - cp -r ../linphone-app/assets/icons $out/share/ + mkdir -p $out/share/icons/hicolor/scalable/apps + cp ../linphone-app/assets/images/linphone_logo.svg $out/share/icons/hicolor/scalable/apps/linphone.svg mkdir -p $out/share/belr/grammars ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ + ln -s ${belle-sip}/share/belr/grammars/* $out/share/belr/grammars/ mkdir -p $out/share/linphone ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ + ln -s ${liblinphone}/share/sounds $out/share/sounds ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch index fe774a479fac2..dc635b32a0312 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch +++ b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch @@ -1,30 +1,31 @@ -From 08b8b1811a1ad079fa713d19a8cc6bf2dc782bb7 Mon Sep 17 00:00:00 2001 -From: David P <megver83@parabola.nu> -Date: Thu, 26 Nov 2020 15:56:30 -0300 -Subject: [PATCH 1/2] do not build linphone-sdk +From e6a9992461f368d08d1ad63ffe454714ec0c59ce Mon Sep 17 00:00:00 2001 +From: Lorenz Brun <lorenz@brun.one> +Date: Fri, 28 Jan 2022 02:36:01 +0100 +Subject: [PATCH] Remove Linphone SDK build -Signed-off-by: David P <megver83@parabola.nu> --- - CMakeLists.txt | 61 +------------------ - .../cmake_builder/additional_steps.cmake | 9 --- - 2 files changed, 3 insertions(+), 67 deletions(-) + CMakeLists.txt | 86 ++----------------- + .../cmake_builder/additional_steps.cmake | 9 -- + 2 files changed, 5 insertions(+), 90 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f7eb05f2..5921ee5b 100644 +index 2002b925..6d92a8e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") - +@@ -152,7 +152,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") + list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video -include(ExternalProject) set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") -@@ -136,29 +135,8 @@ if(UNIX AND NOT APPLE) - set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") - list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}") +@@ -190,30 +189,8 @@ if(ENABLE_BUILD_APP_PLUGINS) + endif() endif() + +- +-if(NOT LINPHONE_QT_ONLY) -ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" - INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" @@ -35,7 +36,7 @@ index f7eb05f2..5921ee5b 100644 - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -- #BUILD_ALWAYS NO #${DO_BUILD} +- BUILD_ALWAYS NO #${DO_BUILD} -) -ExternalProject_Add_Step(sdk force_build - COMMENT "Forcing build for 'desktop'" @@ -43,18 +44,17 @@ index f7eb05f2..5921ee5b 100644 - DEPENDERS build - ALWAYS 1 -) +-endif() include(FindPkgConfig) -set(APP_DEPENDS sdk) -- -- - find_package(Qt5 5.12 COMPONENTS Core REQUIRED) + find_package(Qt5 5.10 COMPONENTS Core REQUIRED) if ( NOT Qt5_FOUND ) -@@ -173,39 +151,6 @@ find_package(Mediastreamer2 CONFIG QUIET) +@@ -227,62 +204,9 @@ find_package(belcard CONFIG QUIET) + find_package(Mediastreamer2 CONFIG QUIET) find_package(ortp CONFIG QUIET) - -if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) - message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") - ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" @@ -63,23 +63,51 @@ index f7eb05f2..5921ee5b 100644 - BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" - DEPENDS ${APP_DEPENDS} - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project" +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} - # ${APP_OPTIONS} - BUILD_ALWAYS ON - ) +- if( ENABLE_BUILD_APP_PLUGINS) +- ExternalProject_Add(app-plugins PREFIX "${CMAKE_BINARY_DIR}/plugins-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/plugins" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/plugins-app" +- DEPENDS linphone-qt +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- ) +- endif() - install(CODE "message(STATUS Running install)") - set(AUTO_REGENERATION auto_regeneration) -- add_custom_target(${AUTO_REGENERATION} ALL -- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS linphone-qt) +- if( ENABLE_BUILD_APP_PLUGINS) +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS app-plugins) +- else() +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS linphone-qt) +- endif() -else() - message("Adding Linphone Desktop in an IDE-friendly state") - set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") - add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) -- add_dependencies(app-library ${APP_DEPENDS}) --endif() +- if(NOT LINPHONE_QT_ONLY) +- add_dependencies(app-library ${APP_DEPENDS}) +- endif() +- if( ENABLE_BUILD_APP_PLUGINS) +- add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app") +- endif() ++message("Adding Linphone Desktop in an IDE-friendly state") ++set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") ++add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) ++if( ENABLE_BUILD_APP_PLUGINS) ++ add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app") + endif() -ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" - INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" @@ -89,11 +117,8 @@ index f7eb05f2..5921ee5b 100644 - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} - EXCLUDE_FROM_ALL ON -- BUILD_ALWAYS ON +- #BUILD_ALWAYS ON -) -+message("Adding Linphone Desktop in an IDE-friendly state") -+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake index 7f7fd573..a69a04e8 100644 --- a/linphone-app/cmake_builder/additional_steps.cmake @@ -114,5 +139,5 @@ index 7f7fd573..a69a04e8 100644 endif () endif () -- -2.29.2 +2.25.1 diff --git a/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch b/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch new file mode 100644 index 0000000000000..dc1b0be916cdf --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch @@ -0,0 +1,27 @@ +From 6a26922e5e4363de36057d635a1bf889160b2533 Mon Sep 17 00:00:00 2001 +From: Lorenz Brun <lorenz@brun.one> +Date: Fri, 28 Jan 2022 18:44:43 +0100 +Subject: [PATCH] Do not use store path for autostart on Nix + +--- + linphone-app/src/app/App.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp +index 868f8f44..2c61c648 100644 +--- a/linphone-app/src/app/App.cpp ++++ b/linphone-app/src/app/App.cpp +@@ -858,6 +858,10 @@ void App::setAutoStart (bool enabled) { + exec = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE")); + qDebug() << "exec path autostart set appimage=" << exec; + } ++ else if (binPath.startsWith("/nix/store")) { // Nix/NixOS ++ exec = QStringLiteral("linphone"); ++ qDebug() << "exec path autostart set nix=" << exec; ++ } + else { //classic package + exec = binPath; + qDebug() << "exec path autostart set classic package=" << exec; +-- +2.25.1 + diff --git a/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch b/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch index 547652d3af7fb..225f0e78db233 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch +++ b/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch @@ -1,7 +1,7 @@ -From 6fc23da651d54979e73776fcda38614e290d65dc Mon Sep 17 00:00:00 2001 +From 4849d5633b98e6d3514355436eab5ba537cbfd99 Mon Sep 17 00:00:00 2001 From: David P <megver83@parabola.nu> Date: Fri, 23 Oct 2020 16:44:17 -0300 -Subject: [PATCH 2/2] remove bc_compute_full_version usage +Subject: [PATCH] remove bc_compute_full_version usage --- linphone-app/CMakeLists.txt | 11 +---------- @@ -10,7 +10,7 @@ Subject: [PATCH 2/2] remove bc_compute_full_version usage 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt -index 3bc9420a..27b418ee 100644 +index de7f917f..ee14ff78 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -21,17 +21,8 @@ @@ -30,8 +30,8 @@ index 3bc9420a..27b418ee 100644 - -project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") + if(ENABLE_BUILD_VERBOSE) - #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt index 8ef03faa..97d94bd6 100644 --- a/linphone-app/build/CMakeLists.txt @@ -49,7 +49,7 @@ index 8ef03faa..97d94bd6 100644 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -index baea03cf..08ffc1b5 100644 +index ac85c68a..e6af5a66 100644 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui") @@ -70,5 +70,5 @@ index baea03cf..08ffc1b5 100644 endif () string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") -- -2.29.2 +2.25.1 diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 445078070220e..c848cb55c0d71 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220411"; + version = "20220425"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-ia+8RZ1wQTyUCs+6o9AMCH4Kh2neHjPWbXWjLkDb6/w="; + sha256 = "sha256-FWW4rVaoShT55ZWN/siFHoTTNcarnfTa2h/J2GWxLW8="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 318ac8762395c..b96210529e723 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "7.37.0"; + version = "7.39.0"; src = fetchurl { # find the latest version with @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_108.snap"; - sha512 = "05c4a0baeee8c1ff9547017288d099a9ef7b3049647ef0318ca4b1112df26f9f3a844bbae5f9ada59adaf07838987e2a685aee21ea494945202009236fe5f6bc"; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_111.snap"; + sha512 = "1c90f249fd1802d4ed032b85ee835ca04e84e673caff339b6ce9b35188fec65a3ccce0e2a8a9afef46354ed5886ab17c612468ad7281c660c904b180753a1729"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 4fe9ad0867814..eb5937bbc3c3b 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "kalibrate-rtl"; - version = "unstable-2013-12-14"; + version = "unstable-2022-02-02"; src = fetchFromGitHub { owner = "steve-m"; repo = "kalibrate-rtl"; - rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38"; - sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; + rev = "340003eb0846b069c3edef19ed3363b8ac7b5215"; + sha256 = "n9mfu8H2OS8dKPNhtJxBfMDp8aHEIcxg/R+kcRNOBpk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ bjornfor viraptor ]; }; } diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index c41c8593a5c49..8dc8f749897ee 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,10 +1,14 @@ { mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, - cudaSupport ? false, cudatoolkit ? null }: + cudaSupport ? false, cudaPackages }: -assert !cudaSupport || cudatoolkit != null; +assert cudaSupport -> cudaPackages != { }; -let boost_static = boost17x.override { enableStatic = true; }; +let + boost_static = boost17x.override { enableStatic = true; }; + + # TODO: migrate to redist packages + inherit (cudaPackages) cudatoolkit; in mkDerivation rec { version = "3.7"; @@ -13,15 +17,27 @@ mkDerivation rec { owner = "colmap"; repo = "colmap"; rev = version; - sha256 = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; + hash = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; }; + # TODO: rm once the gcc11 issue is closed, https://github.com/colmap/colmap/issues/1418#issuecomment-1049305256 + cmakeFlags = lib.optionals cudaSupport [ + "-DCUDA_ENABLED=ON" + "-DCUDA_NVCC_FLAGS=--std=c++14" + ]; + buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase - ] ++ lib.optional cudaSupport cudatoolkit; + ] ++ lib.optionals cudaSupport [ + cudatoolkit + ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals cudaSupport [ + cudaPackages.autoAddOpenGLRunpathHook + ]; meta = with lib; { description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline"; |