Skip to content

Commit

Permalink
guile_2_0: use fetchFromSavannah
Browse files Browse the repository at this point in the history
Further, use fetchpatch2
  • Loading branch information
AndersonTorres committed Oct 24, 2024
1 parent 18e4c88 commit 2aafedd
Showing 1 changed file with 16 additions and 9 deletions.
25 changes: 16 additions & 9 deletions pkgs/development/interpreters/guile/2.0.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{ lib
, autoreconfHook
, boehmgc
, buildPackages
, coverageAnalysis ? null
, fetchpatch
, fetchurl
, fetchpatch2
, fetchFromSavannah
, flex
, gawk
, gmp
, libffi
Expand All @@ -14,16 +16,18 @@
, pkgsBuildBuild
, readline
, stdenv
, texinfo
# Boolean flags
, runCoverageAnalysis ? false
}:

let
pname = "guile";
version = "2.0.13";
src = fetchurl {
url = "mirror://gnu/guile/guile-${version}.tar.xz";
sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
src = fetchFromSavannah {
repo = "guile";
rev = "v${version}";
hash = "sha256-aImjL3T1NkSlXVeykd5dMHhQc4gzPKCkIZTSxKGgKeg=";
};

builder = if runCoverageAnalysis
Expand All @@ -46,16 +50,16 @@ builder {
# RISC-V endianness
./riscv.patch
# Fixes stability issues with 00-repl-server.test
(fetchpatch {
(fetchpatch2 {
url = "https://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
hash = "sha256-y24XMuwe14esLF3wBZ0z1OLp1E8KfLjrN9R3lP8vzLo=";
})] ++
(lib.optionals runCoverageAnalysis [ ./gcov-file-name.patch ])
++ lib.optionals stdenv.hostPlatform.isDarwin [
./filter-mkostemp-darwin.patch
(fetchpatch {
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
hash = "sha256-DI9nIIyZtRAEV/jQQdHPVRthMBOkanjzi5SvavDL3qU=";
})
];

Expand All @@ -67,8 +71,11 @@ builder {
];

nativeBuildInputs = [
autoreconfHook
flex
makeWrapper
pkg-config
texinfo
];

buildInputs = [
Expand Down

0 comments on commit 2aafedd

Please sign in to comment.