diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-24 12:01:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-24 12:01:52 +0000 |
| commit | 13fb68e8cffe5df27e8d2cb8d608d24fc13c6fa3 (patch) | |
| tree | 2c390386d45ea7d035bd64b014f5b509b54b42a5 /pkgs/development/tools/build-managers | |
| parent | ac79516061d6fdcf8c32aafa8a3e48ac377ae33e (diff) | |
| parent | 2384cd723bd4af02838efcd6a49d9ac8d118298d (diff) | |
| download | nixpkgs-13fb68e8cffe5df27e8d2cb8d608d24fc13c6fa3.tar nixpkgs-13fb68e8cffe5df27e8d2cb8d608d24fc13c6fa3.tar.gz nixpkgs-13fb68e8cffe5df27e8d2cb8d608d24fc13c6fa3.tar.bz2 nixpkgs-13fb68e8cffe5df27e8d2cb8d608d24fc13c6fa3.tar.lz nixpkgs-13fb68e8cffe5df27e8d2cb8d608d24fc13c6fa3.tar.xz nixpkgs-13fb68e8cffe5df27e8d2cb8d608d24fc13c6fa3.tar.zst nixpkgs-13fb68e8cffe5df27e8d2cb8d608d24fc13c6fa3.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch | 18 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/corrosion/default.nix | 6 |
2 files changed, 3 insertions, 21 deletions
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 da5e923e0fa..00000000000 --- 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) diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 886db356cfa..bee465fbfd8 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; |