lowdown: 1.3.2 -> 2.0.2, nixVersions.nix_2_24: fix build against lowdown 2.0.2; lix: apply patches for lowdown >= 1.4 (#413730)

authored by sternenseemann and committed by GitHub 4ee5da89 bf63430d

+41 -3
+5 -3
pkgs/by-name/lo/lowdown/package.nix
··· 5 5 fixDarwinDylibNames, 6 6 which, 7 7 dieHook, 8 + bmake, 8 9 enableShared ? !stdenv.hostPlatform.isStatic, 9 10 enableStatic ? stdenv.hostPlatform.isStatic, 10 11 enableDarwinSandbox ? true, ··· 16 17 pname = "lowdown${ 17 18 lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed" 18 19 }"; 19 - version = "1.3.2"; 20 + version = "2.0.2"; 20 21 21 22 outputs = [ 22 23 "out" ··· 27 28 28 29 src = fetchurl { 29 30 url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; 30 - hash = "sha512-IQmgPm2zE+B82Zdg+ldjtU/XI+qab9YRAzwzRMYv32KKjql0YLDEgc/m6DbgyCiNBkulD0dVExCtrTM+nBFHzw=="; 31 + hash = "sha512-cfzhuF4EnGmLJf5EGSIbWqJItY3npbRSALm+GarZ7SMU7Hr1xw0gtBFMpOdi5PBar4TgtvbnG4oRPh+COINGlA=="; 31 32 }; 32 33 33 34 nativeBuildInputs = [ 34 35 which 35 36 dieHook 37 + bmake # Uses FreeBSD's dialect 36 38 ] 37 39 ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; 38 40 ··· 74 76 75 77 postInstall = 76 78 let 77 - soVersion = "1"; 79 + soVersion = "2"; 78 80 in 79 81 80 82 # Check that soVersion is up to date even if we are not on darwin
+28
pkgs/tools/package-management/lix/default.nix
··· 9 9 fetchgit, 10 10 fetchFromGitHub, 11 11 fetchFromGitea, 12 + fetchpatch2, 12 13 rustPlatform, 13 14 editline, 14 15 ncurses, ··· 168 169 hash = "sha256-b5d+HnPcyHz0ZJW1+LZl4qm4LGTB/TiaDFQVlVL2xpE="; 169 170 }; 170 171 172 + patches = [ 173 + # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731 174 + (fetchpatch2 { 175 + name = "lix-2.91-lowdown-1.4.0.patch"; 176 + url = "https://git.lix.systems/lix-project/lix/commit/ecff59d77371b21fef229c33ebb629bc49a8fad5.patch"; 177 + sha256 = "sha256-2M5oId5kObwzpw67rddAPI2RbWPEVlGBrMUXZWqqmEo="; 178 + }) 179 + ]; 180 + 171 181 docCargoDeps = rustPlatform.fetchCargoVendor { 172 182 name = "lix-doc-${version}"; 173 183 inherit src; ··· 200 210 hash = "sha256-iP2iUDxA99RcgQyZROs7bQw8pqxa1vFudRqjAIHg9Iw="; 201 211 }; 202 212 213 + patches = [ 214 + # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731 215 + (fetchpatch2 { 216 + name = "lix-lowdown-1.4.0.patch"; 217 + url = "https://git.lix.systems/lix-project/lix/commit/858de5f47a1bfd33835ec97794ece339a88490f1.patch"; 218 + hash = "sha256-FfLO2dFSWV1qwcupIg8dYEhCHir2XX6/Hs89eLwd+SY="; 219 + }) 220 + ]; 221 + 203 222 cargoDeps = rustPlatform.fetchCargoVendor { 204 223 name = "lix-${version}"; 205 224 inherit src; ··· 230 249 rev = version; 231 250 hash = "sha256-Oqw04eboDM8rrUgAXiT7w5F2uGrQdt8sGX+Mk6mVXZQ="; 232 251 }; 252 + 253 + patches = [ 254 + # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731 255 + (fetchpatch2 { 256 + name = "lix-lowdown-1.4.0.patch"; 257 + url = "https://git.lix.systems/lix-project/lix/commit/858de5f47a1bfd33835ec97794ece339a88490f1.patch"; 258 + hash = "sha256-FfLO2dFSWV1qwcupIg8dYEhCHir2XX6/Hs89eLwd+SY="; 259 + }) 260 + ]; 233 261 234 262 cargoDeps = rustPlatform.fetchCargoVendor { 235 263 name = "lix-${version}";
+8
pkgs/tools/package-management/nix/common-autoconf.nix
··· 254 254 "--enable-lto" 255 255 ]; 256 256 257 + env.CXXFLAGS = toString ( 258 + lib.optionals (lib.versionAtLeast lowdown.version "1.4.0") [ 259 + # Autotools based build system wasn't updated with the backport of 260 + # https://github.com/NixOS/nix/pull/12115, so set the define explicitly. 261 + "-DHAVE_LOWDOWN_1_4" 262 + ] 263 + ); 264 + 257 265 makeFlags = [ 258 266 # gcc runs multi-threaded LTO using make and does not yet detect the new fifo:/path style 259 267 # of make jobserver. until gcc adds support for this we have to instruct make to use this