From fc08dbd086244dd087480c9fe15693b401be971a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Feb 2023 22:16:34 -0800 Subject: [PATCH 1/2] corrosion: 0.3.0 -> 0.3.3 Diff: https://github.com/corrosion-rs/corrosion/compare/v0.3.0...v0.3.3 Changelog: https://github.com/corrosion-rs/corrosion/blob/v0.3.3/RELEASES.md --- pkgs/development/tools/build-managers/corrosion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 886db356cfa1..bee465fbfd88 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.3.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-HZdKnS0M8q4C42b7J93LZBXJycxYVahy2ywT6rISOzo="; + hash = "sha256-dXUjQmKk+UdgYqdMuNh9ALaots1t0xwg6hEWwAbGPJc="; }; cargoRoot = "generator"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-vrAK5BrMSC8FMLvtP0rxw4sHRU9ySbnrZM50oXMJV1Q="; + hash = "sha256-f+n/bjjdKar5aURkPNYKkHUll6lqNa/dlzq3dIFh+tc="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; From 80c641d7df8e4c4731dba3fce8176dcd5ca2ecb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Feb 2023 22:25:03 -0800 Subject: [PATCH 2/2] corrosion: remove old patch --- .../corrosion/cmake-install-full-dir.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch diff --git a/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch b/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch deleted file mode 100644 index da5e923e0fa5..000000000000 --- a/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/CorrosionConfig.cmake.in b/cmake/CorrosionConfig.cmake.in -index c042a00..491f53c 100644 ---- a/cmake/CorrosionConfig.cmake.in -+++ b/cmake/CorrosionConfig.cmake.in -@@ -4,11 +4,11 @@ if (Corrosion_FOUND) - return() - endif() - --list(APPEND CMAKE_MODULE_PATH "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_DATADIR@/cmake") -+list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_FULL_DATADIR@/cmake") - - add_executable(Corrosion::Generator IMPORTED GLOBAL) - set_property( - TARGET Corrosion::Generator -- PROPERTY IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_LIBEXECDIR@/corrosion-generator") -+ PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_LIBEXECDIR@/corrosion-generator") - - include(Corrosion)