diff --git a/pkgs/by-name/lo/log4shib/package.nix b/pkgs/by-name/lo/log4shib/package.nix
index 3b421146e8cb..31c56d7e4dfb 100644
--- a/pkgs/by-name/lo/log4shib/package.nix
+++ b/pkgs/by-name/lo/log4shib/package.nix
@@ -1,18 +1,19 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromCodeberg,
   autoreconfHook,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "log4shib";
   version = "1.0.9";
 
-  src = fetchgit {
-    url = "https://git.shibboleth.net/git/cpp-log4shib.git";
-    rev = "a1afe19b7b49c32fcb03e6d72809501b8965cf85";
-    sha256 = "06rrc5l6qxlc8abzim2jcxwz2c577qrjqx15cbfqq1zfqagj9hix";
+  src = fetchFromCodeberg {
+    owner = "Shibboleth";
+    repo = "cpp-log4shib";
+    tag = finalAttrs.version;
+    hash = "sha256-PcIkn8LuB4zdYiV0LDM+pzDxeWdS1PiXQox2bGhhORs=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -26,4 +27,4 @@ stdenv.mkDerivation {
     license = lib.licenses.lgpl21;
     homepage = "http://log4cpp.sf.net";
   };
-}
+})
diff --git a/pkgs/by-name/op/opensaml-cpp/package.nix b/pkgs/by-name/op/opensaml-cpp/package.nix
index c024baf4cd70..b739172635a2 100644
--- a/pkgs/by-name/op/opensaml-cpp/package.nix
+++ b/pkgs/by-name/op/opensaml-cpp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromCodeberg,
   autoreconfHook,
   pkg-config,
   boost,
@@ -17,10 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "opensaml-cpp";
   version = "3.0.1";
 
-  src = fetchgit {
-    url = "https://git.shibboleth.net/git/cpp-opensaml.git";
-    rev = finalAttrs.version;
-    sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8";
+  src = fetchFromCodeberg {
+    owner = "Shibboleth";
+    repo = "cpp-opensaml";
+    tag = finalAttrs.version;
+    hash = "sha256-iBfKM40SzCiDGHacnxc7zZdvOYbCy9NEWjhPzCvWQ1c=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/sh/shibboleth-sp/package.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix
index 78ae723b6bc0..466a0bc42366 100644
--- a/pkgs/by-name/sh/shibboleth-sp/package.nix
+++ b/pkgs/by-name/sh/shibboleth-sp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromCodeberg,
   fetchpatch,
   autoreconfHook,
   boost,
@@ -19,10 +19,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "shibboleth-sp";
   version = "3.0.4.1";
 
-  src = fetchgit {
-    url = "https://git.shibboleth.net/git/cpp-sp.git";
-    rev = finalAttrs.version;
-    sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr";
+  src = fetchFromCodeberg {
+    owner = "Shibboleth";
+    repo = "cpp-sp";
+    tag = finalAttrs.version;
+    hash = "sha256-ub3TFKbRJKyiNy5+t5Aaiwt29ibOuBx4WiDMV/5qZOE=";
   };
 
   # Upgrade to Clang 19 (and thereby LLVM19) causes `std::char_traits` to now be present,
@@ -34,13 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
   patches = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "19") [
     (fetchpatch {
       name = "char-traits-ambig-1";
-      url = "https://git.shibboleth.net/view/?p=cpp-sp.git;a=blobdiff_plain;f=shibsp/util/IPRange.cpp;h=532cf9e94c915667c091d127c696979f63939eb5;hp=d6f00bc36ea25997817a2308314bcdbea572936f;hb=49cd05fa6d9935a45069fa555db7a26ca77d23db;hpb=293ff2ab6454b0946b3b03719efa132bff461f1f";
+      url = "https://codeberg.org/Shibboleth/cpp-sp/commit/49cd05fa6d9935a45069fa555db7a26ca77d23db.diff";
       hash = "sha256-ZF0jsZJoHaxaPPjVbT6Wlq+wjyPQLTnEKcUxONji/hE=";
     })
 
     (fetchpatch {
       name = "char-traits-ambig-2";
-      url = "https://git.shibboleth.net/view/?p=cpp-sp.git;a=blobdiff_plain;f=shibsp/util/IPRange.cpp;h=da954870eb03c7cd054ecc5c52a6c1f011787760;hp=354010d5f5e533262cb385ea16756df53fe0c241;hb=793663a67aaa4e9a4aa9172728d924f8cec45cf6;hpb=a43814935030930c49b7a08f5515b861906525c7";
+      url = "https://codeberg.org/Shibboleth/cpp-sp/commit/793663a67aaa4e9a4aa9172728d924f8cec45cf6.diff";
+      includes = [ "shibsp/util/IPRange.cpp" ];
       hash = "sha256-4iGwCGpGwAkriOwQmh5AgvHLX1o39NuQ2l4sAJbD2bc=";
     })
   ];
diff --git a/pkgs/by-name/xm/xml-security-c/package.nix b/pkgs/by-name/xm/xml-security-c/package.nix
index df2c5382637e..a5835d2ba44e 100644
--- a/pkgs/by-name/xm/xml-security-c/package.nix
+++ b/pkgs/by-name/xm/xml-security-c/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromCodeberg,
   autoreconfHook,
   pkg-config,
   xalanc,
@@ -13,9 +13,10 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "xml-security-c";
   version = "3.0.0";
 
-  src = fetchgit {
-    url = "https://git.shibboleth.net/git/cpp-xml-security";
-    rev = finalAttrs.version;
+  src = fetchFromCodeberg {
+    owner = "Shibboleth";
+    repo = "cpp-xml-security";
+    tag = finalAttrs.version;
     hash = "sha256-D60JtD4p9ERh6sowvwBHtE9XWVm3D8saooagDvA6ZtQ=";
   };
 
diff --git a/pkgs/by-name/xm/xml-tooling-c/package.nix b/pkgs/by-name/xm/xml-tooling-c/package.nix
index 2f31f5efd3b2..19bf045c4f35 100644
--- a/pkgs/by-name/xm/xml-tooling-c/package.nix
+++ b/pkgs/by-name/xm/xml-tooling-c/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromCodeberg,
   autoreconfHook,
   pkg-config,
   boost,
@@ -16,8 +16,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "xml-tooling-c";
   version = "3.3.0";
 
-  src = fetchgit {
-    url = "https://git.shibboleth.net/git/cpp-xmltooling.git";
+  src = fetchFromCodeberg {
+    owner = "Shibboleth";
+    repo = "cpp-xmltooling";
     tag = finalAttrs.version;
     hash = "sha256-czmBu7ThDwq+x7FahgZDMHqid8jeUNnTuKMI/Fj4IIw=";
   };