diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-09 16:01:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-09 16:01:14 +0200 |
| commit | d2768ea8ba99caa77924f16e5d0dbd0ac2553b5b (patch) | |
| tree | 685c9f8b8ab6b5a289d7b617458e6e4b57779007 | |
| parent | 21f2d189e40ef88e16d4e4cee1b70eccd37c18c9 (diff) | |
| parent | 270cf648af9e29e9f759a37a5cb2d59dcfe64307 (diff) | |
Merge pull request #308448 from r-ryantm/auto-update/corrosion
corrosion: 0.4.8 -> 0.5
| -rw-r--r-- | pkgs/applications/kde/angelfish.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/corrosion/default.nix | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix index 1bd6084a1883..326a9fc309ac 100644 --- a/pkgs/applications/kde/angelfish.nix +++ b/pkgs/applications/kde/angelfish.nix @@ -4,6 +4,7 @@ , cmake , corrosion , extra-cmake-modules +, fetchpatch2 , futuresql , kconfig , kcoreaddons @@ -30,6 +31,14 @@ mkDerivation rec { pname = "angelfish"; + patches = [ + (fetchpatch2 { + name = "fix-build-with-corrosion-0.5.patch"; + url = "https://invent.kde.org/network/angelfish/-/commit/b04928e3b62a11b647622b81fb67b7c0db656ac8.patch"; + hash = "sha256-9rpkMKQKrvGJFIQDwSIeeZyk4/vd348r660mBOKzM2E="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoTarball { # include version in the name so we invalidate the FOD name = "${pname}-${srcs.angelfish.version}"; diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index c452e9aa4f5b..6809ee7ffd7a 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.4.8"; + version = "0.5"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-ChoeN7qQRR1YmYYvPdJVJ2SVGTDGlM7PsN9jzFjQEyU="; + hash = "sha256-vaNXXXaGqYNmhonU+ANN857LAUgwv+PMcON+nBuUoeo="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; |