From 68703fc253452c909489f03fcb549169ab29ab19 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 3 Feb 2026 22:43:17 +0100 Subject: [PATCH 1/4] chickenPackages_4.eggDerivation: add fallback for name on pname and version --- pkgs/development/compilers/chicken/4/eggDerivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix index dc3c3bb07dd1..7e334782fe78 100644 --- a/pkgs/development/compilers/chicken/4/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix @@ -5,7 +5,7 @@ makeWrapper, }: { - name, + name ? "${args.pname}-${args.version}", src, buildInputs ? [ ], chickenInstallFlags ? [ ], From fb01fb642e58d6b6b8bde483fecdd0b7730aade3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 3 Feb 2026 22:43:17 +0100 Subject: [PATCH 2/4] chickenPackages_4.egg2nix: set pname instead of name --- pkgs/development/compilers/chicken/4/egg2nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index 2adb096e2099..41c2635ffd21 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -9,7 +9,7 @@ # the tarball. Is there a nicer way than duplicating code? eggDerivation rec { - name = "egg2nix-${version}"; + pname = "egg2nix"; version = "0.5"; src = fetchFromGitHub { From ce630d5c2b74d635b54eb89004083b6f8e731884 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 6 Feb 2026 19:36:37 +0100 Subject: [PATCH 3/4] chickenPackages_4.egg2nix: add suport for adding pname and version --- pkgs/development/compilers/chicken/4/egg2nix.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index 41c2635ffd21..1acbb5c068fe 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -3,6 +3,7 @@ eggDerivation, fetchFromGitHub, chickenEggs, + fetchpatch, }: # Note: This mostly reimplements the default.nix already contained in @@ -19,6 +20,13 @@ eggDerivation rec { sha256 = "sha256-5ov2SWVyTUQ6NHnZNPRywd9e7oIxHlVWv4uWbsNaj/s="; }; + patches = [ + (fetchpatch { + url = "https://github.com/the-kenny/egg2nix/commit/7d20ed520b8fe4debeefc78271c8c836015f95dc.patch"; + hash = "sha256-emMnxu6HnpcDWcO7rAe0VOy2ZPfPhqj5bQv9foOkjY0="; + }) + ]; + buildInputs = with chickenEggs; [ matchable http-client From fd5dbc9834f5ec7fb58c86bd32cf34bf75aca0a3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 6 Feb 2026 19:36:37 +0100 Subject: [PATCH 4/4] chickenPackages_4.chickenEggs: update eggs --- pkgs/development/compilers/chicken/4/eggs.nix | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/chicken/4/eggs.nix b/pkgs/development/compilers/chicken/4/eggs.nix index ea952b844d8b..fce2b6e0a9ad 100644 --- a/pkgs/development/compilers/chicken/4/eggs.nix +++ b/pkgs/development/compilers/chicken/4/eggs.nix @@ -1,9 +1,10 @@ -{ pkgs }: +{ pkgs, stdenv }: rec { inherit (pkgs) eggDerivation fetchegg; base64 = eggDerivation { - name = "base64-3.3.1"; + pname = "base64"; + version = "3.3.1"; src = fetchegg { name = "base64"; @@ -17,12 +18,13 @@ rec { }; defstruct = eggDerivation { - name = "defstruct-1.6"; + pname = "defstruct"; + version = "1.7"; src = fetchegg { name = "defstruct"; - version = "1.6"; - sha256 = "0lsgl32nmb5hxqiii4r3292cx5vqh50kp6v062nfiyid9lhrj0li"; + version = "1.7"; + sha256 = "1rkqk9jxd6vnlvkwzqg8mc7bsw050fgmxfj84y66lf0a14n5r5dg"; }; buildInputs = [ @@ -31,7 +33,8 @@ rec { }; http-client = eggDerivation { - name = "http-client-0.18"; + pname = "http-client"; + version = "0.18"; src = fetchegg { name = "http-client"; @@ -48,12 +51,13 @@ rec { }; intarweb = eggDerivation { - name = "intarweb-1.7"; + pname = "intarweb"; + version = "1.7.1"; src = fetchegg { name = "intarweb"; - version = "1.7"; - sha256 = "1arjgn5g4jfdzj3nlrhxk235qwf6k6jxr14yhnncnfbgdb820xp8"; + version = "1.7.1"; + sha256 = "0pqgwgy4jynlsr3l52qsiwm75qgs7n86kwssaawzp9y34y80awpg"; }; buildInputs = [ @@ -64,7 +68,8 @@ rec { }; matchable = eggDerivation { - name = "matchable-3.7"; + pname = "matchable"; + version = "3.7"; src = fetchegg { name = "matchable"; @@ -78,12 +83,13 @@ rec { }; sendfile = eggDerivation { - name = "sendfile-1.8.3"; + pname = "sendfile"; + version = "1.11"; src = fetchegg { name = "sendfile"; - version = "1.8.3"; - sha256 = "036x4xdndx7qly94afnag5b9idd1yymdm8d832w2cy054y7lxqsi"; + version = "1.11"; + sha256 = "15gm380asvj87f3bqb7rz4mz6znnk6r00rdy3njx9ay0qkxi3q9y"; }; buildInputs = [ @@ -92,7 +98,8 @@ rec { }; simple-md5 = eggDerivation { - name = "simple-md5-0.0.1"; + pname = "simple-md5"; + version = "0.0.1"; src = fetchegg { name = "simple-md5"; @@ -106,7 +113,8 @@ rec { }; uri-common = eggDerivation { - name = "uri-common-1.4"; + pname = "uri-common"; + version = "1.4"; src = fetchegg { name = "uri-common"; @@ -122,7 +130,8 @@ rec { }; uri-generic = eggDerivation { - name = "uri-generic-2.46"; + pname = "uri-generic"; + version = "2.46"; src = fetchegg { name = "uri-generic";