diff options
24 files changed, 122 insertions, 102 deletions
diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index 8de527fceb26..4562e5a2c29b 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -7,7 +7,7 @@ let runtime' = filter (f: f.enable) (attrValues cfg.runtime); - runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = x.target; path = x.source; }) runtime'); + runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = "etc/${x.target}"; path = x.source; }) runtime'); in { options.programs.neovim = { diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/applications/emulators/ripes/default.nix index e95b22d07f55..3966be9e76a1 100644 --- a/pkgs/applications/emulators/ripes/default.nix +++ b/pkgs/applications/emulators/ripes/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "ripes"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "mortbopet"; repo = "Ripes"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-HdvLi3OKJmr+U/dxCGmq6JR91dWpUL3uoPumH2/B46k="; + sha256 = "sha256-fRkab0G2zjK1VYzH21yhL7Cr0rS4I8ir8gwH9ALy60A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c9d5afce614c..cc727a9a8509 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -27,6 +27,7 @@ , libpng , librsvg , libtiff +, libjxl , openexr_3 , osm-gps-map , pkg-config @@ -57,12 +58,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.2.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0bfcag6bj5vcmg4z4xjirs43iafcx89al6jl41i5mrhpjzszh5hl"; + sha256 = "18b0917fdfe9b09f66c279a681cc3bd52894a566852bbf04b2e179ecfdb11af9"; }; nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { libpng librsvg libtiff + libjxl openexr_3 sqlite libxslt diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index 5ea0a82c850e..fc66c908be70 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vhs"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-wcOLUA/U+xRwo7slnACCURQO7D0F3pFP2/SHDfEHeTA="; + hash = "sha256-t6n4uID7KTu/BqsmndJOft0ifxZNfv9lfqlzFX0ApKw="; }; - vendorHash = "sha256-f8EHDxu+NWAFJx9ujzsiDhNymdEzExmdreP11gV56AI="; + vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38="; nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ ttyd ffmpeg ]; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 50d68eeeba1c..901d476dc62c 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,30 +1,31 @@ { lib , stdenv +, mkDerivation , fetchFromGitHub , cmake , asciidoc +, pkg-config +, boost17x , cmark +, coeurl +, curl +, libevent +, libsecret , lmdb , lmdbxx -, libsecret -, mkDerivation +, mtxclient +, nlohmann_json +, olm , qtbase +, qtgraphicaleffects +, qtimageformats , qtkeychain , qtmacextras , qtmultimedia -, qtimageformats -, qttools , qtquickcontrols2 -, qtgraphicaleffects -, mtxclient -, boost17x +, qttools +, re2 , spdlog -, olm -, pkg-config -, nlohmann_json -, coeurl -, libevent -, curl , voipSupport ? true , gst_all_1 , libnice @@ -32,49 +33,50 @@ mkDerivation rec { pname = "nheko"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-gid8XOZ1/hMDGNbse4GYfcAdqHiySWyy4isBgcpekIQ="; + hash = "sha256-4Xe3eRnDkgyYB+hUP8TBWTt+m29HVtgcqVEQUUsIpCY="; }; nativeBuildInputs = [ - lmdbxx + asciidoc cmake + lmdbxx pkg-config - asciidoc ]; buildInputs = [ - nlohmann_json - mtxclient - olm boost17x + cmark + coeurl + curl + libevent libsecret lmdb - spdlog - cmark + mtxclient + nlohmann_json + olm qtbase - qtmultimedia - qtimageformats - qttools - qtquickcontrols2 qtgraphicaleffects + qtimageformats qtkeychain - coeurl - libevent - curl + qtmultimedia + qtquickcontrols2 + qttools + re2 + spdlog ] ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optionals voipSupport (with gst_all_1; [ - gstreamer - gst-plugins-base - (gst-plugins-good.override { qt5Support = true; }) - gst-plugins-bad - libnice - ]); + ++ lib.optionals voipSupport (with gst_all_1; [ + gstreamer + gst-plugins-base + (gst-plugins-good.override { qt5Support = true; }) + gst-plugins-bad + libnice + ]); cmakeFlags = [ "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 @@ -88,11 +90,11 @@ mkDerivation rec { meta = with lib; { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ekleog fpletz ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.targetPlatform.isDarwin; - license = licenses.gpl3Plus; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index ec3f4d7574b9..e0bfa57b1e8d 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.60.1"; + version = "0.60.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-Lyo/T8df7tIc+h8MFh6yL+I+2W6On/C5PguNZfQAu9s="; + hash = "sha256-jSRZZufGi1wmdT7LeNutkO74bqln8uJ5TSEDCJyfPB4="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index f00e67dfdcab..7ce9973c3b72 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202301050046"; + version = "202301120046"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "6bb07558ac223b3decdff985d5737f4384b34238"; - sha256 = "sha256-KXLIIs1W+8TC2GtW3m/YA5WQ13Pq5kxC5Zc9jDzW/tU="; + rev = "c308361f47373772d1a3b9d486cd7dded7165d8e"; + sha256 = "sha256-GhCEsMDeMapWpJckMWS+3azuNjMdiN4cjDyq8aSJINA="; }; installPhase = '' diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix index 40712e8beddd..4d04abee3adc 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/development/libraries/coeurl/default.nix @@ -11,17 +11,18 @@ stdenv.mkDerivation rec { pname = "coeurl"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+FIxi019+jnjpo4NhBQ4tb3ObLrEStMN5YD+MrTLa2E="; + hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w="; }; nativeBuildInputs = [ ninja pkg-config meson ]; + buildInputs = [ libevent curl spdlog ]; meta = with lib; { diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index a889e5358a50..2f0e2148dfeb 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }: let - version = "0.3.95"; + version = "0.3.3"; pname = "lensfun"; # Fetch a more recent version of the repo containing a more recent lens @@ -9,8 +9,8 @@ let lensfunDatabase = fetchFromGitHub { owner = "lensfun"; repo = "lensfun"; - rev = "4672d765a17bfef7bc994ca7008cb717c61045d5"; - sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41"; + rev = "ec9412d27d5fa8f377848a59c768b12c243cb80d"; + sha256 = "sha256-/u/3oQzac/dQrgFaiYvzT5uQ108XarkXnA2DByA5sic="; }; in @@ -21,16 +21,26 @@ stdenv.mkDerivation { owner = "lensfun"; repo = "lensfun"; rev = "v${version}"; - sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r"; + sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz"; }; # replace database with a more recent snapshot + # the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles, + # so we run the conversion tool the project provides, + # then untar the verson 1 profiles into the source dir before we build prePatch = '' - rm -R ./data/db - cp -R ${lensfunDatabase}/data/db ./data + rm -R data/db + python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db + mkdir -p data/db + tar xvf $TMPDIR/db/version_1.tar -C data/db + date +%s > data/db/timestamp.txt ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake pkg-config + python3 python3.pkgs.lxml # For the db converison + ]; + buildInputs = [ glib zlib libpng ]; cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 7f4585c640e1..7513614a51e8 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,26 +1,28 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake , pkg-config -, openssl -, olm -, spdlog -, nlohmann_json , coeurl -, libevent , curl +, libevent +, nlohmann_json +, olm +, openssl +, re2 +, spdlog }: stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-x2c+wZWAWYoKxSqEezoInw3SwcGo9dQNDvuq7racLBA="; + hash = "sha256-39tdTY2emN3/FxZxwl6dcQn1bOgybws166wqFPJl68M="; }; postPatch = '' @@ -39,14 +41,16 @@ stdenv.mkDerivation rec { cmake pkg-config ]; + buildInputs = [ - spdlog - nlohmann_json - openssl - olm coeurl - libevent curl + libevent + nlohmann_json + olm + openssl + re2 + spdlog ]; meta = with lib; { diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 475ebc7517e5..f7b0ab31d83c 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Scaling, colorspace conversion and dithering library"; homepage = "https://github.com/sekrit-twc/zimg"; license = licenses.wtfpl; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; unix ++ windows; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index cbcbb619585e..514b5a0e8395 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.18.3"; + version = "1.18.5"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "13kv6ydd2xka0lnnpcn5jv12pw9n6p7nljdlgkimwvsqsh1z5kfc"; + sha256 = "1wmcvkhhb9ksy35dpp7qa6vk4726pblza869xjx56qmadd6nrrax"; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/confection/default.nix b/pkgs/development/python-modules/confection/default.nix index 82cedc869687..141b781069d0 100644 --- a/pkgs/development/python-modules/confection/default.nix +++ b/pkgs/development/python-modules/confection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "confection"; - version = "0.0.3"; + version = "0.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "explosion"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3qxB94CYCMZN+sKqbmDfkRyAs6HJkFLE/5yJx1DKqYM="; + hash = "sha256-JZQ9D5+UAobywlj8eiyw15wXKYhUKz6+lf9hikMV6x0="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library that offers a configuration system"; homepage = "https://github.com/explosion/confection"; + changelog = "https://github.com/explosion/confection/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 9bbbda304dfd..7b9ff4c894c6 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "3.1.2"; + version = "3.1.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/CJQHcjXZBarHHIndXkCPOHL8OANG8RJgTX3tTZEYLA="; + hash = "sha256-4lA8OdmvQD94jTeDf+Iz7ZyEQ9fZzCxnXQG9Ir8FKhk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index d1ed5572ff1f..1f4b1143694a 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0SFlDmAxvgZCJSFIrXXEjpJ4D0GRJQ0nkBv9D9EpC2g="; + hash = "sha256-44HADoHz0ITGolvZtB1wlFDEMWBwyOZ2HazJMl/SXn0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 96589bece702..1fe98e0de292 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.10.0"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-byppjhrBLentcRwMSbuaf3L7wU+rkP2Z92j2zzEPdY0="; + hash = "sha256-dWpsiitG58iCw8z8Hd10eAXXfRRBlq90m0cs1YjeMqE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 4e8a51cedde6..574f71e87220 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.11.0"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TC2uDnD95NUx1LLLLotZK9tJd6JWZa4MjipcE6k07Mo="; + hash = "sha256-8dhYoj3/EXwMZLRduwskoAn7NSjA4N8xhIw8UbAAhnY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index dc808df9df7f..6d674aeee846 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.13.0"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-jpDwERTLRmS1mO2O2OboZa6AAUh3k/Dyg77TCVTqLok="; + hash = "sha256-q4OD37ryZqg40L89BNZdLCNeC1QPwVhUaT4S5tO88Jk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index fabe8c3f95df..f87e589eec1b 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "hwi"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "HWI"; rev = version; - sha256 = "sha256-jsJjGezf2JrPYr3YNZGx23Jo14DbmM1S6bu7+xgZh58="; + sha256 = "sha256-mLavlJHYU6gUqqc83uHMZfOglrKDIiRNN7Nf2i3fXzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 4b5e6d8bb388..6efeaad63848 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6mLfMbYbdsjWHpfUHP3Q5nsqdMXo/82+A9PV8xWZBM0="; + sha256 = "sha256-sufP/+YixgrOCJJ4P1SjmZpRlSaufRmnVDiv6H+RCyQ="; }; - vendorSha256 = "sha256-aRS+MwME72qIMyhnnIRqmrx5hcQ1V0pLIBJqSoR+Fkk="; + vendorHash = "sha256-WZb8VsFKpvvMys1iK3irEsWCnvKaKDzuyFertVswpdE="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 86fabf16445d..4446ed005028 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brillo"; - version = "1.4.11"; + version = "1.4.12"; src = fetchFromGitLab { owner= "cameronnemo"; repo= "brillo"; rev= "v${version}"; - sha256 = "sha256-R83Zx0dw9bmCF5kHTNYoNzCmJZK3cVzXNb30qAUexFc="; + sha256 = "sha256-dKGNioWGVAFuB4kySO+QGTnstyAD0bt4/6FBVwuRxJo="; }; patches = [ diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 1bb3b0d0103d..c7d1ec7f36e2 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.30.0.6486-629d58034"; + version = "1.30.1.6562-915986d62"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-7blNvNx18sazfff6yIlRXp9vKWiRVISccx/8wjxWz34="; + sha256 = "sha256-fUt8fh4jeZiUbDoc8ivuSpx0Hf4ShYYcfJUJjU+GCxQ="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-ol0WSYwk0Cmz6xJYe3mqaPDjgi4VPiH+vHnP0BIwVBU="; + sha256 = "sha256-ho/r/ouaFsdCH0xcFuy4TWamu0c/ZBZDJO6cYQK/pW0="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index ffd467f08393..3a3ab90d30b9 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.6.4"; + version = "5.7.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-89dW4XILS+nlGgRRePyrSFVb1QR5KQL5OmHJAeyjrZw="; + sha256 = "sha256-4h0W9jw95vOxpseyY7SydiWSFDArAY/ms4+Sk/1esHk="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index 2f270f8161fa..9f9463ce5958 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - homepage = "http://www.xelerance.com/software/xl2tpd/"; + homepage = src.meta.homepage; description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)"; platforms = platforms.linux; license = licenses.gpl2; |