From f061c452a62b83c1442264b14369be92359d934b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Sat, 24 Dec 2022 17:19:04 +0100 Subject: [PATCH 1/4] coqPackages.Cheerios: preemptive fix for removal of configure in future versions --- pkgs/development/coq-modules/Cheerios/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index d7763d87c9e6..5c79969c756c 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -9,5 +9,9 @@ with lib; mkCoqDerivation { release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1"; propagatedBuildInputs = [ StructTact ]; - preConfigure = "patchShebangs ./configure"; + preConfigure = '' + if [ -f ./configure ]; then + patchShebangs ./configure + fi + ''; } From 6bd604b37c7292772ba7285abe5b56e0f2d9c8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Sat, 24 Dec 2022 17:19:21 +0100 Subject: [PATCH 2/4] coqPackages.InfSeqExt: preemptive fix for removal of configure in future versions --- pkgs/development/coq-modules/InfSeqExt/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 1f11ae8e84a2..7f21386c86f6 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -7,5 +7,9 @@ mkCoqDerivation { defaultVersion = if lib.versions.isGe "8.5" coq.version then "20200131" else null; release."20200131".rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a"; release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0"; - preConfigure = "patchShebangs ./configure"; + preConfigure = '' + if [ -f ./configure ]; then + patchShebangs ./configure + fi + ''; } From 365f7f342fdc3fccfc22b57e7974e7d1eaf615cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Sat, 24 Dec 2022 17:19:46 +0100 Subject: [PATCH 3/4] coqPackages.StructTact: preemptive fix for removal of configure in future versions --- pkgs/development/coq-modules/StructTact/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 6618e75bab80..3fb8a42cfb56 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -12,5 +12,9 @@ with lib; mkCoqDerivation { release."20210328".sha256 = "sha256:1y5r1zm3hli10ah6lnj7n8hxad6rb6rgldd0g7m2fjibzvwqzhdg"; release."20181102".rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; release."20181102".sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - preConfigure = "patchShebangs ./configure"; + preConfigure = '' + if [ -f ./configure ]; then + patchShebangs ./configure + fi + ''; } From d76cdd7b8b993ace92085d55cb164b0bbff77b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Sat, 24 Dec 2022 17:19:51 +0100 Subject: [PATCH 4/4] coqPackages.Verdi: preemptive fix for removal of configure in future versions --- pkgs/development/coq-modules/Verdi/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 190758855f78..80b964b39042 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -21,5 +21,9 @@ with lib; mkCoqDerivation { release."20181102".sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ]; - preConfigure = "patchShebangs ./configure"; + preConfigure = '' + if [ -f ./configure ]; then + patchShebangs ./configure + fi + ''; }