lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

ja2-stracciatella: 0.15.1 -> 0.16.1

authored by

Stefan Lau and committed by
Stefan Lau
e013a505 d3ed77f1

+350 -7
+291
pkgs/games/ja2-stracciatella/Cargo.lock
··· 1 + [[package]] 2 + name = "aho-corasick" 3 + version = "0.5.3" 4 + source = "registry+https://github.com/rust-lang/crates.io-index" 5 + dependencies = [ 6 + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", 7 + ] 8 + 9 + [[package]] 10 + name = "bitflags" 11 + version = "1.0.3" 12 + source = "registry+https://github.com/rust-lang/crates.io-index" 13 + 14 + [[package]] 15 + name = "dtoa" 16 + version = "0.4.3" 17 + source = "registry+https://github.com/rust-lang/crates.io-index" 18 + 19 + [[package]] 20 + name = "fuchsia-zircon" 21 + version = "0.3.3" 22 + source = "registry+https://github.com/rust-lang/crates.io-index" 23 + dependencies = [ 24 + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", 25 + "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", 26 + ] 27 + 28 + [[package]] 29 + name = "fuchsia-zircon-sys" 30 + version = "0.3.3" 31 + source = "registry+https://github.com/rust-lang/crates.io-index" 32 + 33 + [[package]] 34 + name = "getopts" 35 + version = "0.2.18" 36 + source = "registry+https://github.com/rust-lang/crates.io-index" 37 + dependencies = [ 38 + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 39 + ] 40 + 41 + [[package]] 42 + name = "itoa" 43 + version = "0.4.2" 44 + source = "registry+https://github.com/rust-lang/crates.io-index" 45 + 46 + [[package]] 47 + name = "kernel32-sys" 48 + version = "0.2.2" 49 + source = "registry+https://github.com/rust-lang/crates.io-index" 50 + dependencies = [ 51 + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 52 + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 53 + ] 54 + 55 + [[package]] 56 + name = "libc" 57 + version = "0.2.42" 58 + source = "registry+https://github.com/rust-lang/crates.io-index" 59 + 60 + [[package]] 61 + name = "memchr" 62 + version = "0.1.11" 63 + source = "registry+https://github.com/rust-lang/crates.io-index" 64 + dependencies = [ 65 + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", 66 + ] 67 + 68 + [[package]] 69 + name = "proc-macro2" 70 + version = "0.4.6" 71 + source = "registry+https://github.com/rust-lang/crates.io-index" 72 + dependencies = [ 73 + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 74 + ] 75 + 76 + [[package]] 77 + name = "quote" 78 + version = "0.6.3" 79 + source = "registry+https://github.com/rust-lang/crates.io-index" 80 + dependencies = [ 81 + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 82 + ] 83 + 84 + [[package]] 85 + name = "rand" 86 + version = "0.4.2" 87 + source = "registry+https://github.com/rust-lang/crates.io-index" 88 + dependencies = [ 89 + "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", 90 + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", 91 + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", 92 + ] 93 + 94 + [[package]] 95 + name = "regex" 96 + version = "0.1.80" 97 + source = "registry+https://github.com/rust-lang/crates.io-index" 98 + dependencies = [ 99 + "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", 100 + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", 101 + "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", 102 + "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", 103 + "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 104 + ] 105 + 106 + [[package]] 107 + name = "regex-syntax" 108 + version = "0.3.9" 109 + source = "registry+https://github.com/rust-lang/crates.io-index" 110 + 111 + [[package]] 112 + name = "remove_dir_all" 113 + version = "0.5.1" 114 + source = "registry+https://github.com/rust-lang/crates.io-index" 115 + dependencies = [ 116 + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", 117 + ] 118 + 119 + [[package]] 120 + name = "serde" 121 + version = "1.0.70" 122 + source = "registry+https://github.com/rust-lang/crates.io-index" 123 + 124 + [[package]] 125 + name = "serde_derive" 126 + version = "1.0.70" 127 + source = "registry+https://github.com/rust-lang/crates.io-index" 128 + dependencies = [ 129 + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 130 + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", 131 + "syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", 132 + ] 133 + 134 + [[package]] 135 + name = "serde_json" 136 + version = "1.0.22" 137 + source = "registry+https://github.com/rust-lang/crates.io-index" 138 + dependencies = [ 139 + "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", 140 + "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", 141 + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", 142 + ] 143 + 144 + [[package]] 145 + name = "shell32-sys" 146 + version = "0.1.2" 147 + source = "registry+https://github.com/rust-lang/crates.io-index" 148 + dependencies = [ 149 + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 150 + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 151 + ] 152 + 153 + [[package]] 154 + name = "stracciatella" 155 + version = "0.1.0" 156 + dependencies = [ 157 + "getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", 158 + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", 159 + "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", 160 + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", 161 + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", 162 + "serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)", 163 + "shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", 164 + "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 165 + "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 166 + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 167 + ] 168 + 169 + [[package]] 170 + name = "syn" 171 + version = "0.14.4" 172 + source = "registry+https://github.com/rust-lang/crates.io-index" 173 + dependencies = [ 174 + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 175 + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", 176 + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 177 + ] 178 + 179 + [[package]] 180 + name = "tempdir" 181 + version = "0.3.7" 182 + source = "registry+https://github.com/rust-lang/crates.io-index" 183 + dependencies = [ 184 + "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", 185 + "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", 186 + ] 187 + 188 + [[package]] 189 + name = "thread-id" 190 + version = "2.0.0" 191 + source = "registry+https://github.com/rust-lang/crates.io-index" 192 + dependencies = [ 193 + "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", 194 + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", 195 + ] 196 + 197 + [[package]] 198 + name = "thread_local" 199 + version = "0.2.7" 200 + source = "registry+https://github.com/rust-lang/crates.io-index" 201 + dependencies = [ 202 + "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 203 + ] 204 + 205 + [[package]] 206 + name = "unicode-width" 207 + version = "0.1.5" 208 + source = "registry+https://github.com/rust-lang/crates.io-index" 209 + 210 + [[package]] 211 + name = "unicode-xid" 212 + version = "0.1.0" 213 + source = "registry+https://github.com/rust-lang/crates.io-index" 214 + 215 + [[package]] 216 + name = "user32-sys" 217 + version = "0.2.0" 218 + source = "registry+https://github.com/rust-lang/crates.io-index" 219 + dependencies = [ 220 + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", 221 + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", 222 + ] 223 + 224 + [[package]] 225 + name = "utf8-ranges" 226 + version = "0.1.3" 227 + source = "registry+https://github.com/rust-lang/crates.io-index" 228 + 229 + [[package]] 230 + name = "winapi" 231 + version = "0.2.8" 232 + source = "registry+https://github.com/rust-lang/crates.io-index" 233 + 234 + [[package]] 235 + name = "winapi" 236 + version = "0.3.5" 237 + source = "registry+https://github.com/rust-lang/crates.io-index" 238 + dependencies = [ 239 + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 240 + "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 241 + ] 242 + 243 + [[package]] 244 + name = "winapi-build" 245 + version = "0.1.1" 246 + source = "registry+https://github.com/rust-lang/crates.io-index" 247 + 248 + [[package]] 249 + name = "winapi-i686-pc-windows-gnu" 250 + version = "0.4.0" 251 + source = "registry+https://github.com/rust-lang/crates.io-index" 252 + 253 + [[package]] 254 + name = "winapi-x86_64-pc-windows-gnu" 255 + version = "0.4.0" 256 + source = "registry+https://github.com/rust-lang/crates.io-index" 257 + 258 + [metadata] 259 + "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" 260 + "checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" 261 + "checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd" 262 + "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" 263 + "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" 264 + "checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797" 265 + "checksum itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5adb58558dcd1d786b5f0bd15f3226ee23486e24b7b58304b60f64dc68e62606" 266 + "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" 267 + "checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1" 268 + "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" 269 + "checksum proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6" 270 + "checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035" 271 + "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" 272 + "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" 273 + "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" 274 + "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" 275 + "checksum serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "0c3adf19c07af6d186d91dae8927b83b0553d07ca56cbf7f2f32560455c91920" 276 + "checksum serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3525a779832b08693031b8ecfb0de81cd71cfd3812088fafe9a7496789572124" 277 + "checksum serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "84b8035cabe9b35878adec8ac5fe03d5f6bc97ff6edd7ccb96b44c1276ba390e" 278 + "checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" 279 + "checksum syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2beff8ebc3658f07512a413866875adddd20f4fd47b2a4e6c9da65cd281baaea" 280 + "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" 281 + "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" 282 + "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" 283 + "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" 284 + "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" 285 + "checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" 286 + "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" 287 + "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" 288 + "checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd" 289 + "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" 290 + "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" 291 + "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+38 -7
pkgs/games/ja2-stracciatella/default.nix
··· 1 - { stdenv, fetchFromGitHub, SDL }: 2 - 3 - stdenv.mkDerivation rec { 4 - version = "0.15.1"; 5 - name = "ja2-stracciatella-${version}"; 1 + { stdenv, fetchFromGitHub, cmake, SDL2, boost, fltk, rustPlatform }: 2 + with rustPlatform; 3 + let 4 + version = "0.16.1"; 6 5 src = fetchFromGitHub { 7 6 owner = "ja2-stracciatella"; 8 7 repo = "ja2-stracciatella"; 9 8 rev = "v${version}"; 10 - sha256 = "0r7j6k7412b3qfb1rnh80s55zhnriw0v03zn5bp3spcqjxh4xhv1"; 9 + sha256 = "1pyn23syg70kiyfbs3pdlq0ixd2bxhncbamnic43rym3dmd52m29"; 10 + }; 11 + lockfile = ./Cargo.lock; 12 + libstracciatellaSrc = stdenv.mkDerivation { 13 + name = "libstracciatella-${version}-src"; 14 + src = "${src}/rust"; 15 + installPhase = '' 16 + mkdir -p $out 17 + cp -R ./* $out/ 18 + cp ${lockfile} $out/Cargo.lock 19 + ''; 20 + }; 21 + libstracciatella = buildRustPackage { 22 + name = "libstracciatella-${version}"; 23 + inherit version; 24 + src = libstracciatellaSrc; 25 + cargoSha256 = "0gxp5ps1lzmrg19h6k31fgxjdnjl6amry2vmb612scxcwklxryhm"; 26 + doCheck = false; 11 27 }; 28 + in 29 + stdenv.mkDerivation rec { 30 + name = "ja2-stracciatella-${version}"; 31 + inherit src; 32 + inherit version; 33 + 34 + buildInputs = [ cmake SDL2 fltk boost ]; 35 + 36 + patches = [ 37 + ./remove-rust-buildstep.patch 38 + ]; 39 + preConfigure = '' 40 + sed -i -e 's|rust-stracciatella|${libstracciatella}/bin/libstracciatella.so|g' CMakeLists.txt 41 + cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") 42 + ''; 43 + 12 44 enableParallelBuilding = true; 13 - buildInputs = [ SDL ]; 14 45 meta = { 15 46 description = "Jagged Alliance 2, with community fixes"; 16 47 license = "SFI Source Code license agreement";
+21
pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch
··· 1 + diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index f354370e0..c9fa23c6d 100644 3 + --- a/CMakeLists.txt 4 + +++ b/CMakeLists.txt 5 + @@ -159,7 +159,6 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/externalized") 6 + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/game") 7 + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/sgp") 8 + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/slog") 9 + -add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/rust") 10 + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-smacker") 11 + 12 + if(BUILD_LAUNCHER) 13 + @@ -235,8 +234,6 @@ copy_assets_dir_to_ja2_binary_after_build("externalized") 14 + copy_assets_dir_to_ja2_binary_after_build("unittests") 15 + copy_assets_dir_to_ja2_binary_after_build("mods") 16 + 17 + -get_property(STRACCIATELLA_SHARED_LIB TARGET rust-stracciatella PROPERTY IMPORTED_LOCATION) 18 + - 19 + if (MSVC OR APPLE) 20 + add_custom_command(TARGET ${JA2_BINARY} POST_BUILD 21 + COMMAND ${CMAKE_COMMAND} -E copy