From 664596378ab7a3f5e339cd715f8349d805b8bc8b Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Thu, 23 Apr 2026 01:07:10 -0700 Subject: [PATCH 1/2] urweb: fix build with gcc15 --- pkgs/development/compilers/urweb/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index ac258d26eae7..9b7274bb326a 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, file, openssl, mlton, @@ -21,6 +22,13 @@ stdenv.mkDerivation rec { sha256 = "0qh6wcxfk5kf735i5gqwnkdirnnmqhnnpkfz96gz144dgz2i0c5c"; }; + patches = [ + (fetchpatch { + url = "https://github.com/urweb/urweb/commit/f7a38a95bee9d1aaf7ed83a651cfbce8da96ed44.patch"; + sha256 = "TQFD9Y8OEOSFv6cqpHQ4WSNAPzl82MmVCAxLR4F4Uxc="; + }) + ]; + buildInputs = [ openssl mlton @@ -47,6 +55,10 @@ stdenv.mkDerivation rec { -L${libmysqlclient}/lib \ -L${libpq}/lib \ -L${sqlite.out}/lib"; + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # unresolved reference when linking liburweb.1.dylib + export LDFLAGS="-Wl,-undefined,dynamic_lookup"; ''; env.NIX_CFLAGS_COMPILE = toString [ From 7e7ecced6d8d12c9f3c6b00beb6f878c278add33 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Thu, 23 Apr 2026 01:14:16 -0700 Subject: [PATCH 2/2] urweb: migrate to by-name --- .../urweb/default.nix => by-name/ur/urweb/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{development/compilers/urweb/default.nix => by-name/ur/urweb/package.nix} (100%) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/by-name/ur/urweb/package.nix similarity index 100% rename from pkgs/development/compilers/urweb/default.nix rename to pkgs/by-name/ur/urweb/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e6cc40f54d9..dc206f21d920 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4687,10 +4687,6 @@ with pkgs; stdenv = gcc14Stdenv; }; - urweb = callPackage ../development/compilers/urweb { - icu = icu67; - }; - vcard = python3Packages.toPythonApplication python3Packages.vcard; inherit (callPackage ../development/compilers/vala { })