From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iLgjAKgg+WZLKQAA62LTzQ:P1 (envelope-from ) for ; Sun, 29 Sep 2024 09:40:56 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id iLgjAKgg+WZLKQAA62LTzQ (envelope-from ) for ; Sun, 29 Sep 2024 11:40:56 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=XdxbRoC6; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=W0K6k2ik; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727602855; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=fNyJduaD5flKVfMzTqiVMiB+xrf9W218f9pO9hSl9YM=; b=aCvgPma5bXP32aHSVTuPGee20Q7H1sWzKaGVnMzm+BuLix0v60h5/dPPJjUH6JgdAScNs6 DgmKkvYNZBhulGQp9xvf+xz3Zo3Y3Y7mmyZbdvy8MhG34fw9i5BqrzsBuK42EVuxUdhRmv y1qbUrV5W+OjeO1ewQMQF+Xyu54YR2ZXE0nIiXek7KXe+tWzPFEmRVDpM03hgJ9aHoxnDc bv4hfj8qiSDGXtiCnCYxNyqpC9m0dO26yJ9KZ09UEe2xzsCSWfFZs2KC0rNHhUEOYN01W3 I2WMUkSsXJuMdeDV1V1n1BMbesdoVOMpFSDpLPRqFkfYTKp38c103OzWwXRQTA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=XdxbRoC6; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=W0K6k2ik; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727602855; a=rsa-sha256; cv=none; b=b2Q5n9gu6xtWCj9Ekbjv/UN5i6oNbi2qjIlDa/ot+1+i7jMwfn/am5wYS+DBztPDkUFHDF Iiw0pMK65D7DVr612nhn9gUTR4l9wElQ0DqXGWBzmCqZL5uJTO9ttby+0up19JQz3MJaOJ iAmwMaTjiPAnxWZIs1XK8x0khN+QCuga0TdOxkxweuyAyPlGt+msblcPqUreuPiqw29jKu cR9HvAEpvpXMq/7MFB7/I+yfR74DhEXT6ut/Ar5dL+pAamG/3naIjIkVFpLZf9zXGQJUuJ gmYaITonDt+8vgmN7zzzqA9CPpwVcVQrD0MtmPIi25LKwLBUSstsixuMWuHwhA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6D6DD1FFDC for ; Sun, 29 Sep 2024 11:40:55 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suqPq-00032Q-WC; Sun, 29 Sep 2024 05:40:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suqPp-00031U-Ld for guix-patches@gnu.org; Sun, 29 Sep 2024 05:40:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suqPp-00054t-Cr for guix-patches@gnu.org; Sun, 29 Sep 2024 05:40:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=fNyJduaD5flKVfMzTqiVMiB+xrf9W218f9pO9hSl9YM=; b=XdxbRoC6hWKqmXAZVIjT2/kuraZDB/HR5JuKELQQx1gh1XFWUB5dc2fvZ15+FCUv6l/rJgbhwyD6WA1KG/Z7YmdH2mSdItrTpFW+nYRjJHNCTjY6h54/syupJciNv19NMJAj3qAYg4ovNlVMDYaK7K76WwurTKPlcv9Mhc6dhNT16FCPhpmeDAMr3I2vWOvn2oMQxlb1UQPH+OvbH3wsSLvVVZ5p18I7kyPefOGFCYOV0BY8d/8lRyjohD8xYxm+t5/xOXccL3W7eB0wbbsjKzXxU/DzIOo53LfFXYEJ7OC9hs28T9hBeFUecOkL35YLENShbrX/Tzwn/W3AziU8BQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suqQK-0001lS-EI for guix-patches@gnu.org; Sun, 29 Sep 2024 05:41:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73551] [PATCH 4/8] gnu: lingeling: Update to 1.0.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Sep 2024 09:41:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73551 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73551@debbugs.gnu.org Received: via spool by 73551-submit@debbugs.gnu.org id=B73551.17276028236088 (code B ref 73551); Sun, 29 Sep 2024 09:41:04 +0000 Received: (at 73551) by debbugs.gnu.org; 29 Sep 2024 09:40:23 +0000 Received: from localhost ([127.0.0.1]:40114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suqPe-0001a3-Qb for submit@debbugs.gnu.org; Sun, 29 Sep 2024 05:40:23 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suqBo-0007xc-Qn for 73551@debbugs.gnu.org; Sun, 29 Sep 2024 05:27:33 -0400 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-5c88e45f467so947840a12.1 for <73551@debbugs.gnu.org>; Sun, 29 Sep 2024 02:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727601868; x=1728206668; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=fNyJduaD5flKVfMzTqiVMiB+xrf9W218f9pO9hSl9YM=; b=W0K6k2ikT6ZBaWZMNl+vBFn1WcuiBxCotp4G3oHGjfW663YXIMqCuue73+Jfoitux8 9y5a4/c9vDXqamh7fb/J+Pwm6aQtWhmMb5JK4/ldVPzkGZM1TDZH27m0HopQQeNgTl7E k3BDWiTeqoslkQndDO1P3VgYOEU0yVf6LeDjwquQdPnHFlOvXqZJk91pIz0u+tO+QEjO KY8yi6zYjEW5gpLLoUK/Ru9CCrEmTyNK4z2MIfmNmGVHbzBZ1RFKLUJmHnIZIlte5XI5 BFvuxsjlbKuERKL/awFe5qlzOOqt9T4Z6dO/VfXe1jTYwWaFw6+1X2LB3WhvkVv4OrI7 AMog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727601868; x=1728206668; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fNyJduaD5flKVfMzTqiVMiB+xrf9W218f9pO9hSl9YM=; b=fqaPAURo5iaDjWCPPV6cLsiIvc08okFQaQ54ttA62Yp9GmOqNR4kdJWzrqHcn9kLc+ mSibeH/uKzZ+fIiSgnVMqcnBTt7IN3FJY2uTVDya6oaXUT6oQXAC0GY+jPNOu2jNk8+O jaAK3utycmNlqAFsCx7zS9FSKCmtAWi+jZYOFPrX4LrzKbbkzspZiSQ4ygaIQ73+wItg x3xOlZQH6vYdI0F2IEReGtHIo/V6J7bMskRYHLB3vDVrFxsIWEEgjzf2TT2K5uhQLHjR awsVA2kjR0WwjGq1qB3pwuSOjj/heetV/94LrXQ9igEZkBD6Sy2M6i+Uv0Dt4ofBTwwp imSg== X-Gm-Message-State: AOJu0YzQWZK1OPJaPMDRfKgk4WVFmnsDh5cYRFrKu31JAtj0a9kA50pP DuU5rt3Jb4oofYjfUVDRm3ef4dp28pNK9Uqwl3Q4GQ2GfUhstgpNOKzwEeB2 X-Google-Smtp-Source: AGHT+IFQ273XxIqHB5P5I5V27TQbQTR6pw4ujZW/K0CDiCjV6eC4x5vGj8IWSlGogCmS50Cq1R45HQ== X-Received: by 2002:a05:6402:4009:b0:5c5:c2a7:d535 with SMTP id 4fb4d7f45d1cf-5c88248325fmr9774598a12.16.1727601867672; Sun, 29 Sep 2024 02:24:27 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c88248af7dsm2997166a12.78.2024.09.29.02.24.27 for <73551@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Sep 2024 02:24:27 -0700 (PDT) Message-ID: <8ae7773ff494d9fedbd40bd1c59c1afa2db550ce.1727601398.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Wed, 25 Sep 2024 22:02:49 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -0.34 X-Spam-Score: -0.34 X-Migadu-Queue-Id: 6D6DD1FFDC X-TUID: qnYsoDNkqrzE * gnu/packages/maths.scm (lingeling): Update to 1.0.0. [#:phases]: Adjust accordingly. --- gnu/packages/maths.scm | 132 ++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b6dae2a721..ab989e6af6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9211,86 +9211,84 @@ (define-public libpoly (license license:lgpl3+))) (define-public lingeling - (let ((commit "72d2b13eea5fbd95557a3d0d199cd98dfbdc76ee") - (revision "1")) - (package - (name "lingeling") - (version (git-version "sc2022" revision commit)) - (source (origin + (package + (name "lingeling") + (version "1.0.0") + (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/arminbiere/lingeling") - (commit commit))) + (commit (string-append "rel-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "16s30x8s2cw6icchwm65zj56ph4qwz6i07g3hwkknvajisvjq85c")))) - (build-system gnu-build-system) - (arguments - (list #:test-target "test" - #:modules `((ice-9 match) - ,@%default-gnu-modules) - #:configure-flags #~(list "--aiger=.") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'unpack-aiger - (lambda* (#:key inputs #:allow-other-keys) - (invoke #$(ar-for-target) "x" - (search-input-file inputs "lib/libaiger.a") - "aiger.o") - (copy-file - (search-input-file inputs "include/aiger/aiger.h") - "aiger.h"))) - (add-after 'unpack 'hard-code-commit - (lambda _ - (substitute* "mkconfig.sh" - (("`\\./getgitid`") #$commit)))) - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (list "treengeling.c" "lgldimacs.c") - (("\"(gunzip|xz|bzcat|7z)" all cmd) - (string-append - "\"" - (search-input-file inputs (string-append "bin/" cmd))))))) - (replace 'configure - (lambda* (#:key configure-flags #:allow-other-keys) - (apply invoke "./configure.sh" configure-flags))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") - "/bin"))) - (mkdir-p bin) - (for-each - (lambda (file) - (install-file file bin)) - '("blimc" "ilingeling" "lglddtrace" "lglmbt" - "lgluntrace" "lingeling" "plingeling" - "treengeling"))))) - (add-after 'install 'wrap-path - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion (string-append - (assoc-ref outputs "out") - "/bin") - (for-each - (lambda (file) - (wrap-program - file + "0hszkhyni7jcw580f41rrrnwz42x56sqvd8zpcjdagvdiag76lc1")))) + (build-system gnu-build-system) + (arguments + (list #:test-target "test" + #:modules `((ice-9 match) + ,@%default-gnu-modules) + #:configure-flags #~(list "--aiger=.") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-aiger + (lambda* (#:key inputs #:allow-other-keys) + (invoke #$(ar-for-target) "x" + (search-input-file inputs "lib/libaiger.a") + "aiger.o") + (copy-file + (search-input-file inputs "include/aiger/aiger.h") + "aiger.h"))) + (add-after 'unpack 'hard-code-commit + (lambda _ + (substitute* "mkconfig.sh" + (("`\\./getgitid`") "")))) + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (list "treengeling.c" "lgldimacs.c") + (("\"(gunzip|xz|bzcat|7z)" all cmd) + (string-append + "\"" + (search-input-file inputs (string-append "bin/" cmd))))))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "./configure.sh" configure-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") + "/bin"))) + (mkdir-p bin) + (for-each + (lambda (file) + (install-file file bin)) + '("blimc" "ilingeling" "lglddtrace" "lglmbt" + "lgluntrace" "lingeling" "plingeling" + "treengeling"))))) + (add-after 'install 'wrap-path + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (string-append + (assoc-ref outputs "out") + "/bin") + (for-each + (lambda (file) + (wrap-program + file '("PATH" suffix #$(map (lambda (input) (file-append (this-package-input input) "/bin")) '("gzip" "bzip2" "xz" "p7zip"))))) - ;; These programs use sprintf on buffers with magic - ;; values to construct commands (yes, eww), so we - ;; can't easily substitute* them. - '("lglddtrace" "lgluntrace" "lingeling" "plingeling")))))))) - (inputs (list `(,aiger "static") bash-minimal gzip bzip2 xz p7zip)) - (home-page "http://fmv.jku.at/lingeling") - (synopsis "SAT solver") - (description "This package provides a range of SAT solvers, including + ;; These programs use sprintf on buffers with magic + ;; values to construct commands (yes, eww), so we + ;; can't easily substitute* them. + '("lglddtrace" "lgluntrace" "lingeling" "plingeling")))))))) + (inputs (list `(,aiger "static") bash-minimal gzip bzip2 xz p7zip)) + (home-page "http://fmv.jku.at/lingeling") + (synopsis "SAT solver") + (description "This package provides a range of SAT solvers, including the sequential @command{lingeling} and its parallel variants @command{plingeling} and @command{treengeling}. A bounded model checker is also included.") - (license license:expat)))) + (license license:expat))) (define-public louvain-community (let ((commit "8cc5382d4844af127b1c1257373740d7e6b76f1e") -- 2.46.0