diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-08 00:02:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-08 00:02:17 +0000 |
| commit | bca99088c2281d3105de5f28bb925c5b2bd0e790 (patch) | |
| tree | bd1aa4de1a36c569e92cb01478ee66f2ee7729af /pkgs/development/compilers | |
| parent | b9f10d0e3e2e4b8805b265497a086fdd0a164e10 (diff) | |
| parent | c8cd65298e567e1e604431e4544361e365410f8c (diff) | |
| download | nixlib-bca99088c2281d3105de5f28bb925c5b2bd0e790.tar nixlib-bca99088c2281d3105de5f28bb925c5b2bd0e790.tar.gz nixlib-bca99088c2281d3105de5f28bb925c5b2bd0e790.tar.bz2 nixlib-bca99088c2281d3105de5f28bb925c5b2bd0e790.tar.lz nixlib-bca99088c2281d3105de5f28bb925c5b2bd0e790.tar.xz nixlib-bca99088c2281d3105de5f28bb925c5b2bd0e790.tar.zst nixlib-bca99088c2281d3105de5f28bb925c5b2bd0e790.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/fpc/lazarus.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 54b81b80e994..ba2eeada5e46 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -9,12 +9,12 @@ # 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that let - version = "2.2.2-0"; + version = "3.2-0"; # as of 2.0.10 a suffix is being added. That may or may not disappear and then # come back, so just leave this here. majorMinorPatch = v: - builtins.concatStringsSep "." (lib.take 3 (lib.splitVersion v)); + builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion v)); overrides = writeText "revision.inc" (lib.concatStringsSep "\n" (lib.mapAttrsToList (k: v: "const ${k} = '${v}';") { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz"; - sha256 = "a9832004cffec8aca69de87290441d54772bf95d5d04372249d5a5491fb674c4"; + sha256 = "69f43f0a10b9e09deea5f35094c73b84464b82d3f40d8a2fcfcb5a5ab03c6edf"; }; postPatch = '' @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p $out/share "$out/lazarus" tar xf ${fpc.src} --strip-components=1 -C $out/share -m - substituteInPlace ide/include/unix/lazbaseconf.inc \ + substituteInPlace ide/packages/ideconfig/include/unix/lazbaseconf.inc \ --replace '/usr/fpcsrc' "$out/share/fpcsrc" ''; |