From e5e5ff045d52d071f0ea6fb73459bc127b79f846 Mon Sep 17 00:00:00 2001 From: Christoph Jabs Date: Fri, 16 Jan 2026 10:52:52 +0200 Subject: [PATCH] cadical: 2.2.0 -> 3.0.0 --- pkgs/by-name/ca/cadical/package.nix | 5 +++-- pkgs/by-name/ca/cadical_2/package.nix | 6 ++++++ pkgs/by-name/st/stp/package.nix | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/ca/cadical_2/package.nix diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index f3269d749265..7cc3cdf1e68e 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem, - version ? "2.2.0", + version ? "3.0.0", }: stdenv.mkDerivation rec { @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { rev = "rel-${version}"; hash = { - "2.2.0" = "sha256-6O0lz0YJzk1eJblQ0/f9PnSYqD8WoendIZioQiGUpCg="; + "3.0.0" = "sha256-pymbSC6bwQQ0YCtJd3xWZiC22UEkFiKSLObSOnoQj9I="; + "2.2.1" = "sha256-dYRaw9DI63Nqz0IJkfQYU4y00KSfq1Xv0xZuL1G15CY="; "2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4="; "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; } diff --git a/pkgs/by-name/ca/cadical_2/package.nix b/pkgs/by-name/ca/cadical_2/package.nix new file mode 100644 index 000000000000..657d086ae196 --- /dev/null +++ b/pkgs/by-name/ca/cadical_2/package.nix @@ -0,0 +1,6 @@ +{ + cadical, + version ? "2.2.1", +}: + +cadical.override { inherit version; } diff --git a/pkgs/by-name/st/stp/package.nix b/pkgs/by-name/st/stp/package.nix index f6b63167cbd8..45eb1b76ca84 100644 --- a/pkgs/by-name/st/stp/package.nix +++ b/pkgs/by-name/st/stp/package.nix @@ -15,7 +15,7 @@ minisat, cryptominisat, gmp, - cadical, + cadical_2, gtest, lit, outputcheck, @@ -85,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: { cadicalDependency = symlinkJoin { name = "stp-${finalAttrs.version}-cadical"; paths = [ - cadical.lib - cadical.dev + cadical_2.lib + cadical_2.dev ]; }; in