cabinpkg: 0.10.1 -> 0.11.0, renamed from poac (#371042)

NixOS · Jan 23, 2025 · 9f72062 · 9f72062
2 parents 9974b3d + 7e1cdfd
commit 9f72062
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -220,6 +220,8 @@
 
 - `minetest` has been renamed to `luanti` to match the upstream name change but aliases have been added. The new name hasn't resulted in many changes as of yet but older references to minetest should be sunset. See the [new name announcement](https://blog.minetest.net/2024/10/13/Introducing-Our-New-Name/) for more details.
 
+- `poac` has been renamed to `cabinpkg` to match the upstream name change but an alias has been added. See the [new name announcement](https://github.com/orgs/cabinpkg/discussions/1052) for more details.
+
 - `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.
 
 - `rofi` has been updated from 1.7.5 to 1.7.6 which introduces some breaking changes to binary plugins, and also contains a lot of new features and bug fixes. This is highlighted because the patch version bump does not indicate the volume of changes by itself. See the [upstream release notes](https://github.com/davatorium/rofi/releases/tag/1.7.6) for the full list of changes.

diff --git a/pkgs/by-name/po/poac/package.nix → pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/po/poac/package.nix → pkgs/by-name/ca/cabinpkg/package.nix
@@ -15,19 +15,19 @@ let
     owner = "ToruNiina";
     repo = "toml11";
     version = "4.2.0";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-NUuEgTpq86rDcsQnpG0IsSmgLT0cXhd1y32gT57QPAw=";
   };
 in
 stdenv.mkDerivation rec {
-  pname = "poac";
-  version = "0.10.1";
+  pname = "cabinpkg";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
-    owner = "poac-dev";
-    repo = pname;
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-uUVNM70HNJwrr38KB+44fNvLpWihoKyDpRj7d7kbo7k=";
+    owner = "cabinpkg";
+    repo = "cabin";
+    tag = version;
+    sha256 = "sha256-LIP99Shxu/lOdZ31KVA8RYawZ6dRLtXEGKZs1mUFCus=";
   };
 
   strictDeps = true;
@@ -44,30 +44,34 @@ stdenv.mkDerivation rec {
     curl
   ];
 
+  # Skip git cloning toml11
   preConfigure = ''
-    #Skip git clone toml11
     substituteInPlace Makefile \
-       --replace-fail "git clone" "\#git clone"
-    substituteInPlace Makefile \
-       --replace-fail "git -C" "\#git -c"
+       --replace-fail "git clone https://github.com/ToruNiina/toml11.git \$@" ":" \
+       --replace-fail "git -C \$@ reset --hard v4.2.0" ":"
   '';
 
   preBuild = ''
-    mkdir -p build-out/DEPS/
-    cp -rf ${toml11} build-out/DEPS/toml11
+    mkdir -p build/DEPS/
+    cp -rf ${toml11} build/DEPS/toml11
   '';
 
-  makeFlags = [ "RELEASE=1" ];
+  makeFlags = [
+    "RELEASE=1"
+    "COMMIT_HASH="
+    "COMMIT_SHORT_HASH="
+    "COMMIT_DATE="
+  ];
 
   installFlags = [ "PREFIX=${placeholder "out"}" ];
 
   meta = {
     broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
-    homepage = "https://poac.dev";
+    homepage = "https://cabinpkg.com";
     description = "A package manager and build system for C++";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.qwqawawow ];
     platforms = lib.platforms.unix;
-    mainProgram = "poac";
+    mainProgram = "cabin";
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
@@ -1073,6 +1073,7 @@ mapAliases {
   pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead.";
   pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
   pltScheme = racket; # just to be sure
+  poac = cabinpkg; # Added 2025-01-22
   poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
   powerdns = pdns; # Added 2022-03-28