From d1293cadd93233df5723d586eb9bc26ca8bb36c1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 28 Jun 2026 13:12:57 -0500 Subject: [PATCH 1/2] abella: move all args out of top-level, refactor Assisted-by: Cursor Composer 2.5 --- pkgs/applications/science/logic/abella/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 210211a6b948..5902450717b6 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -13,10 +13,11 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "http://abella-prover.org/distributions/abella-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M="; + hash = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M="; }; strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ rsync diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e8ab34a9ae..e1804ddd67af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10513,9 +10513,7 @@ with pkgs; ### SCIENCE/LOGIC - abella = callPackage ../applications/science/logic/abella { - ocamlPackages = ocaml-ng.ocamlPackages_4_12; - }; + abella = callPackage ../applications/science/logic/abella { }; inherit (callPackage ./rocq-packages.nix { From 558c28699212d45f85208c70f6639f2343522904 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 28 Jun 2026 13:15:21 -0500 Subject: [PATCH 2/2] abella: migrate to by-name Assisted-by: Cursor Composer 2.5 --- .../logic/abella/default.nix => by-name/ab/abella/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/logic/abella/default.nix => by-name/ab/abella/package.nix} (100%) diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/by-name/ab/abella/package.nix similarity index 100% rename from pkgs/applications/science/logic/abella/default.nix rename to pkgs/by-name/ab/abella/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1804ddd67af..cdbd50d537e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10513,8 +10513,6 @@ with pkgs; ### SCIENCE/LOGIC - abella = callPackage ../applications/science/logic/abella { }; - inherit (callPackage ./rocq-packages.nix { inherit (ocaml-ng)