From a683496076b314ee7d42e202f42a7b5fc2368961 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 30 Apr 2024 04:30:39 -0400
Subject: [PATCH 1/4] picoc: 2015-05-04 -> 2.1-unstable-2018-06-05

---
 .../interpreters/picoc/default.nix            | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 51bf82aafbbe..21bb2902e013 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -1,29 +1,25 @@
-{ lib, stdenv, fetchFromGitHub, readline }:
+{ lib, stdenv, fetchFromGitLab, readline }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "picoc";
-  version = "2015-05-04";
+  version = "2.1-unstable-2018-06-05";
 
-  src = fetchFromGitHub {
-    sha256 = "01w3jwl0vn9fsmh7p20ad4nl9ljzgfn576yvncd9pk9frx3pd8y4";
-    rev = "4555e8456f020554bcac50751fbb9b36c7d8c13b";
-    repo = "picoc";
+  src = fetchFromGitLab {
     owner = "zsaleeba";
+    repo = "picoc";
+    rev = "dc85a51e9211cfb644f0a85ea9546e15dc1141c3";
+    hash = "sha256-yWPRbJLT09E7pqqs9E2k48ECoRR2nhcgTgK5pumkrxo=";
   };
 
   buildInputs = [ readline ];
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
-  postPatch = ''
-    substituteInPlace Makefile --replace '`svnversion -n`' "${version}"
-  '';
-
   enableParallelBuilding = true;
 
   # Tests are currently broken on i686 see
   # https://hydra.nixos.org/build/24003763/nixlog/1
-  doCheck = if stdenv.isi686 then false else true;
+  doCheck = !stdenv.isi686;
   checkTarget = "test";
 
   installPhase = ''

From f25b436961eb8f8f0afc0eb947764a024621c29d Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 30 Apr 2024 04:33:04 -0400
Subject: [PATCH 2/4] picoc: add missing phase hooks

---
 pkgs/development/interpreters/picoc/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 21bb2902e013..ce0f2ce0e949 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -23,10 +23,14 @@ stdenv.mkDerivation {
   checkTarget = "test";
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm755 picoc $out/bin/picoc
 
     mkdir -p $out/include
     install -m644 *.h $out/include
+
+    runHook postInstall
   '';
 
   meta = with lib; {

From 5ed0f58083bb8e22d4e4b05c911ffb1428f35ee1 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 30 Apr 2024 04:33:57 -0400
Subject: [PATCH 3/4] picoc: update homepage

---
 pkgs/development/interpreters/picoc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index ce0f2ce0e949..ab59c0f4dd23 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
       very sparing of data space. This means it can work well in small embedded
       devices.
     '';
-    homepage = "https://github.com/zsaleeba/picoc";
+    homepage = "https://gitlab.com/zsaleeba/picoc";
     downloadPage = "https://code.google.com/p/picoc/downloads/list";
     license = licenses.bsd3;
     platforms = platforms.unix;

From efd76ba1ef14c680e99a551506a66176045c3507 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 4 May 2024 14:36:17 +0200
Subject: [PATCH 4/4] picoc: fix build on all hydra platforms

---
 pkgs/development/interpreters/picoc/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index ab59c0f4dd23..d27efe1f2b82 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -15,11 +15,15 @@ stdenv.mkDerivation {
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
+  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
+    "-Wno-error=implicit-function-declaration"
+  ]);
+
   enableParallelBuilding = true;
 
   # Tests are currently broken on i686 see
   # https://hydra.nixos.org/build/24003763/nixlog/1
-  doCheck = !stdenv.isi686;
+  doCheck = !stdenv.isi686 && !stdenv.isAarch64;
   checkTarget = "test";
 
   installPhase = ''
@@ -34,7 +38,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
     description = "Very small C interpreter for scripting";
     mainProgram = "picoc";
     longDescription = ''