Compare commits

...

2 Commits

Author SHA1 Message Date
xenia 29e44293cb racket: incorporate upstream changes 2026-06-07 22:31:40 -04:00
xenia b48976eb87 strawberry -> 1.2.18 2026-06-07 22:26:50 -04:00
5 changed files with 11 additions and 28 deletions

View File

@ -127,12 +127,12 @@ final: prev: {
} // (byName self)) |> final.lib.recurseIntoAttrs; } // (byName self)) |> final.lib.recurseIntoAttrs;
strawberry = prev.strawberry.overrideAttrs (afinal: aprev: { strawberry = prev.strawberry.overrideAttrs (afinal: aprev: {
version = "1.2.17"; version = "1.2.18";
src = final.fetchFromGitHub { src = final.fetchFromGitHub {
owner = "jonaski"; owner = "jonaski";
repo = "strawberry"; repo = "strawberry";
rev = afinal.version; rev = afinal.version;
hash = "sha256-ZyWVOpa1laBUNW5lwbNeAmVBXEOLlXy+Xz8vbtuLi/8="; hash = "sha256-5h1psYJDKnFFgIGZY3ecCttgkR+zuUwa3b/A4keLk9o=";
}; };
patches = [ patches = [
./pkgs/strawberry/0001-make-the-minimum-scrobble-length-shorter.patch ./pkgs/strawberry/0001-make-the-minimum-scrobble-length-shorter.patch

View File

@ -40,17 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
sqlite.out sqlite.out
]; ];
patches = lib.optionals isDarwin [
/*
The entry point binary $out/bin/racket is codesigned at least once. The
following error is triggered as a result.
(error 'add-ad-hoc-signature "file already has a signature")
We always remove the existing signature then call add-ad-hoc-signature to
circumvent this error.
*/
./patches/force-remove-codesign-then-add.patch
];
preConfigure = preConfigure =
/* /*
The configure script forces using `libtool -o` as AR on Darwin. But, the The configure script forces using `libtool -o` as AR on Darwin. But, the
@ -171,5 +160,10 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ rc-zb ]; maintainers = with lib.maintainers; [ rc-zb ];
mainProgram = "racket"; mainProgram = "racket";
platforms = lib.platforms.all; platforms = lib.platforms.all;
/*
> checking size of void *... 0
> Something has gone wrong getting the pointer size; see config.log
*/
badPlatforms = lib.platforms.darwin;
}; };
}) })

View File

@ -15,7 +15,7 @@
libpng, libpng,
makeFontsConf, makeFontsConf,
pango, pango,
unixODBC, unixodbc,
wrapGAppsHook3, wrapGAppsHook3,
disableDocs ? false, disableDocs ? false,
@ -38,7 +38,7 @@ minimal.overrideAttrs (
}; };
buildInputs = prevAttrs.buildInputs ++ [ buildInputs = prevAttrs.buildInputs ++ [
(if isDarwin then libiodbc else unixODBC) (if isDarwin then libiodbc else unixodbc)
cairo cairo
fontconfig.lib fontconfig.lib
glib glib
@ -133,8 +133,7 @@ minimal.overrideAttrs (
libraries support applications from web servers and databases to libraries support applications from web servers and databases to
GUIs and charts. GUIs and charts.
''; '';
platforms = lib.platforms.unix; badPlatforms = [];
badPlatforms = lib.platforms.darwin;
}; };
} }
) )

View File

@ -1,10 +0,0 @@
--- old/src/mac/codesign.rkt
+++ new/src/mac/codesign.rkt
@@ -18,6 +18,6 @@
file))
(void
- (if remove?
+ (begin
(remove-signature file)
(add-ad-hoc-signature file)))

View File

@ -49,7 +49,7 @@ down_page_path = homepage.find(
down_page = BeautifulSoup(requests.get(SITE + "/" + down_page_path).text, "html.parser") down_page = BeautifulSoup(requests.get(SITE + "/" + down_page_path).text, "html.parser")
down_table = down_page.find(class_="download-table") down_table = down_page.find(class_="download-table")
full = find_info(down_table, "Racket", "Unix") full = find_info(down_table, "Racket", "All Platforms")
minimal = find_info(down_table, "Minimal Racket", "All Platforms") minimal = find_info(down_table, "Minimal Racket", "All Platforms")
with open(MANIFEST_FILENAME, "w", encoding="utf-8") as f: with open(MANIFEST_FILENAME, "w", encoding="utf-8") as f: